Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tag: v2.6.32-git3
Commits on Dec 9, 2009
  1. @torvalds

    Merge branches 'timers-for-linus-ntp' and 'irq-core-for-linus' of git…

    torvalds authored
    …://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-for-linus-ntp' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      ntp: Provide compability defines (You say MOD_NANO, I say ADJ_NANO)
    
    * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      genirq: do not execute DEBUG_SHIRQ when irq setup failed
  2. @torvalds

    Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/sc…

    torvalds authored
    …m/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      hrtimer: Fix /proc/timer_list regression
      itimers: Fix racy writes to cpu_itimer fields
      timekeeping: Fix clock_gettime vsyscall time warp
  3. @torvalds

    Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux…

    torvalds authored
    …/kernel/git/tip/linux-2.6-tip
    
    * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      timers, init: Limit the number of per cpu calibration bootup messages
      posix-cpu-timers: optimize and document timer_create callback
      clockevents: Add missing include to pacify sparse
      x86: vmiclock: Fix printk format
      x86: Fix printk format due to variable type change
      sparc: fix printk for change of variable type
      clocksource/events: Fix fallout of generic code changes
      nohz: Allow 32-bit machines to sleep for more than 2.15 seconds
      nohz: Track last do_timer() cpu
      nohz: Prevent clocksource wrapping during idle
      nohz: Type cast printk argument
      mips: Use generic mult/shift factor calculation for clocks
      clocksource: Provide a generic mult/shift factor calculation
      clockevents: Use u32 for mult and shift factors
      nohz: Introduce arch_needs_cpu
      nohz: Reuse ktime in sub-functions of tick_check_idle.
      time: Remove xtime_cache
      time: Implement logarithmic time accumulation
  4. @torvalds

    Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/…

    torvalds authored
    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: hpet: Make WARN_ON understandable
      x86: arch specific support for remapping HPET MSIs
      intr-remap: generic support for remapping HPET MSIs
      x86, hpet: Simplify the HPET code
      x86, hpet: Disable per-cpu hpet timer if ARAT is supported
