1. 28 10月, 2011 12 次提交
  2. 27 10月, 2011 12 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 396e6e49
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (68 commits)
        Input: adp5589-keys - add support for the ADP5585 derivatives
        Input: imx_keypad - add pm suspend and resume support
        Input: force feedback - potential integer wrap in input_ff_create()
        Input: tsc2007 - make sure that X plate resistance is specified
        Input: serio_raw - fix memory leak when closing char device
        Input: serio_raw - kick clients when disconnecting port
        Input: serio_raw - explicitly mark disconnected ports as dead
        Input: serio_raw - fix coding style issues
        Input: serio_raw - use dev_*() for messages
        Input: serio_raw - use bool for boolean data
        Input: serio_raw - perform proper locking when adding clients to list
        Input: serio_raw - rename serio_raw_list to serio_raw_client
        Input: serio_raw - use kref instead of rolling out its own refcounting
        Input: psmouse - switch to using dev_*() for messages
        Input: wacom - correct max Y value on medium bamboos
        Input: wacom - add ABS_DISTANCE to Bamboo Pen reports
        Input: wacom - remove unneeded touch pressure initialization
        Input: lm8323 - wrap suspend and resume in CONFIG_PM_SLEEP
        Input: ad7879-i2c - wrap suspend and resume in CONFIG_PM_SLEEP
        Input: synaptics_i2c - wrap suspend and resume in CONFIG_PM_SLEEP
        ...
      396e6e49
    • L
      Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · 18974369
      Linus Torvalds 提交于
      * 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
        ARM: 7131/1: clkdev: Add Common Macro for clk_lookup
        clk: spi-pl022: convert to clk_prepare()/clk_unprepare()
        clk: timer-sp: convert to clk_prepare()/clk_unprepare()
        clk: sa1111: convert to clk_prepare()/clk_unprepare()
        clk: mmci: convert to clk_prepare()/clk_unprepare()
        clk: amba-pl011: convert to clk_prepare()/clk_unprepare()
        clk: amba-pl010: convert to clk_prepare()/clk_unprepare()
        clk: amba-clcd: convert to clk_prepare()/clk_unprepare()
        clk: amba bus: convert to clk_prepare()/clk_unprepare()
        clk: provide prepare/unprepare functions
      18974369
    • L
      Merge branch 'amba' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · 7e0a6fd5
      Linus Torvalds 提交于
      * 'amba' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
        ARM: 7079/1: spi: Fix builderror in spi-pl022.c
        PM: add runtime PM support to MMCI
        PM: add runtime PM support to core Primecell driver
      7e0a6fd5
    • L
      Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · ca906662
      Linus Torvalds 提交于
      * 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
        ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h>
        ARM: 7104/1: plat-pxa: break out GPIO driver specifics
        ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
        ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
        ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>
        ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
        ARM: 7083/1: rewrite U300 GPIO to use gpiolib
        ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
        ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
        ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
        ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
        ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
        ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
        ARM: 7057/1: mach-pnx4008: rename GPIO header
        ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>
        ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
        ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
        ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
        ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
        ARM: 7043/1: mach-ixp2000: rename GPIO header
        ...
      
      Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually
      ca906662
    • B
      fs/Makefile: Stupid typo breakage of exofs inclusion · 60325f0c
      Boaz Harrosh 提交于
      In my last patch I did a stupid mistake and broke the exofs
      compilation completely. Fix it ASAP.
      
      Instead of obj-y I did obj-$(y)
      
      Really Really sorry. Me totally blushing :-{|
      Signed-off-by: NBoaz Harrosh <bharrosh@panasas.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      60325f0c
    • L
      Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6 · 5fffb951
      Linus Torvalds 提交于
      * 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6:
        of_mdio: Don't phy_scan_fixups() twice
        Devicetree: Expand on ARM Primecell binding documentation
        dt: Add empty of_match_node() macro
        dt: add empty dt helpers for non-dt build
        devicetree: fix build error on drivers/tty/serial/altera_jtaguart.c
        devicetree: Add ARM pl022 spi controller binding doc
        devicetree: Add ARM pl061 gpio controller binding doc
        of/irq: of_irq_find_parent: check for parent equal to child
        MAINTAINERS: update devicetree maintainers
        dt: add helper to read 64-bit integers
        tty: use of_match_ptr() for of_match_table entry
        OF: Add of_match_ptr() macro
        dt: add empty for_each_child_of_node, of_find_property
        devicetree: Document Qualcomm and Atmel prefixes
        serial/imx: add of_alias_get_id() reference back
        dt: add of_alias_scan and of_alias_get_id
        devicetree: Add a registry of vendor prefixes
      5fffb951
    • L
      Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev · b96d7157
      Linus Torvalds 提交于
      * 'upstream-linus' of git://github.com/jgarzik/libata-dev: (50 commits)
        pata_efar: fix register naming used in efar_set_piomode()
        pata_rdc: add Power Management support
        ata_piix: unify code for programming PIO and MWDMA timings
        ata_piix: SITRE handling fix
        libata: make ata_sff_data_xfer_noirq() work with 32-bit PIO
        pata_artop: add Power Management support
        pata_sl82c105: add Power Management support
        pata_pdc2027x: add Power Management support
        pata_legacy: use PIO mask defines
        pata_legacy: unify QDI ->set_piomode methods
        libata: remove no longer needed pata_qdi driver
        pata_it8213: fix register naming used in it8213_set_piomode()
        pata_it8213: add UDMA100 and UDMA133 support
        pata_rdc: parallel scanning needs an extra locking
        pata_via: add via_fixup()
        libata: ata_timing_compute() fixup
        pata_scc: add proper cable detection method
        pata_arasan_cf: remove bogus to_platform_device() calls
        pata_atiixp: add proper ->prereset method
        pata_serverworks: add serverworks_fixup()
        ...
      b96d7157
    • D
      Merge branch 'next' into for-linus · 6ad390a2
      Dmitry Torokhov 提交于
      6ad390a2
    • L
      Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux · 138c4ae9
      Linus Torvalds 提交于
      * 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
        tools, slub: Fix off-by-one buffer corruption after readlink() call
        slub: Discard slab page when node partial > minimum partial number
        slub: correct comments error for per cpu partial
        mm: restrict access to slab files under procfs and sysfs
        slub: Code optimization in get_partial_node()
        slub: doc: update the slabinfo.c file path
        slub: explicitly document position of inserting slab to partial list
        slub: update slabinfo tools to report per cpu partial list statistics
        slub: per cpu cache for partial pages
        slub: return object pointer from get_partial() / new_slab().
        slub: pass kmem_cache_cpu pointer to get_partial()
        slub: Prepare inuse field in new_slab()
        slub: Remove useless statements in __slab_alloc
        slub: free slabs without holding locks
        slub: use print_hex_dump
        slab: use print_hex_dump
      138c4ae9
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 3b3dd79d
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
        Blackfin: irq: remove IRQF_DISABLED
        Blackfin: boards: clean up i2c_board_info
        Blackfin: drop unused Kconfig symbol
        Blackfin: bf537-stamp: register ASoC EVAL-ADAU1373 board driver
        Blackfin: bf537-stamp: Register adav801 codec and ASoC machine driver
        Blackfin: bf537-stamp: register adau1701 codec and asoc machine driver
        Blackfin: merge asm/mutex.h into kbuild too
        Blackfin: bf537-stamp: fix ad73311 codec config macro
        Blackfin: bf537-stamp: fix ad1836 name
        Blackfin: kgdb_test: rework code to avoid -O0 usage
        Blackfin: fix sparse warnings in copy_to/from_user
        Blackfin: bf548-ezkit: update defconfig
        Blackfin: SMP: fix scheduling deadlock
        Blackfin: H8606: fixup bogus ioresource init
        Blackfin: SMP: convert to common asm-generic/atomic.h
      3b3dd79d
    • L
      Merge branch 'for-linus' of git://neil.brown.name/md · c3ae1f33
      Linus Torvalds 提交于
      * 'for-linus' of git://neil.brown.name/md: (34 commits)
        md: Fix some bugs in recovery_disabled handling.
        md/raid5: fix bug that could result in reads from a failed device.
        lib/raid6: Fix filename emitted in generated code
        md.c: trivial comment fix
        MD: Allow restarting an interrupted incremental recovery.
        md: clear In_sync bit on devices added to an active array.
        md: add proper write-congestion reporting to RAID1 and RAID10.
        md: rename "mdk_personality" to "md_personality"
        md/bitmap remove fault injection options.
        md/raid5: typedef removal: raid5_conf_t -> struct r5conf
        md/raid1: typedef removal: conf_t -> struct r1conf
        md/raid10: typedef removal: conf_t -> struct r10conf
        md/raid0: typedef removal: raid0_conf_t -> struct r0conf
        md/multipath: typedef removal: multipath_conf_t -> struct mpconf
        md/linear: typedef removal: linear_conf_t -> struct linear_conf
        md/faulty: remove typedef: conf_t -> struct faulty_conf
        md/linear: remove typedefs: dev_info_t -> struct dev_info
        md: remove typedefs: mirror_info_t -> struct mirror_info
        md: remove typedefs: r10bio_t -> struct r10bio and r1bio_t -> struct r1bio
        md: remove typedefs: mdk_thread_t -> struct md_thread
        ...
      c3ae1f33
    • L
      Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd · c28cfd60
      Linus Torvalds 提交于
      * 'for-linus' of git://git.open-osd.org/linux-open-osd: (21 commits)
        ore: Enable RAID5 mounts
        exofs: Support for RAID5 read-4-write interface.
        ore: RAID5 Write
        ore: RAID5 read
        fs/Makefile: Always inspect exofs/
        ore: Make ore_calc_stripe_info EXPORT_SYMBOL
        ore/exofs: Change ore_check_io API
        ore/exofs: Define new ore_verify_layout
        ore: Support for partial component table
        ore: Support for short read/writes
        exofs: Support for short read/writes
        ore: Remove check for ios->kern_buff in _prepare_for_striping to later
        ore: cleanup: Embed an ore_striping_info inside ore_io_state
        ore: Only IO one group at a time (API change)
        ore/exofs: Change the type of the devices array (API change)
        ore: Make ore_striping_info and ore_calc_stripe_info public
        exofs: Remove unused data_map member from exofs_sb_info
        exofs: Rename struct ore_components comps => oc
        exofs/super.c: local functions should be static
        exofs/ore.c: local functions should be static
        ...
      c28cfd60
  3. 26 10月, 2011 16 次提交
    • L
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · dfa4a423
      Linus Torvalds 提交于
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86-64, unistd: Remove bogus __IGNORE_getcpu
        x86, mm, trivial: Remove unnecessary get_order() in free_thread_info()
        x86, cleanup: Remove unneeded version.h include from arch/x86/
      dfa4a423
    • L
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7b86572a
      Linus Torvalds 提交于
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86-64: Fix CFI data for interrupt frames
        x86-64: Don't apply destructive erratum workaround on unaffected CPUs
      7b86572a
    • L
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0791e98d
      Linus Torvalds 提交于
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/irq: Standardize on CONFIG_SPARSE_IRQ=y
        x86, ioapic: Clean up ioapic/apic_id usage
        x86, ioapic: Factor out print_IO_APIC() to only print one io apic
        x86, ioapic: Print out irte with right ioapic index
        x86, ioapic: Split up setup_ioapic_entry()
        x86, ioapic: Pass struct irq_attr * to setup_ioapic_irq()
        apic, i386/bigsmp: Fix false warnings regarding logical APIC ID mismatches
      0791e98d
    • L
      Remove stale "depends on NETDEV_1000"in staging drivers · edb34a4d
      Linus Torvalds 提交于
      Mark Einon points out that the Kconfig option for NETDEV_1000 no longer
      exists, and the merge of the staging drivers should have removed that
      for the et131x driver.
      
      And while checking for it, I noticed that slicoss had the same stale
      dependency.  Remove that one too.
      Reported-by: NMark Einon <mark.einon@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      edb34a4d
    • L
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 39adff5f
      Linus Torvalds 提交于
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
        time, s390: Get rid of compile warning
        dw_apb_timer: constify clocksource name
        time: Cleanup old CONFIG_GENERIC_TIME references that snuck in
        time: Change jiffies_to_clock_t() argument type to unsigned long
        alarmtimers: Fix error handling
        clocksource: Make watchdog reset lockless
        posix-cpu-timers: Cure SMP accounting oddities
        s390: Use direct ktime path for s390 clockevent device
        clockevents: Add direct ktime programming function
        clockevents: Make minimum delay adjustments configurable
        nohz: Remove "Switched to NOHz mode" debugging messages
        proc: Consider NO_HZ when printing idle and iowait times
        nohz: Make idle/iowait counter update conditional
        nohz: Fix update_ts_time_stat idle accounting
        cputime: Clean up cputime_to_usecs and usecs_to_cputime macros
        alarmtimers: Rework RTC device selection using class interface
        alarmtimers: Add try_to_cancel functionality
        alarmtimers: Add more refined alarm state tracking
        alarmtimers: Remove period from alarm structure
        alarmtimers: Remove interval cap limit hack
        ...
      39adff5f
    • P
      e182a345
    • L
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8a4a8918
      Linus Torvalds 提交于
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (46 commits)
        llist: Add back llist_add_batch() and llist_del_first() prototypes
        sched: Don't use tasklist_lock for debug prints
        sched: Warn on rt throttling
        sched: Unify the ->cpus_allowed mask copy
        sched: Wrap scheduler p->cpus_allowed access
        sched: Request for idle balance during nohz idle load balance
        sched: Use resched IPI to kick off the nohz idle balance
        sched: Fix idle_cpu()
        llist: Remove cpu_relax() usage in cmpxchg loops
        sched: Convert to struct llist
        llist: Add llist_next()
        irq_work: Use llist in the struct irq_work logic
        llist: Return whether list is empty before adding in llist_add()
        llist: Move cpu_relax() to after the cmpxchg()
        llist: Remove the platform-dependent NMI checks
        llist: Make some llist functions inline
        sched, tracing: Show PREEMPT_ACTIVE state in trace_sched_switch
        sched: Remove redundant test in check_preempt_tick()
        sched: Add documentation for bandwidth control
        sched: Return unused runtime on group dequeue
        ...
      8a4a8918
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8686a0e2
      Linus Torvalds 提交于
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Fix insn decoder for longer instruction
      8686a0e2
    • L
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7115e3fc
      Linus Torvalds 提交于
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (121 commits)
        perf symbols: Increase symbol KSYM_NAME_LEN size
        perf hists browser: Refuse 'a' hotkey on non symbolic views
        perf ui browser: Use libslang to read keys
        perf tools: Fix tracing info recording
        perf hists browser: Elide DSO column when it is set to just one DSO, ditto for threads
        perf hists: Don't consider filtered entries when calculating column widths
        perf hists: Don't decay total_period for filtered entries
        perf hists browser: Honour symbol_conf.show_{nr_samples,total_period}
        perf hists browser: Do not exit on tab key with single event
        perf annotate browser: Don't change selection line when returning from callq
        perf tools: handle endianness of feature bitmap
        perf tools: Add prelink suggestion to dso update message
        perf script: Fix unknown feature comment
        perf hists browser: Apply the dso and thread filters when merging new batches
        perf hists: Move the dso and thread filters from hist_browser
        perf ui browser: Honour the xterm colors
        perf top tui: Give color hints just on the percentage, like on --stdio
        perf ui browser: Make the colors configurable and change the defaults
        perf tui: Remove unneeded call to newtCls on startup
        perf hists: Don't format the percentage on hist_entry__snprintf
        ...
      
      Fix up conflicts in arch/x86/kernel/kprobes.c manually.
      
      Ingo's tree did the insane "add volatile to const array", which just
      doesn't make sense ("volatile const"?).  But we could remove the const
      *and* make the array volatile to make doubly sure that gcc doesn't
      optimize it away..
      
      Also fix up kernel/trace/ring_buffer.c non-data-conflicts manually: the
      reader_lock has been turned into a raw lock by the core locking merge,
      and there was a new user of it introduced in this perf core merge.  Make
      sure that new use also uses the raw accessor functions.
      7115e3fc
    • L
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1f6e0517
      Linus Torvalds 提交于
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier
        genirq: Fix fatfinered fixup really
        genirq: percpu: allow interrupt type to be set at enable time
        genirq: Add support for per-cpu dev_id interrupts
        genirq: Add IRQCHIP_SKIP_SET_WAKE flag
      1f6e0517
    • L
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 19b4a8d5
      Linus Torvalds 提交于
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (45 commits)
        rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp()
        rcu: Remove rcu_needs_cpu_flush() to avoid false quiescent states
        rcu: Wire up RCU_BOOST_PRIO for rcutree
        rcu: Make rcu_torture_boost() exit loops at end of test
        rcu: Make rcu_torture_fqs() exit loops at end of test
        rcu: Permit rt_mutex_unlock() with irqs disabled
        rcu: Avoid having just-onlined CPU resched itself when RCU is idle
        rcu: Suppress NMI backtraces when stall ends before dump
        rcu: Prohibit grace periods during early boot
        rcu: Simplify unboosting checks
        rcu: Prevent early boot set_need_resched() from __rcu_pending()
        rcu: Dump local stack if cannot dump all CPUs' stacks
        rcu: Move __rcu_read_unlock()'s barrier() within if-statement
        rcu: Improve rcu_assign_pointer() and RCU_INIT_POINTER() documentation
        rcu: Make rcu_assign_pointer() unconditionally insert a memory barrier
        rcu: Make rcu_implicit_dynticks_qs() locals be correct size
        rcu: Eliminate in_irq() checks in rcu_enter_nohz()
        nohz: Remove nohz_cpu_mask
        rcu: Document interpretation of RCU-lockdep splats
        rcu: Allow rcutorture's stat_interval parameter to be changed at runtime
        ...
      19b4a8d5
    • L
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3cfef952
      Linus Torvalds 提交于
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
        rtmutex: Add missing rcu_read_unlock() in debug_rt_mutex_print_deadlock()
        lockdep: Comment all warnings
        lib: atomic64: Change the type of local lock to raw_spinlock_t
        locking, lib/atomic64: Annotate atomic64_lock::lock as raw
        locking, x86, iommu: Annotate qi->q_lock as raw
        locking, x86, iommu: Annotate irq_2_ir_lock as raw
        locking, x86, iommu: Annotate iommu->register_lock as raw
        locking, dma, ipu: Annotate bank_lock as raw
        locking, ARM: Annotate low level hw locks as raw
        locking, drivers/dca: Annotate dca_lock as raw
        locking, powerpc: Annotate uic->lock as raw
        locking, x86: mce: Annotate cmci_discover_lock as raw
        locking, ACPI: Annotate c3_lock as raw
        locking, oprofile: Annotate oprofilefs lock as raw
        locking, video: Annotate vga console lock as raw
        locking, latencytop: Annotate latency_lock as raw
        locking, timer_stats: Annotate table_lock as raw
        locking, rwsem: Annotate inner lock as raw
        locking, semaphores: Annotate inner lock as raw
        locking, sched: Annotate thread_group_cputimer as raw
        ...
      
      Fix up conflicts in kernel/posix-cpu-timers.c manually: making
      cputimer->cputime a raw lock conflicted with the ABBA fix in commit
      bcd5cff7 ("cputimer: Cure lock inversion").
      3cfef952
    • L
      Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 98265300
      Linus Torvalds 提交于
      * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, ioapic: Consolidate the explicit EOI code
        x86, ioapic: Restore the mask bit correctly in eoi_ioapic_irq()
        x86, kdump, ioapic: Reset remote-IRR in clear_IO_APIC
        iommu: Rename the DMAR and INTR_REMAP config options
        x86, ioapic: Define irq_remap_modify_chip_defaults()
        x86, msi, intr-remap: Use the ioapic set affinity routine
        iommu: Cleanup ifdefs in detect_intel_iommu()
        iommu: No need to set dmar_disabled in check_zero_address()
        iommu: Move IOMMU specific code to intel-iommu.c
        intr_remap: Call dmar_dev_scope_init() explicitly
        x86, x2apic: Enable the bios request for x2apic optout
      98265300
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 37d96c28
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        caif: Fix BUG() with network namespaces
        net: make bonding slaves honour master's skb->priority
        net: Unlock sock before calling sk_free()
      37d96c28
    • L
      Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · aa77677e
      Linus Torvalds 提交于
      * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
        staging: et131x: Remove redundant check and return statement
        staging: et131x: Mainly whitespace changes to appease checkpatch
        staging: et131x: Remove last of the forward declarations
        staging: et131x: Remove even more forward declarations
        staging: et131x: Remove yet more forward declarations
        staging: et131x: Remove more forward declarations
        staging: et131x: Remove forward declaration of et131x_adapter_setup
        staging: et131x: Remove some forward declarations
        staging: et131x: Remove unused rx_ring.recv_packet_pool
        staging: et131x: Remove call to find pci pm capability
        staging: et131x: Remove redundant et131x_reset_recv() call
        staging: et131x: Remove unused rx_ring.recv_buffer_pool
        Staging: bcm: Fix three initialization errors in InterfaceDld.c
        Staging: bcm: Fix coding style issues in InterfaceDld.c
        staging:iio:dac: Add AD5360 driver
        staging:iio:trigger:bfin-timer: Fix compile error
        Staging: vt6655: add some range checks before memcpy()
        Staging: vt6655: whitespace fixes to iotcl.c
        Staging: vt6656: add some range checks before memcpy()
        Staging: vt6656: whitespace cleanups in ioctl.c
        ...
      
      Fix up conflicts in:
       - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
      	vg driver movement
       - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
      	driver removal vs now stale changes
       - drivers/staging/rtl8192e/r8192E_core.c:
      	driver removal vs now stale changes
       - drivers/staging/et131x/et131*:
      	driver consolidation into one file, tried to do fixups
      aa77677e
    • L
      Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · efb8d21b
      Linus Torvalds 提交于
      * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (79 commits)
        TTY: serial_core: Fix crash if DCD drop during suspend
        tty/serial: atmel_serial: bootconsole removed from auto-enumerates
        Revert "TTY: call tty_driver_lookup_tty unconditionally"
        tty/serial: atmel_serial: add device tree support
        tty/serial: atmel_serial: auto-enumerate ports
        tty/serial: atmel_serial: whitespace and braces modifications
        tty/serial: atmel_serial: change platform_data variable name
        tty/serial: RS485 bindings for device tree
        TTY: call tty_driver_lookup_tty unconditionally
        TTY: pty, release tty in all ptmx_open fail paths
        TTY: make tty_add_file non-failing
        TTY: drop driver reference in tty_open fail path
        8250_pci: Fix kernel panic when pch_uart is disabled
        h8300: drivers/serial/Kconfig was moved
        parport_pc: release IO region properly if unsupported ITE887x card is found
        tty: Support compat_ioctl get/set termios_locked
        hvc_console: display printk messages on console.
        TTY: snyclinkmp: forever loop in tx_load_dma_buffer()
        tty/n_gsm: avoid fifo overflow in gsm_dlci_data_output
        tty/n_gsm: fix a bug in gsm_dlci_data_output (adaption = 2 case)
        ...
      
      Fix up Conflicts in:
       - drivers/tty/serial/8250_pci.c
      	Trivial conflict with removed duplicate device ID
       - drivers/tty/serial/atmel_serial.c
      	Annoying silly conflict between "specify the port num via
      	platform_data" and other changes to atmel_console_init
      efb8d21b