Permalink
Commits on Jun 28, 2010
  1. Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      tracing: Fix undeclared ENOSYS in include/linux/tracepoint.h
      perf record: prevent kill(0, SIGTERM);
      perf session: Remove threads from tree on PERF_RECORD_EXIT
      perf/tracing: Fix regression of perf losing kprobe events
      perf_events: Fix Intel Westmere event constraints
      perf record: Don't call newt functions when not initialized
    torvalds committed Jun 28, 2010
  2. Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      genirq: Deal with desc->set_type() changing desc->chip
    torvalds committed Jun 28, 2010
  3. Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched: Prevent compiler from optimising the sched_avg_update() loop
      sched: Fix over-scheduling bug
      sched: Fix PROVE_RCU vs cpu_cgroup
    torvalds committed Jun 28, 2010
  4. Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm…

    …/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      nohz: Fix nohz ratelimit
    torvalds committed Jun 28, 2010
  5. Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched: silence PROVE_RCU in sched_fork()
      idr: fix RCU lockdep splat in idr_get_next()
      rcu: apply RCU protection to wake_affine()
    torvalds committed Jun 28, 2010
  6. Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, Calgary: Increase max PHB number
      x86: Fix rebooting on Dell Precision WorkStation T7400
      x86: Fix vsyscall on gcc 4.5 with -Os
      x86, pat: Proper init of memtype subtree_max_end
      um, hweight: Fix UML boot crash due to x86 optimized hweight
      x86, setup: Set ax register in boot vga query
      percpu, x86: Avoid warnings of unused variables in per cpu
      x86, irq: Rename gsi_end gsi_top, and fix off by one errors
      x86: use __ASSEMBLY__ rather than __ASSEMBLER__
    torvalds committed Jun 28, 2010
  7. Merge branch 'fixes' of ssh://master.kernel.org/~sfr/next-fixes

    * 'fixes' of ssh://master.kernel.org/~sfr/next-fixes:
      acpi: update gfp/slab.h includes
      ocfs2: update gfp/slab.h includes
      davinci: update gfp/slab.h includes
      arm: update gfp/slab.h includes
      v4l-dvb: update gfp/slab.h includes
    torvalds committed Jun 28, 2010
  8. Merge branch 'for-linus' of git://neil.brown.name/md

    * 'for-linus' of git://neil.brown.name/md:
      md/raid5: don't include 'spare' drives when reshaping to fewer devices.
      md/raid5: add a missing 'continue' in a loop.
      md/raid5: Allow recovered part of partially recovered devices to be in-sync
      md/raid5: More careful check for "has array failed".
      md: Don't update ->recovery_offset when reshaping an array to fewer devices.
      md/raid5: avoid oops when number of devices is reduced then increased.
      md: enable raid4->raid0 takeover
      md: clear layout after ->raid0 takeover
      md: fix raid10 takeover: use new_layout for setup_conf
      md: fix handling of array level takeover that re-arranges devices.
      md: raid10: Fix null pointer dereference in fix_read_error()
      Restore partition detection of newly created md arrays.
    torvalds committed Jun 28, 2010
  9. acpi: update gfp/slab.h includes

    Implicit slab.h inclusion via percpu.h is about to go away.  Make sure
    gfp.h or slab.h is included as necessary.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Cc: Len Brown <lenb@kernel.org>
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    htejun committed with Stephen Rothwell Mar 29, 2010
  10. ocfs2: update gfp/slab.h includes

    Implicit slab.h inclusion via percpu.h is about to go away.  Make sure
    gfp.h or slab.h is included as necessary.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Cc: Joel Becker <joel.becker@oracle.com>
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    htejun committed with Stephen Rothwell Mar 29, 2010
  11. davinci: update gfp/slab.h includes

    Implicit slab.h inclusion via percpu.h is about to go away.  Make sure
    gfp.h or slab.h is included as necessary.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Cc: Kevin Hilman <khilman@deeprootsystems.com>
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    htejun committed with Stephen Rothwell Mar 29, 2010
  12. arm: update gfp/slab.h includes

    Implicit slab.h inclusion via percpu.h is about to go away.  Make sure
    gfp.h or slab.h is included as necessary.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Cc: Russell King <linux@arm.linux.org.uk>
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    htejun committed with Stephen Rothwell Mar 29, 2010
  13. v4l-dvb: update gfp/slab.h includes

    Implicit slab.h inclusion via percpu.h is about to go away.  Make sure
    gfp.h or slab.h is included as necessary.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    htejun committed with Stephen Rothwell Mar 29, 2010