Commits on Dec 8, 2009
  1. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      hwrng: core - Prevent too-small buffer sizes
      hwrng: virtio-rng - Convert to new API
      hwrng: core - Replace u32 in driver API with byte array
      crypto: ansi_cprng - Move FIPS functions under CONFIG_CRYPTO_FIPS
      crypto: testmgr - Add ghash algorithm test before provide to users
      crypto: ghash-clmulni-intel - Put proper .data section in place
      crypto: ghash-clmulni-intel - Use gas macro for PCLMULQDQ-NI and PSHUFB
      crypto: aesni-intel - Use gas macro for AES-NI instructions
      x86: Generate .byte code for some new instructions via gas macro
      crypto: ghash-intel - Fix irq_fpu_usable usage
      crypto: ghash-intel - Add PSHUFB macros
      crypto: ghash-intel - Hard-code pshufb
      crypto: ghash-intel - Fix building failure on x86_32
      crypto: testmgr - Fix warning
      crypto: ansi_cprng - Fix test in get_prng_bytes
      crypto: hash - Remove cra_u.{digest,hash}
      crypto: api - Remove digest case from procfs show handler
      crypto: hash - Remove legacy hash/digest code
      crypto: ansi_cprng - Add FIPS wrapper
      crypto: ghash - Add PCLMULQDQ accelerated implementation
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    torvalds authored
    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      [WATCHDOG] iTCO_wdt.c - cleanup chipset documentation
      [WATCHDOG] iTCO_wdt: Add support for Intel Ibex Peak
      [WATCHDOG] CPUFREQ: S3C24XX Watchdog frequency scaling support.
  3. @torvalds

    Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linu…

    torvalds authored
    …x/kernel/git/tip/linux-2.6-tip
    
    * 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      cpumask: Use modern cpumask style in Xen
  4. @torvalds

    Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux…

    torvalds authored
    …/kernel/git/tip/linux-2.6-tip
    
    * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: UV RTC: Always enable RTC clocksource
      x86: UV RTC: Rename generic_interrupt to x86_platform_ipi
      x86: UV RTC: Clean up error handling
      x86: UV RTC: Add clocksource only boot option
      x86: UV RTC: Fix early expiry handling
  5. @torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …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, mce: don't restart timer if disabled
      x86: Use -maccumulate-outgoing-args for sane mcount prologues
      x86: Prevent GCC 4.4.x (pentium-mmx et al) function prologue wreckage
      x86: AMD Northbridge: Verify NB's node is online
      x86 VSDO: Fix Kconfig help
      x86: Fix typo in Intel CPU cache size descriptor
      x86: Add new Intel CPU cache size descriptors
  6. @torvalds

    Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      vgacon: Add support for setting the default cursor state
      vc: Add support for hiding the cursor when creating VTs
      x86, setup: Store the boot cursor state
  7. @torvalds

    Merge branch 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/l…

    torvalds authored
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86/reboot: Add pci_dev_put in reboot_fixup_32.c for consistency
  8. @torvalds

    Merge branch 'x86-process-for-linus' of git://git.kernel.org/pub/scm/…

    torvalds authored
    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-process-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86-64: merge the standard and compat start_thread() functions
      x86-64: make compat_start_thread() match start_thread()
  9. @torvalds

    Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linu…

    torvalds authored
    …x/kernel/git/tip/linux-2.6-tip
    
    * 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: pat: Remove ioremap_default()
      x86: pat: Clean up req_type special case for reserve_memtype()
      x86: Relegate CONFIG_PAT and CONFIG_MTRR configurability to EMBEDDED
  10. @torvalds

    Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux…

    torvalds authored
    …/kernel/git/tip/linux-2.6-tip
    
    * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (36 commits)
      x86, mm: Correct the implementation of is_untracked_pat_range()
      x86/pat: Trivial: don't create debugfs for memtype if pat is disabled
      x86, mtrr: Fix sorting of mtrr after subtracting
      x86: Move find_smp_config() earlier and avoid bootmem usage
      x86, platform: Change is_untracked_pat_range() to bool; cleanup init
      x86: Change is_ISA_range() into an inline function
      x86, mm: is_untracked_pat_range() takes a normal semiclosed range
      x86, mm: Call is_untracked_pat_range() rather than is_ISA_range()
      x86: UV SGI: Don't track GRU space in PAT
      x86: SGI UV: Fix BAU initialization
      x86, numa: Use near(er) online node instead of roundrobin for NUMA
      x86, numa, bootmem: Only free bootmem on NUMA failure path
      x86: Change crash kernel to reserve via reserve_early()
      x86: Eliminate redundant/contradicting cache line size config options
      x86: When cleaning MTRRs, do not fold WP into UC
      x86: remove "extern" from function prototypes in <asm/proto.h>
      x86, mm: Report state of NX protections during boot
      x86, mm: Clean up and simplify NX enablement
      x86, pageattr: Make set_memory_(x|nx) aware of NX support
      x86, sleep: Always save the value of EFER
      ...
    
    Fix up conflicts (added both iommu_shutdown and is_untracked_pat_range)
    to 'struct x86_platform_ops') in
    	arch/x86/include/asm/x86_init.h
    	arch/x86/kernel/x86_init.c
  11. @torvalds

    Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/sc…

    torvalds authored
    …m/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: ucode-amd: Move family check to microcde_amd.c's init function
      x86, ucode-amd: Ensure ucode update on suspend/resume after CPU off/online cycle
      x86: ucode-amd: Convert printk(KERN_*...) to pr_*(...)
      x86: ucode-amd: Don't warn when no ucode is available for a CPU revision
      x86: ucode-amd: Load ucode-patches once and not separately of each CPU
      x86, amd-ucode: Remove needless log messages
  12. @torvalds

    Merge branch 'x86-entry-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      core: Clean up user return notifers use of per_cpu
  13. @torvalds

    sysfs: deprecated features are to help old tools not to confuse them

    Uwe Kleine-König authored torvalds committed
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Greg KH <gregkh@suse.de>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. @torvalds

    sctp: fix compile error due to sysctl mismerge

    torvalds authored
    I messed up the merge in d7fc02c, where
    the conflict in question wasn't just about CTL_UNNUMBERED being removed,
    but the 'strategy' field is too (sysctl handling is now done through the
    /proc interface, with no duplicate protocols for reading the data).
    
    Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. @torvalds

    Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block

    torvalds authored
    * 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block: (113 commits)
      cfq-iosched: Do not access cfqq after freeing it
      block: include linux/err.h to use ERR_PTR
      cfq-iosched: use call_rcu() instead of doing grace period stall on queue exit
      blkio: Allow CFQ group IO scheduling even when CFQ is a module
      blkio: Implement dynamic io controlling policy registration
      blkio: Export some symbols from blkio as its user CFQ can be a module
      block: Fix io_context leak after failure of clone with CLONE_IO
      block: Fix io_context leak after clone with CLONE_IO
      cfq-iosched: make nonrot check logic consistent
      io controller: quick fix for blk-cgroup and modular CFQ
      cfq-iosched: move IO controller declerations to a header file
      cfq-iosched: fix compile problem with !CONFIG_CGROUP
      blkio: Documentation
      blkio: Wait on sync-noidle queue even if rq_noidle = 1
      blkio: Implement group_isolation tunable
      blkio: Determine async workload length based on total number of queues
      blkio: Wait for cfq queue to get backlogged if group is empty
      blkio: Propagate cgroup weight updation to cfq groups
      blkio: Drop the reference to queue once the task changes cgroup
      blkio: Provide some isolation between groups
      ...
  16. @torvalds

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (54 commits)
      Revert "pata_sis: Implement MWDMA for the UDMA 133 capable chips"
      libata: Clarify ata_set_lba_range_entries function
      libata: Report zeroed read after TRIM and max discard size
      pata_hpt3x2n: fix overclocked MWDMA0 timing
      pata_it8213: MWDMA0 is unsupported
      [libata] MWDMA0 is unsupported on PIIX-like PATA controllers
      pata_via: clear UDMA transfer mode bit for PIO and MWDMA
      pata_sis: Power Management fix
      pata_rz1000: Power Management fix
      pata_radisys: fix UDMA handling
      pata_ns87415: Power Management fix
      pata_marvell: fix marvell_pre_reset() documentation
      pata_legacy: add pointers to QDI65x0 documentation
      pata_legacy: fix access to control register for QDI6580
      pata_legacy: fix QDI6580DP support
      pata_it8213: fix it8213_pre_reset() documentation
      pata_it8213: fix wrong MWDMA timings being programmed
      pata_it8213: fix PIO2 underclocking
      pata_it8213: fix wrong PIO timings being programmed
      pata_it8213: fix UDMA handling
      ...
  17. @torvalds

    Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/tmlind/linux-omap-2.6
    
    * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits)
      arm: omap: Add omap3_defconfig
      AM35xx: Defconfig for AM3517 EVM board
      AM35xx: Add support for AM3517 EVM board
      omap: 3630sdp: defconfig creation
      omap: 3630sdp: introduce 3630 sdp board support
      omap3: Add defconfig for IGEP v2 board
      omap3: Add minimal IGEP v2 support
      omap3: Add CompuLab CM-T35 defconfig
      omap3: Add CompuLab CM-T35 board support
      omap3: rx51: Add wl1251 wlan driver support
      omap3: rx51: Add SDRAM init
      omap1: Add default kernel configuration for Herald
      omap1: Add board support and LCD for HTC Herald
      omap: zoom2: update defconfig for LL_DEBUG_NONE
      omap: zoom3: defconfig creation
      omap3: zoom: Introduce zoom3 board support
      omap3: zoom: Drop i2c-1 speed to 2400
      omap3: zoom: rename zoom2 name to generic zoom
      omap3: zoom: split board file for software reuse
      omap3evm: MIgrate to smsc911x ethernet driver
      ...
    
    Fix trivial conflict (two unrelated config options added next to each
    other) in arch/arm/mach-omap2/Makefile
  18. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/geert/linux-m68k
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
      m68k: parport_mfc3 - Not makes it a bool before the comparison.
      m68k: don't export static inline functions
      fbdev: atafb - add palette register check
      m68k: Remove the BKL from sys_execve
      m68k: Cleanup linker scripts using new linker script macros.
      m68k: Make thread_info.h usable from assembly.
      m68knommu: define arch_has_single_step() and friends
      m68k: ptrace fixes
      m68k: use generic code for ptrace requests
      rtc: Add an RTC driver for the Ricoh RP5C01
      rtc: Add an RTC driver for the Oki MSM6242
  19. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      ieee1394: Use hweight32
      firewire: cdev: reduce stack usage by ioctl_dispatch
      firewire: ohci: 0 may be a valid DMA address
      firewire: core: WARN on wrong usage of core transaction functions
      firewire: core: optimize Topology Map creation
      firewire: core: clarify generate_config_rom usage
      firewire: optimize config ROM creation
      firewire: cdev: normalize variable names
      firewire: normalize style of queue_work wrappers
      firewire: cdev: fix memory leak in an error path
  20. @torvalds

    Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

    torvalds authored
    * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (272 commits)
      Fix soc_common PCMCIA configuration
      ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request
      ARM: 5826/1: SA1100: h3100/h3600: always build htc-egpio driver
      ARM: 5825/1: SA1100: h3600: update defconfig
      ARM: 5824/1: SA1100: reuse h3600 PCMCIA driver on h3100
      ARM: 5823/1: SA1100: h3100/h3600: add support for gpio-keys
      ARM: 5822/1: SA1100: h3100/h3600: clean up #includes
      ARM: 5821/1: SA1100: h3100/h3600: revise copyright boilerplates
      ARM: 5820/1: SA1100: h3100/h3600: split h3600.c
      ARM: 5819/1: SA1100: h3100/h3600: merge h3600.h and h3600_gpio.h into h3xxx.h
      ARM: 5818/1: SA1100: h3100/h3600: drop old GPIO definitions
      ARM: 5817/1: SA1100: h3100/h3600: configure all unused gpios as inputs
      ARM: 5816/1: SA1100: h3600: remove IRQ_GPIO_* definitions
      ARM: 5815/1: SA1100: h3100/h3600: remove now unused assign_h3600_egpio handlers
      ARM: 5814/1: SA1100: h3100/h3600: convert all users of assign_h3600_egpio to gpiolib
      ARM: 5813/1: SA1100: h3100/h3600: add htc-egpio driver
      ARM: 5812/1: SA1100: h3100/h3600: separate machine-specific LCD helpers
      ARM: 5811/2: pcmcia: convert sa1100_h3600 driver to gpiolib
      ARM: 5799/1: SA1100: h3600: stop setting direction for LCD pins
      ARM: 5798/1: SA1100: h3600: remove unused cruft from h3600.h
      ...
  21. @torvalds

    Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/ke…

    torvalds authored
    …rnel/git/jdelvare/staging
    
    * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      i2c-stub: Documentation update
      i2c-stub: Allow user to disable some commands
      i2c-stub: Implement I2C block support
      i2c: Refactor for_each callbacks
      i2c-i801: Retry on lost arbitration
      i2c: Remove big kernel lock from i2cdev_open
      ics932s401: Clean up detect function
      i2c: Simplify i2c_detect_address
      i2c: Drop probe, ignore and force module parameters
      i2c: Add missing __devinit markers to old i2c adapter drivers
      i2c: Bus drivers don't have to support I2C_M_REV_DIR_ADDR
      i2c: Prevent priority inversion on top of bus lock
      i2c-voodoo3: Delete
      i2c-powermac: Drop temporary name buffer
      i2c-powermac: Include the i2c_adapter in struct pmac_i2c_bus
      i2c-powermac: Log errors
      i2c-powermac: Refactor i2c_powermac_smbus_xfer
      i2c-powermac: Reject unsupported I2C transactions
      i2c/chips: Move ds1682 to drivers/misc
  22. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/rafael/suspend-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      PM: Add flag for devices capable of generating run-time wake-up events
      PM / Runtime: Remove unnecessary braces in __pm_runtime_set_status()
      PM / Runtime: Make documentation of runtime_idle() agree with the code
      PM / Runtime: Ensure timer_expires is nonzero in pm_schedule_suspend()
      PM / Runtime: Use deferred_resume flag in pm_request_resume
      PM / Runtime: Export the PM runtime workqueue
      PM / Runtime: Fix lockdep warning in __pm_runtime_set_status()
      PM / Hibernate: Swap, use KERN_CONT
      PM / Hibernate: Shift remaining code from swsusp.c to hibernate.c
      PM / Hibernate: Move swap functions to kernel/power/swap.c.
      PM / freezer: Don't get over-anxious while waiting
  23. @torvalds

    Merge branch 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/vir…

    torvalds authored
    …t/kvm/kvm
    
    * 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (84 commits)
      KVM: VMX: Fix comparison of guest efer with stale host value
      KVM: s390: Fix prefix register checking in arch/s390/kvm/sigp.c
      KVM: Drop user return notifier when disabling virtualization on a cpu
      KVM: VMX: Disable unrestricted guest when EPT disabled
      KVM: x86 emulator: limit instructions to 15 bytes
      KVM: s390: Make psw available on all exits, not just a subset
      KVM: x86: Add KVM_GET/SET_VCPU_EVENTS
      KVM: VMX: Report unexpected simultaneous exceptions as internal errors
      KVM: Allow internal errors reported to userspace to carry extra data
      KVM: Reorder IOCTLs in main kvm.h
      KVM: x86: Polish exception injection via KVM_SET_GUEST_DEBUG
      KVM: only clear irq_source_id if irqchip is present
      KVM: x86: disallow KVM_{SET,GET}_LAPIC without allocated in-kernel lapic
      KVM: x86: disallow multiple KVM_CREATE_IRQCHIP
      KVM: VMX: Remove vmx->msr_offset_efer
      KVM: MMU: update invlpg handler comment
      KVM: VMX: move CR3/PDPTR update to vmx_set_cr3
      KVM: remove duplicated task_switch check
      KVM: powerpc: Fix BUILD_BUG_ON condition
      KVM: VMX: Use shared msr infrastructure
      ...
    
    Trivial conflicts due to new Kconfig options in arch/Kconfig and kernel/Makefile
  24. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits)
      mac80211: fix reorder buffer release
      iwmc3200wifi: Enable wimax core through module parameter
      iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter
      iwmc3200wifi: Coex table command does not expect a response
      iwmc3200wifi: Update wiwi priority table
      iwlwifi: driver version track kernel version
      iwlwifi: indicate uCode type when fail dump error/event log
      iwl3945: remove duplicated event logging code
      b43: fix two warnings
      ipw2100: fix rebooting hang with driver loaded
      cfg80211: indent regulatory messages with spaces
      iwmc3200wifi: fix NULL pointer dereference in pmkid update
      mac80211: Fix TX status reporting for injected data frames
      ath9k: enable 2GHz band only if the device supports it
      airo: Fix integer overflow warning
      rt2x00: Fix padding bug on L2PAD devices.
      WE: Fix set events not propagated
      b43legacy: avoid PPC fault during resume
      b43: avoid PPC fault during resume
      tcp: fix a timewait refcnt race
      ...
    
    Fix up conflicts due to sysctl cleanups (dead sysctl_check code and
    CTL_UNNUMBERED removed) in
    	kernel/sysctl_check.c
    	net/ipv4/sysctl_net_ipv4.c
    	net/ipv6/addrconf.c
    	net/sctp/sysctl.c
  25. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:
      sparc: Set UTS_MACHINE correctly.
      sparc,leon: init_leon srmmu cleanup
      sparc32: Remove early interrupt enable.
      sparc, leon: Added Aeroflex Gaisler entry in manufacturer_info structure
      sparc64: Faster early-boot framebuffer console.
      Revert "sparc: Make atomic locks raw"
      sparc: remove unused nfsd #includes
      sparc: Fixup last users of irq_chip->typename
      Added sparc_leon3_snooping_enabled() and converted extern inline to static inline
      No auxio on LEON
      apbuart: Use of_find_node_by_path to find root node.
      sparc: Replace old style lock initializer
      sparc: Make atomic locks raw
      apbuart: Fix build and missing driver unregister.
      apbuart: Kill dependency on deprecated Sparc-only PROM interfaces.
      apbuart: Fix build warning.
      sparc: Support for GRLIB APBUART serial port
      watchdog: Remove BKL from rio watchdog driver
      sparc: Remove BKL from apc
      sparc,leon: Sparc-Leon SMP support
  26. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (294 commits)
      S3C64XX: Staticise platform data for PCM devices
      ASoC: Rename controls with a / in wm_hubs
      snd-fm801: autodetect SF64-PCR (tuner-only) card
      ALSA: tea575x-tuner: fix mute
      ASoC: au1x: dbdma2: plug memleak in pcm device creation error path
      ASoC: au1x: dbdma2: fix oops on soc device removal.
      ALSA: hda - Fix memory leaks in the previous patch
      ALSA: hda - Add ALC661/259, ALC892/888VD support
      ALSA: opti9xx: remove snd_opti9xx fields
      ALSA: aaci - Clean up duplicate code
      ALSA: usb - Fix mixer map for Hercules Gamesurround Muse Pocket LT
      ALSA: hda - Add position_fix quirk for HP dv3
      ALSA: hda - Add a pin-fix for FSC Amilo Pi1505
      ALSA: hda - Fix Cxt5047 test mode
      ASoC: pxa/raumfeld: adopt new snd_soc_dai_set_pll() API
      ASoC: sh: fsi: Add runtime PM support
      sh: ms7724se: Add runtime PM support for FSI
      ALSA: hda - Add a position_fix quirk for MSI Wind U115
      ALSA: opti-miro: add PnP detection
      ALSA: opti-miro: separate comon probing code
      ...
  27. @torvalds

    Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

    torvalds authored
    * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
      of: merge of_find_all_nodes() implementations
      of: merge other miscellaneous prototypes
      of: merge of_*_flat_dt*() functions
      of: merge of_node_get(), of_node_put() and of_find_all_nodes()
      of: merge of_read_number() an of_read_ulong()
      of: merge of_node_*_flag() and set_node_proc_entry()
      of: merge struct boot_param_header from Microblaze and PowerPC
      of: add common header for flattened device tree representation
      of: Move OF_IS_DYNAMIC and OF_MARK_DYNAMIC macros to of.h
      of: merge struct device_node
      of: merge phandle, ihandle and struct property
      of: Rework linux/of.h and asm/prom.h include ordering
  28. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6: (43 commits)
      security/tomoyo: Remove now unnecessary handling of security_sysctl.
      security/tomoyo: Add a special case to handle accesses through the internal proc mount.
      sysctl: Drop & in front of every proc_handler.
      sysctl: Remove CTL_NONE and CTL_UNNUMBERED
      sysctl: kill dead ctl_handler definitions.
      sysctl: Remove the last of the generic binary sysctl support
      sysctl net: Remove unused binary sysctl code
      sysctl security/tomoyo: Don't look at ctl_name
      sysctl arm: Remove binary sysctl support
      sysctl x86: Remove dead binary sysctl support
      sysctl sh: Remove dead binary sysctl support
      sysctl powerpc: Remove dead binary sysctl support
      sysctl ia64: Remove dead binary sysctl support
      sysctl s390: Remove dead sysctl binary support
      sysctl frv: Remove dead binary sysctl support
      sysctl mips/lasat: Remove dead binary sysctl support
      sysctl drivers: Remove dead binary sysctl support
      sysctl crypto: Remove dead binary sysctl support
      sysctl security/keys: Remove dead binary sysctl support
      sysctl kernel: Remove binary sysctl logic
      ...
