1. 24 May, 2011 20 commits
  2. 23 May, 2011 20 commits
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · 5e152b4c
      Linus Torvalds authored
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (27 commits)
        PCI: Don't use dmi_name_in_vendors in quirk
        PCI: remove unused AER functions
        PCI/sysfs: move bus cpuaffinity to class dev_attrs
        PCI: add rescan to /sys/.../pci_bus/.../
        PCI: update bridge resources to get more big ranges when allocating space (again)
        KVM: Use pci_store/load_saved_state() around VM device usage
        PCI: Add interfaces to store and load the device saved state
        PCI: Track the size of each saved capability data area
        PCI/e1000e: Add and use pci_disable_link_state_locked()
        x86/PCI: derive pcibios_last_bus from ACPI MCFG
        PCI: add latency tolerance reporting enable/disable support
        PCI: add OBFF enable/disable support
        PCI: add ID-based ordering enable/disable support
        PCI hotplug: acpiphp: assume device is in state D0 after powering on a slot.
        PCI: Set PCIE maxpayload for card during hotplug insertion
        PCI/ACPI: Report _OSC control mask returned on failure to get control
        x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs
        PCI: handle positive error codes
        PCI: check pci_vpd_pci22_wait() return
        PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio
        ...
      
      Fix up trivial conflicts in include/linux/pci_ids.h: commit a6e5e2be
      moved the intel SMBUS ID definitons to the i2c-i801.c driver.
      5e152b4c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · a77febbe
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: obey minleft values during extent allocation correctly
        xfs: reset buffer pointers before freeing them
        xfs: avoid getting stuck during async inode flushes
        xfs: fix xfs_itruncate_start tracing
        xfs: fix duplicate workqueue initialisation
        xfs: kill off xfs_printk()
        xfs: fix race condition in AIL push trigger
        xfs: make AIL target updates and compares 32bit safe.
        xfs: always push the AIL to the target
        xfs: exit AIL push work correctly when AIL is empty
        xfs: ensure reclaim cursor is reset correctly at end of AG
        xfs: add an x86 compat handler for XFS_IOC_ZERO_RANGE
        xfs: fix compiler warning in xfs_trace.h
        xfs: cleanup duplicate initializations
        xfs: reduce the number of pagb_lock roundtrips in xfs_alloc_clear_busy
        xfs: exact busy extent tracking
        xfs: do not immediately reuse busy extent ranges
        xfs: optimize AGFL refills
      a77febbe
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 42cd71bf
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (137 commits)
        ARM: bcmring: convert to use sp804 clockevents
        ARM: bcmring: convert to sp804 clocksource
        ARM: 6912/1: bcmring: Add clkdev table in init_early
        clockevents: ARM sp804: obtain sp804 timer rate via clks
        clockevents: ARM sp804: allow clockevent name to be specified
        clocksource: ARM sp804: obtain sp804 timer rate via clks
        clocksource: ARM sp804: allow clocksource name to be specified
        clocksource: convert OMAP1 to 32-bit down counting clocksource
        clocksource: convert MXS timrotv2 to 32-bit down counting clocksource
        clocksource: convert SPEAr platforms 16-bit up counting clocksource
        clocksource: convert Integrator/AP 16-bit down counting clocksource
        clocksource: convert W90x900 24-bit down counting clocksource
        clocksource: convert ARM 32-bit down counting clocksources
        clocksource: convert ARM 32-bit up counting clocksources
        clocksource: add common mmio clocksource
        ARM: update sa1100 to reflect PXA updates
        ARM: omap1: convert to using readl/writel instead of volatile struct
        ARM: omap1: delete useless interrupt handler
        ARM: s5p: consolidate selection of timer register
        ARM: 6939/1: fix missing 'cpu_relax()' declaration
        ...
      42cd71bf
    • Vikram Narayanan's avatar
      Documentation: update GregKH links · f5039935
      Vikram Narayanan authored
      Fixed the broken links in the SubmittingPatches file.
      
      [ The old links turn out to not be broken after all, but the new links
        are certainly more readable - Linus ]
      Signed-off-by: default avatarVikram Narayanan <vikram186@gmail.com>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f5039935
    • Nicolas Kaiser's avatar
      Documentation: fix vgaarbiter.txt typos etc. · f14d8d3a
      Nicolas Kaiser authored
      Fixed typos.
      
      v2: Incorporated changes by Randy Dunlap.
      Signed-off-by: default avatarNicolas Kaiser <nikai@nikai.net>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f14d8d3a
    • Harry Wei's avatar
      Documentation: update LXR web link · 82082660
      Harry Wei authored
      Update LXR (Linux cross reference) web link.
      Signed-off-by: default avatarHarry Wei <harryxiyou@gmail.com>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      82082660
    • Lucian Adrian Grijincu's avatar
      Documentation: update epoll sysctl text · 52307a9e
      Lucian Adrian Grijincu authored
      max_user_instances was removed in this commit:
      
         commit 9df04e1f
         Author: Davide Libenzi <davidel@xmailserver.org>
         Date:   Thu Jan 29 14:25:26 2009 -0800
      
          epoll: drop max_user_instances and rely only on max_user_watches
      
      but the documentation entry was not removed.
      
      Cc: Davide Libenzi <davidel@xmailserver.org>
      Signed-off-by: default avatarLucian Adrian Grijincu <lucian.grijincu@gmail.com>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      52307a9e
    • Randy Dunlap's avatar
      Documentation: update dontdiff file · 56dab6c2
      Randy Dunlap authored
      v2, updated based on comments from Joe and Paul.
      
      Update to Documentation/dontdiff, based on many updates to
      various .gitignore patches over the last 2 years.
      
      Initially begun by Michael Prokop <mika@grml.org>, with lots of
      changes by Randy Dunlap.
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Cc: Michael Prokop <mika@grml.org>
      Cc: Joe Perches <joe@perches.com>
      Cc: Paul Mundt <lethal@linux-sh.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      56dab6c2
    • 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
    • Russell King's avatar
      Merge branch 'devel-stable' into for-linus · 9a55d975
      Russell King authored
      Conflicts:
      	arch/arm/Kconfig
      	arch/arm/mach-ns9xxx/include/mach/uncompress.h
      9a55d975
    • Russell King's avatar
      Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and... · ec19628d
      Russell King authored
      Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear' into for-linus
      ec19628d
    • 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
    • Russell King's avatar
      Merge branches 'consolidate-clksrc', 'consolidate-flash',... · 4b60e5f9
      Russell King authored
      Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
      4b60e5f9