Commits on Jun 27, 2010
  1. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tj/percpu
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
      percpu: fix first chunk match in per_cpu_ptr_to_phys()
      percpu: fix trivial bugs in pcpu_build_alloc_info()
    torvalds committed Jun 27, 2010
  2. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (52 commits)
      phylib: Add autoload support for the LXT973 phy.
      ISDN: hysdn, fix potential NULL dereference
      vxge: fix memory leak in vxge_alloc_msix() error path
      isdn/gigaset: correct CAPI connection state storage
      isdn/gigaset: encode HLC and BC together
      isdn/gigaset: correct CAPI DATA_B3 Delivery Confirmation
      isdn/gigaset: correct CAPI voice connection encoding
      isdn/gigaset: honor CAPI application's buffer size request
      cpmac: do not leak struct net_device on phy_connect errors
      smc91c92_cs: fix the problem that lan & modem does not work simultaneously
      ipv6: fix NULL reference in proxy neighbor discovery
      Bluetooth: Bring back var 'i' increment
      xfrm: check bundle policy existance before dereferencing it
      sky2: enable rx/tx in sky2_phy_reinit()
      cnic: Disable statistics initialization for eth clients that do not support statistics
      net: add dependency on fw class module to qlcnic and netxen_nic
      snmp: fix SNMP_ADD_STATS()
      hso: remove setting of low_latency flag
      udp: Fix bogus UFO packet generation
      lasi82596: fix netdev_mc_count conversion
      ...
    torvalds committed Jun 27, 2010
  3. Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/n…

    …fs-2.6
    
    * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
      NFSv4: Fix an embarassing typo in encode_attrs()
      NFSv4: Ensure that /proc/self/mountinfo displays the minor version number
      NFSv4.1: Ensure that we initialise the session when following a referral
      SUNRPC: Fix a re-entrancy bug in xs_tcp_read_calldir()
      nfs4 use mandatory attribute file type in nfs4_get_root
    torvalds committed Jun 27, 2010
  4. Merge branch 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    …nel/git/lethal/sh-2.6
    
    * 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      clocksource: sh_cmt: Fix up bogus shift value.
      arch/sh/mm: Eliminate a double lock
      sh: Fix up IORESOURCE_PCI_FIXED usage in pcibios_fixup_device_resources().
      sh: remove duplicated #include
    torvalds committed Jun 27, 2010
  5. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      MAINTAINERS - Add an entry for the input MT protocol
      Input: wacom - fix serial number handling on Cintiq 21UX2
      Input: fixup X86_MRST selects
      Input: sysrq - fix "stuck" SysRq mode
      Input: ad7877 - fix spi word size to 16 bit
      Input: pcf8574_keypad - fix off by one in pcf8574_kp_irq_handler()
    torvalds committed Jun 27, 2010
  6. Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/jack/linux-fs-2.6
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
      ext3: update ctime when changing the file's permission by setfacl
      ext2: update ctime when changing the file's permission by setfacl
    torvalds committed Jun 27, 2010
  7. Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    …t/rusty/linux-2.6
    
    * 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6:
      virtio-pci: disable msi at startup
      virtio: return ENOMEM on out of memory
    torvalds committed Jun 27, 2010
  8. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI/PM: Do not use native PCIe PME by default
    torvalds committed Jun 27, 2010
  9. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: usb/endpoint, fix dangling pointer use
      ALSA: asihpi - Get rid of incorrect "long" types and casts.
      ASoC: DaVinci: Fix McASP hardware FIFO configuration
      ALSA: hda - Fix line-in for mb5 model MacBook (Pro) 5,1 / 5,2
      ALSA: usb-audio: fix UAC2 control value queries
      ALSA: usb-audio: parse UAC2 sample rate ranges correctly
      ALSA: usb-audio: fix control messages for USB_RECIP_INTERFACE
      ALSA: usb-audio: add check for faulty clock in parse_audio_format_rates_v2()
      ALSA: hda - Don't check capture source mixer if no ADC is available
    torvalds committed Jun 27, 2010
  10. Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: (k8temp) Bypass core swapping on single-core processors
      hwmon: (i5k_amb) Fix sysfs attribute for lockdep
      hwmon: (k10temp) Do not blacklist known working CPU models
    torvalds committed Jun 27, 2010
  11. Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      watchdog: at32ap700x_wdt: register misc device last in probe() function
      watchdog: [PATCH 3/3] imx2_wdt: fix section mismatch
    torvalds committed Jun 27, 2010
  12. Merge git://git.infradead.org/iommu-2.6

    * git://git.infradead.org/iommu-2.6:
      intel-iommu: Force-disable IOMMU for iGFX on broken Cantiga revisions.
      intel-iommu: Fix double lock in get_domain_for_dev()
      intel-iommu: Fix reference by physical address in intel_iommu_attach_device()
    torvalds committed Jun 27, 2010
  13. Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

    * 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
      OMAP: OMAPFB: fix rfbi.c compile error
      OMAPFB: LCDC: change update_mode to DISABLED when going suspend
    torvalds committed Jun 27, 2010
  14. Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      MAINTAINERS: change mailing list address for CIFS
      cifs: remove bogus first_time check in NTLMv2 session setup code
      cifs: don't call cifs_new_fileinfo unless cifs_open succeeds
      cifs: don't ignore cifs_posix_open_inode_helper return value
      cifs: clean up arguments to cifs_open_inode_helper
      cifs: pass instantiated filp back after open call
      cifs: move cifs_new_fileinfo call out of cifs_posix_open
      cifs: implement drop_inode superblock op
      cifs: don't attempt busy-file rename unless it's in same directory
    torvalds committed Jun 27, 2010
  15. Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6

    * 'merge' of git://git.secretlab.ca/git/linux-2.6:
      powerpc/5200: fix lite5200 ethernet phy address
      powerpc/5200: Fix build error in sound code.
      powerpc/5200: fix oops during going to standby
      powerpc/5200: add lite5200 onboard I2C eeprom and flash
      maintainers: Add git trees for SPI and device tree
      of: Drop properties with "/" in their name
    torvalds committed Jun 27, 2010
  16. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/mattst88/alpha-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
      alpha: Fix de2104x driver failing to readout MAC address correctly
      alpha: Detect Super IO chip, no IDE on Avanti, enable EPP19
      alpha: fix pci_mmap_resource API breakage
      alpha: fix __arch_hweight32 typo
    torvalds committed Jun 27, 2010
  17. Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc: Fix mpic_resume on early G5 macs
      powerpc: rtas_flash needs to use rtas_data_buf
      powerpc: Unconditionally enabled irq stacks
      powerpc/kexec: Wait for online/possible CPUs only.
      powerpc: Disable CONFIG_SYSFS_DEPRECATED
      powerpc/boot: Remove addRamdisk.c since it is now unused
      powerpc: Move kdump default base address to 64MB on 64bit
      powerpc: Remove dead CONFIG_HIGHPTE
      powerpc/fsl-booke: Move loadcam_entry back to asm code to fix SMP ftrace
      powerpc/fsl-booke: Fix InstructionTLBError execute permission check
    torvalds committed Jun 27, 2010
  18. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      TPM: ReadPubEK output struct fix
    torvalds committed Jun 27, 2010
  19. Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    …git/mmarek/kbuild-2.6
    
    * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
      kbuild: fix LOCALVERSION handling to match description
      kbuild: Fix modpost segfault
    torvalds committed Jun 27, 2010
  20. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      ACPI / PM: Do not enable GPEs for system wakeup in advance
      ACPICA: Truncate I/O addresses to 16 bits for Windows compatibility
      ACPICA: Limit maximum time for Sleep() operator
      ACPICA: Fix namestring associated with AE_NO_HANDLER exception
      ACPI / ACPICA: Fix sysfs GPE interface
      ACPI / ACPICA: Fix GPE initialization
      ACPI / ACPICA: Avoid writing full enable masks to GPE registers
      ACPI / ACPICA: Fix low-level GPE manipulation code
      ACPI / ACPICA: Use helper function for computing GPE masks
      ACPI / ACPICA: Do not attempt to disable GPE when installing handler
      ACPI: Disable Vista compatibility for Sony VGN-NS50B_L
      ACPI: fan: fix unbalanced code block
      ACPI: Store NVS state even when entering suspend to RAM
      suspend: Move NVS save/restore code to generic suspend functionality
      ACPI: Do not try to set up acpi processor stuff on cores exceeding maxcpus=
      ACPI: acpi_pad: Don't needlessly mark LAPIC unstable
    torvalds committed Jun 27, 2010
  21. KEYS: Propagate error code instead of returning -EINVAL

    This is from a Smatch check I'm writing.
    
    strncpy_from_user() returns -EFAULT on error so the first change just
    silences a warning but doesn't change how the code works.
    
    The other change is a bug fix because install_thread_keyring_to_cred()
    can return a variety of errors such as -EINVAL, -EEXIST, -ENOMEM or
    -EKEYREVOKED.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    error27 committed with torvalds Jun 11, 2010
  22. phylib: Add autoload support for the LXT973 phy.

    Commit e13647c (phylib: Add support for the LXT973 phy.) added a new ID
    but neglected to also add it to the MODULE_DEVICE_TABLE.
    
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    dwmw2 committed with davem330 Jun 22, 2010