1. 24 May, 2011 19 commits
  2. 23 May, 2011 21 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-for-linus' of... · ea2b50ef
      Linus Torvalds authored
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, apic: Include module.h header in apic_flat_64.c
        x86, apic: Make apic drivers static
        x86, apic: Clean up bigsmp apic selection code
        x86, apic: Use .apicdrivers section for the apic drivers list
        x86, apic: Introduce .apicdrivers section to find the list of apic drivers
        x86, x2apic: Move the common bits to x2apic.h
        x86, x2apic: Minimize IPI register writes using cluster groups
        x86, x2apic: Track the x2apic cluster sibling map
        x86, x2apic: Remove duplicate code for IPI mask routines
        x86, apic: Use probe routines to simplify apic selection
        x86, ioapic: Consolidate mp_ioapic_routing[] into 'struct ioapic'
        x86, ioapic: Consolidate gsi routing info into 'struct ioapic'
        x86, ioapic: Consolidate mp_ioapics[] into 'struct ioapic'
        x86, ioapic: Consolidate ioapic_saved_data[] into 'struct ioapic'
        x86, ioapic: Add struct ioapic
        x86, ioapic: Remove duplicate code for saving/restoring RTEs
        x86, ioapic: Use ioapic_saved_data while enabling intr-remapping
        x86, ioapic: Allocate ioapic_saved_data early
        x86, ioapic: Fix potential resume deadlock
      ea2b50ef
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of... · 15a3d11b
      Linus Torvalds authored
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched: Increase SCHED_LOAD_SCALE resolution
        sched: Introduce SCHED_POWER_SCALE to scale cpu_power calculations
        sched: Cleanup set_load_weight()
      15a3d11b
    • Linus Torvalds's avatar
      Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 1f3a8e09
      Linus Torvalds authored
      * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (970 commits)
        staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_
        staging:iio: Trivial kconfig reorganization and uniformity improvements.
        staging:iio:documenation partial update.
        staging:iio: use pollfunc allocation helpers in remaining drivers.
        staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify event code spitting out.
        staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev.
        staging:iio:meter:ade7758: Use private data space from iio_allocate_device
        staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value.
        staging:iio: ring core cleanups + check if read_last available in lis3l02dq
        staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name.
        staging:iio: poll func allocation clean up.
        staging:iio:ad7780 trivial unused header cleanup.
        staging:iio:adc: AD7780: Use private data space from iio_allocate_device + trivial fixes
        staging:iio:adc:AD7780: Convert to new channel registration method
        staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv()
        staging:iio:adc: AD7606: Consitently use indio_dev
        staging:iio: Rip out helper for software rings.
        staging:iio:adc:AD7298: Use private data space from iio_allocate_device
        staging:iio: rationalization of different buffer implementation hooks.
        staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from iio_dev.
        ...
      
      Fix up trivial conflicts in
       - drivers/staging/intel_sst/intelmid.c: patches applied in both branches
       - drivers/staging/rt2860/common/cmm_data_{pci,usb}.c: removed vs spelling
       - drivers/staging/usbip/vhci_sysfs.c: trivial header file inclusion
      1f3a8e09
    • Linus Torvalds's avatar
      Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · c44dead7
      Linus Torvalds authored
      * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (205 commits)
        USB: EHCI: Remove SPARC_LEON {read,write}_be definitions from ehci.h
        USB: UHCI: Support big endian GRUSBHC HC
        sparc: add {read,write}*_be routines
        USB: UHCI: Add support for big endian descriptors
        USB: UHCI: Use ACCESS_ONCE rather than using a full compiler barrier
        USB: UHCI: Add support for big endian mmio
        usb-storage: Correct adjust_quirks to include latest flags
        usb/isp1760: Fix possible unlink problems
        usb/isp1760: Move function isp1760_endpoint_disable() within file.
        USB: remove remaining usages of hcd->state from usbcore and fix regression
        usb: musb: ux500: add configuration and build options for ux500 dma
        usb: musb: ux500: add dma glue layer for ux500
        usb: musb: ux500: add dma name for ux500
        usb: musb: ux500: add ux500 specific code for gadget side
        usb: musb: fix compile error
        usb-storage: fix up the unusual_realtek device list
        USB: gadget: f_audio: Fix invalid dereference of initdata
        EHCI: don't rescan interrupt QHs needlessly
        OHCI: fix regression caused by nVidia shutdown workaround
        USB: OTG: msm: Free VCCCX regulator even if we can't set the voltage
        ...
      c44dead7
    • Randy Dunlap's avatar
      x86, apic: Include module.h header in apic_flat_64.c · b18bf094
      Randy Dunlap authored
      apic_flat_64.c needs to include module.h because it uses
      EXPORT_SYMBOL_GPL().
      
      This fixes these warnings on some !SMP randconfigs:
      
        arch/x86/kernel/apic/apic_flat_64.c:31: warning: data definition has no type or storage class
        arch/x86/kernel/apic/apic_flat_64.c:31: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
        arch/x86/kernel/apic/apic_flat_64.c:31: warning: parameter names (without types) in function declaration
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Link: http://lkml.kernel.org/r/20110523104300.dd532a99.randy.dunlap@oracle.comSigned-off-by: default avatarIngo Molnar <mingo@elte.hu>
      b18bf094
    • Linus Torvalds's avatar
      Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · 99dff585
      Linus Torvalds authored
      * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)
        serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
        tty/serial: Fix break handling for PORT_TEGRA
        tty/serial: Add explicit PORT_TEGRA type
        n_tracerouter and n_tracesink ldisc additions.
        Intel PTI implementaiton of MIPI 1149.7.
        Kernel documentation for the PTI feature.
        export kernel call get_task_comm().
        tty: Remove to support serial for S5P6442
        pch_phub: Support new device ML7223
        8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter
        ASoC: Update cx20442 for TTY API change
        pch_uart: Support new device ML7223 IOH
        parport: Use request_muxed_region for IT87 probe and lock
        tty/serial: add support for Xilinx PS UART
        n_gsm: Use print_hex_dump_bytes
        drivers/tty/moxa.c: Put correct tty value
        TTY: tty_io, annotate locking functions
        TTY: serial_core, remove superfluous set_task_state
        TTY: serial_core, remove invalid test
        Char: moxa, fix locking in moxa_write
        ...
      
      Fix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and
      drivers/tty/serial/Makefile.
      
      I did the hci_ldisc thing as an evil merge, cleaning things up.
      99dff585
    • Guenter Roeck's avatar
      hwmon: (coretemp) Fix compile error if CONFIG_SMP is not defined · bb74e8ca
      Guenter Roeck authored
      cpu_sibling_mask() is not defined unless CONFIG_SMP is defined, so it
      must not be used directly in the code without ifdef protection.
      
      To solve the problem and avoid ifdefs in the code, define
      for_each_sibling() and use it instead.
      Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
      Cc: Fenghua Yu <fenghua.yu@intel.com>
      Cc: Durgadoss R <durgadoss.r@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bb74e8ca
    • Linus Torvalds's avatar
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 30cb6d5f
      Linus Torvalds authored
      * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        hrtimers: Reorder clock bases
        hrtimers: Avoid touching inactive timer bases
        hrtimers: Make struct hrtimer_cpu_base layout less stupid
        timerfd: Manage cancelable timers in timerfd
        clockevents: Move C3 stop test outside lock
        alarmtimer: Drop device refcount after rtc_open()
        alarmtimer: Check return value of class_find_device()
        timerfd: Allow timers to be cancelled when clock was set
        hrtimers: Prepare for cancel on clock was set timers
      30cb6d5f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · 4867faab
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        slub: Deal with hyperthetical case of PAGE_SIZE > 2M
        slub: Remove node check in slab_free
        slub: avoid label inside conditional
        slub: Make CONFIG_DEBUG_PAGE_ALLOC work with new fastpath
        slub: Avoid warning for !CONFIG_SLUB_DEBUG
        slub: Remove CONFIG_CMPXCHG_LOCAL ifdeffery
        slub: Move debug handlign in __slab_free
        slub: Move node determination out of hotpath
        slub: Eliminate repeated use of c->page through a new page variable
        slub: get_map() function to establish map of free objects in a slab
        slub: Use NUMA_NO_NODE in get_partial
        slub: Fix a typo in config name
      4867faab
    • Pekka Enberg's avatar
      Merge branch 'slab/next' into for-linus · bfb91fb6
      Pekka Enberg authored
      Conflicts:
      	mm/slub.c
      bfb91fb6
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging · 6fad2b5b
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
        hwmon: (coretemp) Fix checkpatch errors
        hwmon: Remove pkgtemp driver
        hwmon: (coretemp) Merge pkgtemp with coretemp
        hwmon: (pmbus) Add support for Analog Devices ADM1275
        hwmon: (pmbus) Support for TI UCD90xxx series Sequencer and System Health Controllers
        hwmon: (pmbus) Add support for TI UCD9200 series of PWM System Controllers
        hwmon: (pmbus) Use device specific function to read fan configuration
        hwmon: (pmbus) Expand scope of device specific get_status function
        hwmon: (pmbus) Introduce infrastructure to detect sensors and limit registers
        hwmon: Driver for MAX16065 System Manager and compatibles
        hwmon: (sht15) add support for CRC validation
        hwmon: (sht15) add support for the status register
        hwmon: (sht15) clean-up the probe function
        hwmon: (sht15) general code clean-up
        hwmon: Add support for MAX6642
      6fad2b5b
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of... · 19504828
      Linus Torvalds authored
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf tools: Fix sample size bit operations
        perf tools: Fix ommitted mmap data update on remap
        watchdog: Change the default timeout and configure nmi watchdog period based on watchdog_thresh
        watchdog: Disable watchdog when thresh is zero
        watchdog: Only disable/enable watchdog if neccessary
        watchdog: Fix rounding bug in get_sample_period()
        perf tools: Propagate event parse error handling
        perf tools: Robustify dynamic sample content fetch
        perf tools: Pre-check sample size before parsing
        perf tools: Move evlist sample helpers to evlist area
        perf tools: Remove junk code in mmap size handling
        perf tools: Check we are able to read the event size on mmap
      19504828
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 57d19e80
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
        b43: fix comment typo reqest -> request
        Haavard Skinnemoen has left Atmel
        cris: typo in mach-fs Makefile
        Kconfig: fix copy/paste-ism for dell-wmi-aio driver
        doc: timers-howto: fix a typo ("unsgined")
        perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
        md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
        treewide: fix a few typos in comments
        regulator: change debug statement be consistent with the style of the rest
        Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
        audit: acquire creds selectively to reduce atomic op overhead
        rtlwifi: don't touch with treewide double semicolon removal
        treewide: cleanup continuations and remove logging message whitespace
        ath9k_hw: don't touch with treewide double semicolon removal
        include/linux/leds-regulator.h: fix syntax in example code
        tty: fix typo in descripton of tty_termios_encode_baud_rate
        xtensa: remove obsolete BKL kernel option from defconfig
        m68k: fix comment typo 'occcured'
        arch:Kconfig.locks Remove unused config option.
        treewide: remove extra semicolons
        ...
      57d19e80
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · ee9ec4f8
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (36 commits)
        HID: hid-multitouch: cosmetic changes, sort classes and devices
        HID: hid-multitouch: class MT_CLS_STANTUM is redundant with MT_CLS_CONFIDENCE
        HID: hid-multitouch: add support for Unitec panels
        HID: hid-multitouch: add support for Touch International panels
        HID: hid-multitouch: add support for GoodTouch panels
        HID: hid-multitouch: add support for CVTouch panels
        HID: hid-multitouch: add support for ActionStar panels
        HID: hiddev: fix race between hiddev_disconnect and hiddev_release
        HID: magicmouse: ignore 'ivalid report id' while switching modes
        HID: fix a crash in hid_report_raw_event() function.
        HID: hid-multitouch: add support for Elo TouchSystems 2515 IntelliTouch Plus
        HID: assorted usage updates from hut 1.12
        HID: roccat: fix actual/startup profile sysfs attribute in koneplus
        HID: hid-multitouch: Add support for Lumio panels
        HID: 'name' and 'phys' in 'struct hid_device' can never be NULL
        HID: hid-multitouch: add support for Ilitek dual-touch panel
        HID: picolcd: Avoid compile warning/error triggered by copy_from_user()
        HID: add support for Logitech G27 wheel
        HID: hiddev: fix error path in hiddev_read when interrupted
        HID: add support for Sony Navigation Controller
        ...
      ee9ec4f8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm · e0c6b8a1
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
        apm-emulation: apm_mutex breaks ACK; remove it
        APM: take over maintainership
      e0c6b8a1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 710421cc
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (346 commits)
        ASoC: core: Don't set "(null)" as a driver name
        ALSA: hda - Use LPIB for ATI/AMD chipsets as default
        Revert "ALSA: hda - Use position_fix=3 as default for AMD chipsets"
        ASoC: Tegra: Fix compile when debugfs not enabled
        ASoC: spdif-dit: Add missing MODULE_*
        SOUND: OSS: Remove Au1550 driver.
        ALSA: hda - add Intel Panther Point HDMI codec id
        ALSA: emu10k1 - Add dB range to Bass and Treble for SB Live!
        ALSA: hda - Remove PCM mixer elements from Virtual Master of realtek
        ALSA: hda - Fix input-src parse in patch_analog.c
        ASoC: davinci-mcasp: enable ping-pong SRAM buffers
        ASoC: add iPAQ hx4700 machine driver
        ASoC: Asahi Kasei AK4641 codec driver
        ALSA: hda - Enable Realtek ALC269 codec input layer beep
        ALSA: intel8x0m: enable AMD8111 modem
        ALSA: HDA: Add jack detection for HDMI
        ALSA: sound, core, pcm_lib: fix xrun_log
        ASoC: Max98095: Move existing NULL check before pointer dereference.
        ALSA: sound, core, pcm_lib: xrun_log: log also in_interrupt
        ALSA: usb-audio - Add support for USB X-Fi S51 Pro
        ...
      710421cc
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of... · d7ef64a9
      Linus Torvalds authored
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Eliminate various 'set but not used' warnings
        x86, SMEP: Fix section mismatch warnings
        x86, amd: Use _safe() msr access for GartTlbWlk disable code
      d7ef64a9
    • Tejun Heo's avatar
      block: move bd_set_size() above rescan_partitions() in __blkdev_get() · ff2a9941
      Tejun Heo authored
      02e35228 (block: rescan partitions on invalidated devices on
      -ENOMEDIA too) relocated partition rescan above explicit bd_set_size()
      to simplify condition check.  As rescan_partitions() does its own bdev
      size setting, this doesn't break anything; however,
      rescan_partitions() prints out the following messages when adjusting
      bdev size, which can be confusing.
      
        sda: detected capacity change from 0 to 146815737856
        sdb: detected capacity change from 0 to 146815737856
      
      This patch restores the original order and remove the warning
      messages.
      
      stable: Please apply together with 02e35228 (block: rescan
              partitions on invalidated devices on -ENOMEDIA too).
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Reported-by: default avatarTony Luck <tony.luck@gmail.com>
      Tested-by: default avatarTony Luck <tony.luck@gmail.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ff2a9941
    • Linus Torvalds's avatar
      Merge branch 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm · f4b10bc6
      Linus Torvalds authored
      * 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (131 commits)
        KVM: MMU: Use ptep_user for cmpxchg_gpte()
        KVM: Fix kvm mmu_notifier initialization order
        KVM: Add documentation for KVM_CAP_NR_VCPUS
        KVM: make guest mode entry to be rcu quiescent state
        KVM: x86 emulator: Make jmp far emulation into a separate function
        KVM: x86 emulator: Rename emulate_grpX() to em_grpX()
        KVM: x86 emulator: Remove unused arg from emulate_pop()
        KVM: x86 emulator: Remove unused arg from writeback()
        KVM: x86 emulator: Remove unused arg from read_descriptor()
        KVM: x86 emulator: Remove unused arg from seg_override()
        KVM: Validate userspace_addr of memslot when registered
        KVM: MMU: Clean up gpte reading with copy_from_user()
        KVM: PPC: booke: add sregs support
        KVM: PPC: booke: save/restore VRSAVE (a.k.a. USPRG0)
        KVM: PPC: use ticks, not usecs, for exit timing
        KVM: PPC: fix exit accounting for SPRs, tlbwe, tlbsx
        KVM: PPC: e500: emulate SVR
        KVM: VMX: Cache vmcs segment fields
        KVM: x86 emulator: consolidate segment accessors
        KVM: VMX: Avoid reading %rip unnecessarily when handling exceptions
        ...
      f4b10bc6
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 53ee7569
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
        bnx2x: allow device properly initialize after hotplug
        bnx2x: fix DMAE timeout according to hw specifications
        bnx2x: properly handle CFC DEL in cnic flow
        bnx2x: call dev_kfree_skb_any instead of dev_kfree_skb
        net: filter: move forward declarations to avoid compile warnings
        pktgen: refactor pg_init() code
        pktgen: use vzalloc_node() instead of vmalloc_node() + memset()
        net: skb_trim explicitely check the linearity instead of data_len
        ipv4: Give backtrace in ip_rt_bug().
        net: avoid synchronize_rcu() in dev_deactivate_many
        net: remove synchronize_net() from netdev_set_master()
        rtnetlink: ignore NETDEV_RELEASE and NETDEV_JOIN event
        net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE
        bridge: call NETDEV_JOIN notifiers when add a slave
        netpoll: disable netpoll when enslave a device
        macvlan: Forward unicast frames in bridge mode to lowerdev
        net: Remove linux/prefetch.h include from linux/skbuff.h
        ipv4: Include linux/prefetch.h in fib_trie.c
        netlabel: Remove prefetches from list handlers.
        drivers/net: add prefetch header for prefetch users
        ...
      
      Fixed up prefetch parts: removed a few duplicate prefetch.h includes,
      fixed the location of the igb prefetch.h, took my version of the
      skbuff.h code without the extra parentheses etc.
      53ee7569
    • Linus Torvalds's avatar
      Merge branch 'exec_rm_compat' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc · 4d9dec4d
      Linus Torvalds authored
      * 'exec_rm_compat' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc:
        exec: document acct_arg_size()
        exec: unify do_execve/compat_do_execve code
        exec: introduce struct user_arg_ptr
        exec: introduce get_user_arg_ptr() helper
      4d9dec4d