Commits on Dec 7, 2009
  1. @rhvgoyal

    cfq-iosched: Do not access cfqq after freeing it

    rhvgoyal authored Jens Axboe committed
    Fix a crash during boot reported by Jeff Moyer. Fix the issue of accessing
    cfqq after freeing it.
    
    Reported-by: Jeff Moyer <jmoyer@redhat.com>
    Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
    Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
    Signed-off-by: Jens Axboe <axboe@carl.(none)>
  2. Revert "pata_sis: Implement MWDMA for the UDMA 133 capable chips"

    Jeff Garzik authored Jeff Garzik committed
    This reverts commit f20941f.
    
    Sergei Shtylyov notes "You call min() on uncomparables [in
    mwdma_clip_to_pio()], i.e. mwdma_to_pio[] contains XFER_PIO_* and
    adev->pio_mode - XFER_PIO_0 yields you a mode number.  Thus the second
    argument will always "win" as a minimal one"
    
    Bartlomiej Zolnierkiewicz adds "There are more issues with the patch related
    to mwdma_clip_to_pio().  The function can return values between 0 and
    4 which obviously won't work well for the new code below for values
    >2 (i.e. resulting in out-of-bounds array access for the common-case
    of dev->pio_mode == XFER_PIO_4)."
    
    Bartlomiej Zolnierkiewicz also notes the patch is incomplete, failing to
    update MWDMA mode masks.
    
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  3. block: include linux/err.h to use ERR_PTR

    Stephen Rothwell authored Jens Axboe committed
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Something went wrong with that request. Please try again.