1. 22 Nov, 2011 6 commits
  2. 21 Nov, 2011 10 commits
  3. 20 Nov, 2011 5 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 6fe4c6d4
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (86 commits)
        ipv4: fix redirect handling
        ping: dont increment ICMP_MIB_INERRORS
        sky2: fix hang in napi_disable
        sky2: enforce minimum ring size
        bonding: Don't allow mode change via sysfs with slaves present
        f_phonet: fix page offset of first received fragment
        stmmac: fix pm functions avoiding sleep on spinlock
        stmmac: remove spin_lock in stmmac_ioctl.
        stmmac: parameters auto-tuning through HW cap reg
        stmmac: fix advertising 1000Base capabilties for non GMII iface
        stmmac: use mdelay on timeout of sw reset
        sky2: version 1.30
        sky2: used fixed RSS key
        sky2: reduce default Tx ring size
        sky2: rename up/down functions
        sky2: pci posting issues
        sky2: fix hang on shutdown (and other irq issues)
        r6040: fix check against MCRO_HASHEN bit in r6040_multicast_list
        MAINTAINERS: change email address for shemminger
        pch_gbe: Move #include of module.h
        ...
      6fe4c6d4
    • Linus Torvalds's avatar
      Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm · a4cc3889
      Linus Torvalds authored
      * 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM guest: prevent tracing recursion with kvmclock
        Revert "KVM: PPC: Add support for explicit HIOR setting"
        KVM: VMX: Check for automatic switch msr table overflow
        KVM: VMX: Add support for guest/host-only profiling
        KVM: VMX: add support for switching of PERF_GLOBAL_CTRL
        KVM: s390: announce SYNC_MMU
        KVM: s390: Fix tprot locking
        KVM: s390: handle SIGP sense running intercepts
        KVM: s390: Fix RUNNING flag misinterpretation
      a4cc3889
    • Linus Torvalds's avatar
      Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · bb893d15
      Linus Torvalds authored
      * 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
        ARM: wire up process_vm_writev and process_vm_readv syscalls
        ARM: 7160/1: setup: avoid overflowing {elf,arch}_name from proc_info_list
        ARM: 7158/1: add new MFP implement for NUC900
        ARM: 7157/1: fix a building WARNING for nuc900
        ARM: 7156/1: l2x0: fix compile error on !CONFIG_USE_OF
        ARM: 7155/1: arch.h: Declare 'pt_regs' locally
        ARM: 7154/1: mach-bcmring: fix build error in dma.c
        ARM: 7153/1: mach-bcmring: fix build error in core.c
        ARM: 7152/1: distclean: Remove generated .dtb files
        ARM: 7150/1: Allow kernel unaligned accesses on ARMv6+ processors
        ARM: 7149/1: spi/pl022: Enable clock in probe
        Revert "ARM: 7098/1: kdump: copy kernel relocation code at the kexec prepare stage"
      bb893d15
    • Linus Torvalds's avatar
      Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 2d360fcb
      Linus Torvalds authored
      * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM / Suspend: Fix bug in suspend statistics update
        PM / Hibernate: Fix the early termination of test modes
        PM / shmobile: Fix build of sh7372_pm_init() for CONFIG_PM unset
        PM Sleep: Do not extend wakeup paths to devices with ignore_children set
        PM / driver core: disable device's runtime PM during shutdown
        PM / devfreq: correct Kconfig dependency
        PM / devfreq: fix use after free in devfreq_remove_device
        PM / shmobile: Avoid restoring the INTCS state during initialization
        PM / devfreq: Remove compiler error after irq.h update
        PM / QoS: Properly use the WARN() macro in dev_pm_qos_add_request()
        PM / Clocks: Only disable enabled clocks in pm_clk_suspend()
        ARM: mach-shmobile: sh7372 A3SP no_suspend_console fix
        PM / shmobile: Don't skip debugging output in pd_power_up()
      2d360fcb
    • Avi Kivity's avatar
      KVM guest: prevent tracing recursion with kvmclock · 95ef1e52
      Avi Kivity authored
      Prevent tracing of preempt_disable() in get_cpu_var() in
      kvm_clock_read(). When CONFIG_DEBUG_PREEMPT is enabled,
      preempt_disable/enable() are traced and this causes the function_graph
      tracer to go into an infinite recursion. By open coding the
      preempt_disable() around the get_cpu_var(), we can use the notrace
      version which prevents preempt_disable/enable() from being traced and
      prevents the recursion.
      
      Based on a similar patch for Xen from Jeremy Fitzhardinge.
      Tested-by: default avatarGleb Natapov <gleb@redhat.com>
      Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
      95ef1e52
  4. 19 Nov, 2011 10 commits
  5. 18 Nov, 2011 9 commits
    • Paul Menage's avatar
      cgroup: Replace Paul Menage with Tejun Heo as cgroups maintainer · 860ca0e6
      Paul Menage authored
      As is probably painfully obvious, I don't have time to be a cgroups
      maintainer.  Rather than have me continue to hope that I'll magically
      find more spare time, instead Tejun has kindly agreed to take over the
      role, along with Li Zefan.
      
      -tj: added cgroup tree URL to MAINTAINERS file
      Signed-off-by: default avatarPaul Menage <paul@paulmenage.org>
      Acked-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      LKML-Reference: <1321320612-57855-1-git-send-email-paul@paulmenage.org>
      860ca0e6
    • Srivatsa S. Bhat's avatar
      PM / Hibernate: Fix the early termination of test modes · aa9a7b11
      Srivatsa S. Bhat authored
      Commit 2aede851
      (PM / Hibernate: Freeze kernel threads after preallocating memory)
      postponed the freezing of kernel threads to after preallocating memory
      for hibernation. But while doing that, the hibernation test TEST_FREEZER
      and the test mode HIBERNATION_TESTPROC were not moved accordingly.
      
      As a result, when using these test modes, it only goes upto the freezing of
      userspace and exits, when in fact it should go till the complete end of task
      freezing stage, namely the freezing of kernel threads as well.
      
      So, move these points of exit to appropriate places so that freezing of
      kernel threads is also tested while using these test harnesses.
      Signed-off-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
      aa9a7b11
    • Eric Dumazet's avatar
      ipv4: fix redirect handling · 9cc20b26
      Eric Dumazet authored
      commit f39925db (ipv4: Cache learned redirect information in
      inetpeer.) introduced a regression in ICMP redirect handling.
      
      It assumed ipv4_dst_check() would be called because all possible routes
      were attached to the inetpeer we modify in ip_rt_redirect(), but thats
      not true.
      
      commit 7cc9150e (route: fix ICMP redirect validation) tried to fix
      this but solution was not complete. (It fixed only one route)
      
      So we must lookup existing routes (including different TOS values) and
      call check_peer_redir() on them.
      Reported-by: default avatarIvan Zahariev <famzah@icdsoft.com>
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      CC: Flavio Leitner <fbl@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9cc20b26
    • Alex Elder's avatar
      MAINTAINERS: update XFS maintainer entry · c8891329
      Alex Elder authored
      I will no longer be maintaining XFS for SGI.  Ben Myers
      (bpm@sgi.com) has agreed to be the primary maintainer
      for XFS in my place.  I will continue to be able to push
      commits to the SGI XFS tree if required.  As such I will
      continue to be a designated XFS maintainer, but plan to
      serve in more of a backup role.
      Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
      Signed-off-by: default avatarBen Myers <bpm@sgi.com>
      c8891329
    • Eric Dumazet's avatar
      ping: dont increment ICMP_MIB_INERRORS · fb120c0a
      Eric Dumazet authored
      ping module incorrectly increments ICMP_MIB_INERRORS if feeded with a
      frame not belonging to its own sockets.
      
      RFC 2011 states that ICMP_MIB_INERRORS should count "the number of ICMP
      messages which the entiry received but determined as having
      ICMP-specific errors (bad ICMP checksums, bad length, etc.)."
      Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      CC: Vasiliy Kulikov <segoon@openwall.com>
      Acked-by: default avatarFlavio Leitner <fbl@redhat.com>
      Acked-by: default avatarVasiliy Kulikov <segoon@openwall.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fb120c0a
    • Linus Torvalds's avatar
      Merge branch 'stable/for-linus-fixes-3.2' of... · b6844523
      Linus Torvalds authored
      Merge branch 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen-gntalloc: signedness bug in add_grefs()
        xen-gntalloc: integer overflow in gntalloc_ioctl_alloc()
        xen-gntdev: integer overflow in gntdev_alloc_map()
        xen:pvhvm: enable PVHVM VCPU placement when using more than 32 CPUs.
        xen/balloon: Avoid OOM when requesting highmem
        xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCI
        xen: map foreign pages for shared rings by updating the PTEs directly
      b6844523
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 15bd1cfb
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: add missed trace_block_plug
        paride: fix potential information leak in pg_read()
        bio: change some signed vars to unsigned
        block: avoid unnecessary plug list flush
        cciss: auto engage SCSI mid layer at driver load time
        loop: cleanup set_status interface
        include/linux/bio.h: use a static inline function for bio_integrity_clone()
        loop: prevent information leak after failed read
        block: Always check length of all iov entries in blk_rq_map_user_iov()
        The Windows driver .inf disables ASPM on all cciss devices. Do the same.
        backing-dev: ensure wakeup_timer is deleted
        block: Revert "[SCSI] genhd: add a new attribute "alias" in gendisk"
      15bd1cfb
    • Linus Torvalds's avatar
      Merge branch 'unicore32' of git://github.com/gxt/linux · 9545eb61
      Linus Torvalds authored
      * 'unicore32' of git://github.com/gxt/linux:
        unicore32, exec: remove redundant set_fs(USER_DS)
        unicore32: Fix typo 'PUV3_I2C'
        unicore32: drop unused Kconfig symbols
        rtc: rtc-puv3: Add __devinit and __devexit markers for probe and remove
        arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS
        unicore32: fix build error for find bitops
      9545eb61
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 148b00b6
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/signal32: Fix sigset_t conversion when copying to user
        powerpc: Fix atomic_xxx_return barrier semantics
        powerpc: Remove buggy 9-year-old test for binutils < 2.12.1
        powerpc/book3e-64: Fix debug support for userspace
        powerpc: Remove extraneous CONFIG_PPC_ADV_DEBUG_REGS define
        powerpc: Revert show_regs() define for readability
        powerpc/ps3: Fix SMP lockdep boot warning
        powerpc/ps3: Fix lost SMP IPIs
        powerpc: Add hvcall.h include to book3s_hv.c
        powerpc/trace: Add a dummy stack frame for trace_hardirqs_off
        powerpc: Copy down exception vectors after feature fixups
        powerpc: panic if we can't instantiate RTAS
        powerpc/4xx: Fix typos in kexec config dependencies
        powerpc/fsl: MCU_MPC8349EMITX wants I2C built-in, modular won't do...
        powerpc/fsl_udc_core: Fix dumb typo
        carma-fpga: Missed switch from of_register_platform_driver()
        powerpc: Fix build breakage in jump_label.c
      148b00b6