1. 01 Oct, 2012 40 commits
    • Olof Johansson's avatar
      Merge branch 'next/boards' into HEAD · a8e1ceb7
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/drivers' into HEAD · 8b1a13b0
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/soc2' into HEAD · 5c008d70
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/cleanup2' into HEAD · 5d3a0a95
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/dt' into HEAD · 7e95c548
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/soc' into HEAD · 6d55d596
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/maintainers' into HEAD · f7b967bf
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/cleanup' into HEAD · ed0a0ed0
      Olof Johansson authored
    • Olof Johansson's avatar
    • Linus Torvalds's avatar
      Merge tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · d9a80746
      Linus Torvalds authored
      Pull USB changes from Greg Kroah-Hartman:
       "Here is the big USB pull request for 3.7-rc1
        There are lots of gadget driver changes (including copying a bunch of
        files into the drivers/staging/ccg/ directory so that the other gadget
        drivers can be fixed up properly without breaking that driver), and we
        remove the old obsolete ub.c driver from the tree.
        There are also the usual XHCI set of updates, and other various driver
        changes and updates.  We also are trying hard to remove the old dbg()
        macro, but the final bits of that removal will be coming in through
        the networking tree before we can delete it for good.
        All of these patches have been in the linux-next tree.
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      Fix up several annoying - but fairly mindless - conflicts due to the
      termios structure having moved into the tty device, and often clashing
      with dbg -> dev_dbg conversion.
      * tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (339 commits)
        USB: ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc
        USB: uas: fix gcc warning
        USB: uas: fix locking
        USB: Fix race condition when removing host controllers
        USB: uas: add locking
        USB: uas: fix abort
        USB: uas: remove aborted field, replace with status bit.
        USB: uas: fix task management
        USB: uas: keep track of command urbs
        xhci: Intel Panther Point BEI quirk.
        powerpc/usb: remove checking PHY_CLK_VALID for UTMI PHY
        USB: ftdi_sio: add TIAO USB Multi-Protocol Adapter (TUMPA) support
        Revert "usb : Add sysfs files to control port power."
        USB: serial: remove vizzini driver
        usb: host: xhci: Fix Null pointer dereferencing with 71c731a2 for non-x86 systems
        Increase XHCI suspend timeout to 16ms
        USB: ohci-at91: fix null pointer in ohci_hcd_at91_overcurrent_irq
        USB: sierra_ms: don't keep unused variable
        fsl/usb: Add support for USB controller version 2.4
        USB: qcaux: add Pantech vendor class match
    • Linus Torvalds's avatar
      Merge tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 3498d13b
      Linus Torvalds authored
      Pull TTY changes from Greg Kroah-Hartman:
       "As we skipped the merge window for 3.6-rc1 for the tty tree,
        everything is now settled down and working properly, so we are ready
        for 3.7-rc1.  Here's the patchset, it's big, but the large changes are
        removing a firmware file and adding a staging tty driver (it depended
        on the tty core changes, so it's going through this tree instead of
        the staging tree.)
        All of these patches have been in the linux-next tree for a while.
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      Fix up more-or-less trivial conflicts in
       - drivers/char/pcmcia/synclink_cs.c:
          tty NULL dereference fix vs tty_port_cts_enabled() helper function
       - drivers/staging/{Kconfig,Makefile}:
          add-add conflict (dgrp driver added close to other staging drivers)
       - drivers/staging/ipack/devices/ipoctal.c:
          "split ipoctal_channel from iopctal" vs "TTY: use tty_port_register_device"
      * tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (235 commits)
        tty/serial: Add kgdb_nmi driver
        tty/serial/amba-pl011: Quiesce interrupts in poll_get_char
        tty/serial/amba-pl011: Implement poll_init callback
        tty/serial/core: Introduce poll_init callback
        kdb: Turn KGDB_KDB=n stubs into static inlines
        kdb: Implement disable_nmi command
        kernel/debug: Mask KGDB NMI upon entry
        serial: pl011: handle corruption at high clock speeds
        serial: sccnxp: Make 'default' choice in switch last
        serial: sccnxp: Remove mask termios caps for SW flow control
        serial: sccnxp: Report actual baudrate back to core
        serial: samsung: Add poll_get_char & poll_put_char
        Powerpc 8xx CPM_UART setting MAXIDL register proportionaly to baud rate
        Powerpc 8xx CPM_UART maxidl should not depend on fifo size
        Powerpc 8xx CPM_UART too many interrupts
        Powerpc 8xx CPM_UART desynchronisation
        serial: set correct baud_base for EXSYS EX-41092 Dual 16950
        serial: omap: fix the reciever line error case
        8250: blacklist Winbond CIR port
        8250_pnp: do pnp probe before legacy probe
    • Linus Torvalds's avatar
      Merge tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · def7cb8c
      Linus Torvalds authored
      Pull staging tree update from Greg Kroah-Hartman:
       "Here is the big staging tree update for the 3.7-rc1 merge window.
        There are a few patches in here that are outside of the staging area,
        namely HID and IIO patches, but all of them have been acked by the
        relevant subsystem maintainers.  The IIO stuff is still coming in
        through this tree as it hasn't entirely moved out of the staging tree,
        but is almost there.
        Other than that, there wa a ton of work on the comedi drivers to make
        them more readable and the correct style.  Doing that removed a lot of
        code, but we added a new driver to the staging tree, so we didn't end
        up with a net reduction this time around:
         662 files changed, 51649 insertions(+), 26582 deletions(-)
        All of these patches have been in the linux-next tree already.
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      * tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1094 commits)
        staging: comedi: jr3_pci: fix iomem dereference
        staging: comedi: drivers: use comedi_fc.h cmdtest helpers
        Staging: winbond: usb_free_urb(NULL) is safe
        Staging: winbond: checkpatch cleanup
        Staging: winbond: Removed undesired spaces, lines and tabs
        Staging: winbond: Typo corrections in comments
        Staging: winbond: Changed c99 comments to c89 comments
        staging: r8712u: Do not queue cloned skb
        staging: comedi: ni_mio_common: always lock in ni_ai_poll()
        staging: comedi: s626: add FIXME comment
        staging: comedi: s626: don't dereference insn->data
        staging: comedi: s526: fix if() check in s526_gpct_winsn()
        staging: comedi: s626: cleanup comments in s626_initialize()
        staging: comedi: s626: remove clear of kzalloc'ed data
        staging: comedi: s626: remove 'WDInterval' from private data
        staging: comedi: s626: remove 'ChargeEnabled' from private data
        staging: comedi: s626: remove 'IsBoardRevA' comment
        staging: comedi: s626: #if 0 out the "SAA7146 BUG WORKAROUND"
        staging: comedi: s626: remove 'allocatedBuf' from private data
        staging: comedi: s626: add final attach message
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 06d2fe15
      Linus Torvalds authored
      Pull driver core merge from Greg Kroah-Hartman:
       "Here is the big driver core update for 3.7-rc1.
        A number of firmware_class.c updates (as you saw a month or so ago),
        and some hyper-v updates and some printk fixes as well.  All patches
        that are outside of the drivers/base area have been acked by the
        respective maintainers, and have all been in the linux-next tree for a
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      * tag 'driver-core-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (95 commits)
        memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()
        device.h: Add missing inline to #ifndef CONFIG_PRINTK dev_vprintk_emit
        memory: emif: Add ifdef CONFIG_DEBUG_FS guard for emif_debugfs_[init|exit]
        Documentation: Fixes some translation error in Documentation/zh_CN/gpio.txt
        Documentation: Remove 3 byte redundant code at the head of the Documentation/zh_CN/arm/booting
        Documentation: Chinese translation of Documentation/video4linux/omap3isp.txt
        device and dynamic_debug: Use dev_vprintk_emit and dev_printk_emit
        dev: Add dev_vprintk_emit and dev_printk_emit
        netdev_printk/netif_printk: Remove a superfluous logging colon
        netdev_printk/dynamic_netdev_dbg: Directly call printk_emit
        dev_dbg/dynamic_debug: Update to use printk_emit, optimize stack
        driver-core: Shut up dev_dbg_reatelimited() without DEBUG
        tools/hv: Parse /etc/os-release
        tools/hv: Check for read/write errors
        tools/hv: Fix exit() error code
        tools/hv: Fix file handle leak
        Tools: hv: Implement the KVP verb - KVP_OP_GET_IP_INFO
        Tools: hv: Rename the function kvp_get_ip_address()
        Tools: hv: Implement the KVP verb - KVP_OP_SET_IP_INFO
        Tools: hv: Add an example script to configure an interface
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 3aebd34b
      Linus Torvalds authored
      Pull char/misc driver merge from Greg Kroah-Hartman:
       "Here is the "big" char/misc driver tree update for the 3.7-rc1 merge
        Nothing major, just a number of driver updates and fixes, all of which
        have been in the linux-next releases for a while now either in my
        tree, or in Andrew's (the lis3l driver changes came from his tree last
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      * tag 'char-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (52 commits)
        drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init
        drivers/misc/lis3lv02d/lis3lv02d_spi.c: add lis3lv02d device tree init
        drivers/misc/lis3lv02d: remove lis3lv02d driver DT init
        drivers/misc/lis3lv02d/lis3lv02d_spi.c: add DT matching table passthru code
        drivers/misc/lis3lv02d: add generic DT matching code
        lis3lv02d: fix some comments specific to lis331dlh driver
        MISC: hpilo, remove pci_disable_device
        pcmcia: synclink_cs: fix potential tty NULL dereference
        drivers/char/mmtimer.c: Remove useless kfree
        drivers/char: removes unnecessary semicolon
        char/misc: remove CONFIG_EXPERIMENTAL dependencies
        mei: don't print buffer as a string
        mei: struct mei_message_data doesn't have to be packed
        mei: add error messages for open count errors
        misc: use module_spi_driver
        tifm: use module_pci_driver
        misc/at25, dt: Improve at25 SPI eeprom device tree bindings.
        mei: add lynx point pci device ids
        mei: fix max number of open handles
        mei: rename struct pci_dev *mei_device to mei_pdev
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux · 2c0c86d5
      Linus Torvalds authored
      Pull clk framework update from Michael Turquette:
       "The common clk framework changes for 3.7 are dominated by ARM platform
        ports to the framework along with one MIPS port, one MFD port, one
        minor framework enhancement and one helper function for platforms
        expressing their clock data through device tree."
      * tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux:
        clk: add of_clk_src_onecell_get() support
        clk: ux500: Define smp_twd clock for u8500
        mfd: dbx500: Provide a more accurate smp_twd clock
        clk: ux500: Support for prmcu_rate clock
        clk: Provide option for clk_get_rate to issue hw for new rate
        clock: max77686: Add driver for Maxim 77686 32Khz crystal oscillator.
        ARM: ux500: Switch to use common clock framework
        clk: ux500: Clock definitions for u8500
        clk: ux500: First version of clock definitions for ux500
        clk: ux500: Adapt PRCMU and PRCC clocks for common clk
        clk: versatile: make config option boolean
        clk: add Loongson1B clock support
        arm: mmp: make all SOCs use common clock by default
        clk: mmp: add clock definition for mmp2
        clk: mmp: add clock definition for pxa910
        clk: mmp: add clock definition for pxa168
        clk: mmp: add mmp specific clocks
        clk: convert ARM RealView to common clk
        clk: prima2: move from arch/arm/mach to drivers/clk
        ARM: PRIMA2: convert to common clk and finish full clk tree
    • Linus Torvalds's avatar
      Merge tag 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · fdb2f9c2
      Linus Torvalds authored
      Pull PCI changes from Bjorn Helgaas:
       "Host bridge hotplug
          - Protect acpi_pci_drivers and acpi_pci_roots (Taku Izumi)
          - Clear host bridge resource info to avoid issue when releasing
            (Yinghai Lu)
          - Notify acpi_pci_drivers when hot-plugging host bridges (Jiang Liu)
          - Use standard list ops for acpi_pci_drivers (Jiang Liu)
        Device hotplug
          - Use pci_get_domain_bus_and_slot() to close hotplug races (Jiang
          - Remove fakephp driver (Bjorn Helgaas)
          - Fix VGA ref count in hotplug remove path (Yinghai Lu)
          - Allow acpiphp to handle PCIe ports without native hotplug (Jiang
          - Implement resume regardless of pciehp_force param (Oliver Neukum)
          - Make pci_fixup_irqs() work after init (Thierry Reding)
          - Add pci_pcie_type(dev) and remove pci_dev.pcie_type (Yijing Wang)
          - Factor out PCI Express Capability accessors (Jiang Liu)
          - Add pcibios_window_alignment() so powerpc EEH can use generic
            resource assignment (Gavin Shan)
          - Make pci_error_handlers const (Stephen Hemminger)
          - Cleanup drivers/pci/remove.c (Bjorn Helgaas)
          - Improve Vendor-Specific Extended Capability support (Bjorn
          - Use standard list ops for bus->devices (Bjorn Helgaas)
          - Avoid kmalloc in pci_get_subsys() and pci_get_class() (Feng Tang)
          - Reassign invalid bus number ranges (Intel DP43BF workaround)
            (Yinghai Lu)"
      * tag 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (102 commits)
        PCI: acpiphp: Handle PCIe ports without native hotplug capability
        PCI/ACPI: Use acpi_driver_data() rather than searching acpi_pci_roots
        PCI/ACPI: Protect acpi_pci_roots list with mutex
        PCI/ACPI: Use acpi_pci_root info rather than looking it up again
        PCI/ACPI: Pass acpi_pci_root to acpi_pci_drivers' add/remove interface
        PCI/ACPI: Protect acpi_pci_drivers list with mutex
        PCI/ACPI: Notify acpi_pci_drivers when hot-plugging PCI root bridges
        PCI/ACPI: Use normal list for struct acpi_pci_driver
        PCI/ACPI: Use DEVICE_ACPI_HANDLE rather than searching acpi_pci_roots
        PCI: Fix default vga ref_count
        ia64/PCI: Clear host bridge aperture struct resource
        x86/PCI: Clear host bridge aperture struct resource
        PCI: Stop all children first, before removing all children
        Revert "PCI: Use hotplug-safe pci_get_domain_bus_and_slot()"
        PCI: Provide a default pcibios_update_irq()
        PCI: Discard __init annotations for pci_fixup_irqs() and related functions
        PCI: Use correct type when freeing bus resource list
        PCI: Check P2P bridge for invalid secondary/subordinate range
        PCI: Convert "new_id"/"remove_id" into generic pci_bus driver attributes
        xen-pcifront: Use hotplug-safe pci_get_domain_bus_and_slot()
    • Linus Torvalds's avatar
      Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 81f56e53
      Linus Torvalds authored
      Pull arm64 support from Catalin Marinas:
       "Linux support for the 64-bit ARM architecture (AArch64)
        Features currently supported:
         - 39-bit address space for user and kernel (each)
         - 4KB and 64KB page configurations
         - Compat (32-bit) user applications (ARMv7, EABI only)
         - Flattened Device Tree (mandated for all AArch64 platforms)
         - ARM generic timers"
      * tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (35 commits)
        arm64: ptrace: remove obsolete ptrace request numbers from user headers
        arm64: Do not set the SMP/nAMP processor bit
        arm64: MAINTAINERS update
        arm64: Build infrastructure
        arm64: Miscellaneous header files
        arm64: Generic timers support
        arm64: Loadable modules
        arm64: Miscellaneous library functions
        arm64: Performance counters support
        arm64: Add support for /proc/sys/debug/exception-trace
        arm64: Debugging support
        arm64: Floating point and SIMD
        arm64: 32-bit (compat) applications support
        arm64: User access library functions
        arm64: Signal handling support
        arm64: VDSO support
        arm64: System calls handling
        arm64: ELF definitions
        arm64: SMP support
        arm64: DMA mapping API
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 6c09931b
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "The main new feature is machine support for System zEC12 including
        transactional memory, runtime instrumentation, support for scm block
        devices via eadm subchannels, and support for CEX4 crypto cards.
        In addition there are some nice improvements: bpf jit compiler, arch
        backend for cmpxchg_double, relative exception table entries, dasd
        partition detection independent from the dasd driver ioctls, and cpu
        cache information in /proc/cpuinfo and /sys/device/cpu.
        And last but not least a series of cleanup patches from Heiko."
      Fix up trivial add-add conflict in arch/s390/Kconfig due to commit
      b952741c ("cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING")
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (76 commits)
        s390: update defconfig
        s390/jump label,nss: let shared kernel support depend on !JUMP_LABEL
        s390/disassembler: fix decoding of risblg instruction
        s390/bpf,jit: add support for BPF_S_ANC_ALU_XOR_X instruction
        s390/traps: move call to print_modules() out of show_regs()
        s390/mm: mark free_initrd_mem() as __init
        s390/dasd: check count address during online setting
        drivers/s390/char/monreader.c: fix error return code
        s390/cmpxchg,percpu: implement cmpxchg_double()
        s390/percpu: implement this_cpu_add_return()
        s390/percpu: implement this_cpu_xchg()
        s390/kexec: remove CONFIG_KEXEC
        s390/irq: use designated initializers for irq class array
        s390: add uninitialized_var() to suppress false positive compiler warnings
        s390/crashdump: move fill_cpu_elf_notes() prototype to header file
        s390/process: add missing header include
        s390/ptrace: add missing ifdef
        s390/ipl,decrompressor: disable branch profiling
        s390/perf_events: compile only for CONFIG_64BIT
        s390/tape: remove even more tape block leftovers
    • Linus Torvalds's avatar
      Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b3eda8d0
      Linus Torvalds authored
      Pull x86/microcode changes from Ingo Molnar:
       "The biggest changes are to AMD microcode patching: add code for
        caching all microcode patches which belong to the current family on
        which we're running, in the kernel.
        We look up the patch needed for each core from the cache at
        patch-application time instead of holding a single patch per-system"
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, microcode, AMD: Fix use after free in free_cache()
        x86, microcode, AMD: Rewrite patch application procedure
        x86, microcode, AMD: Add a small, per-family patches cache
        x86, microcode, AMD: Add reverse equiv table search
        x86, microcode: Add a refresh firmware flag to ->request_microcode_fw
        x86, microcode, AMD: Read CPUID(1).EAX on the correct cpu
        x86, microcode, AMD: Check before applying a patch
        x86, microcode, AMD: Remove useless get_ucode_data wrapper
        x86, microcode: Straighten out Kconfig text
        x86, microcode: Cleanup cpu hotplug notifier callback
        x86, microcode: Drop uci->mc check on resume path
        x86, microcode: Save an indentation level in reload_for_cpu
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a5fa7b7d
      Linus Torvalds authored
      Pull x86/platform changes from Ingo Molnar:
       "This cleans up some Xen-induced pagetable init code uglies, by
        generalizing new platform callbacks and state: x86_init.paging.*"
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Document x86_init.paging.pagetable_init()
        x86: xen: Cleanup and remove x86_init.paging.pagetable_setup_done()
        x86: Move paging_init() call to x86_init.paging.pagetable_init()
        x86: Rename pagetable_setup_start() to pagetable_init()
        x86: Remove base argument from x86_init.paging.pagetable_setup_start
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 22999300
      Linus Torvalds authored
      Pull x86/mm changes from Ingo Molnar:
       "The biggest change is new TLB partial flushing code for AMD CPUs.
        (The v3.6 kernel had the Intel CPU side code, see commits
        There's also various other refinements around the TLB flush code"
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Distinguish TLB shootdown interrupts from other functions call interrupts
        x86/mm: Fix range check in tlbflush debugfs interface
        x86, cpu: Preset default tlb_flushall_shift on AMD
        x86, cpu: Add AMD TLB size detection
        x86, cpu: Push TLB detection CPUID check down
        x86, cpu: Fixup tlb_flushall_shift formatting
    • Linus Torvalds's avatar
      Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7687b80a
      Linus Torvalds authored
      Pull x86/MCE update from Ingo Molnar:
       "Various MCE robustness enhancements.
        One of the changes adds CMCI (Corrected Machine Check Interrupt) poll
        mode on Intel Nehalem+ CPUs, which mode is automatically entered when
        the rate of messages is too high - and exited once the storm is over.
        An MCE events storm will roughly look like this:
         [ 5342.740616] mce: [Hardware Error]: Machine check events logged
         [ 5342.746501] mce: [Hardware Error]: Machine check events logged
         [ 5342.757971] CMCI storm detected: switching to poll mode
         [ 5372.674957] CMCI storm subsided: switching to interrupt mode
        This should make such events more survivable"
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mce: Provide boot argument to honour bios-set CMCI threshold
        x86, MCE: Remove unused defines
        x86, mce: Enable MCA support by default
        x86/mce: Add CMCI poll mode
        x86/mce: Make cmci_discover() quiet
        x86: mce: Remove the frozen cases in the hotplug code
        x86: mce: Split timer init
        x86: mce: Serialize mce injection
        x86: mce: Disable preemption when calling raise_local()
    • Linus Torvalds's avatar
      Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ac07f5c3
      Linus Torvalds authored
      Pull x86/fpu update from Ingo Molnar:
       "The biggest change is the addition of the non-lazy (eager) FPU saving
        support model and enabling it on CPUs with optimized xsaveopt/xrstor
        FPU state saving instructions.
        There are also various Sparse fixes"
      Fix up trivial add-add conflict in arch/x86/kernel/traps.c
      * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, kvm: fix kvm's usage of kernel_fpu_begin/end()
        x86, fpu: remove cpu_has_xmm check in the fx_finit()
        x86, fpu: make eagerfpu= boot param tri-state
        x86, fpu: enable eagerfpu by default for xsaveopt
        x86, fpu: decouple non-lazy/eager fpu restore from xsave
        x86, fpu: use non-lazy fpu restore for processors supporting xsave
        lguest, x86: handle guest TS bit for lazy/non-lazy fpu host models
        x86, fpu: always use kernel_fpu_begin/end() for in-kernel FPU usage
        x86, kvm: use kernel_fpu_begin/end() in kvm_load/put_guest_fpu()
        x86, fpu: remove unnecessary user_fpu_end() in save_xstate_sig()
        x86, fpu: drop_fpu() before restoring new state from sigframe
        x86, fpu: Unify signal handling code paths for x86 and x86_64 kernels
        x86, fpu: Consolidate inline asm routines for saving/restoring fpu state
        x86, signal: Cleanup ifdefs and is_ia32, is_x32
    • Linus Torvalds's avatar
      Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3b29b03a
      Linus Torvalds authored
      Pull x86/EFI changes from Ingo Molnar:
       "EFI loader robustness enhancements plus smaller fixes"
      * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        efi: Fix the ACPI BGRT driver for images located in EFI boot services memory
        efi: Add a function to look up existing IO memory mappings
        efi: Defer freeing boot services memory until after ACPI init
        x86, EFI: Calculate the EFI framebuffer size instead of trusting the firmware
        efifb: Skip DMI checks if the bootloader knows what it's doing
        efi: initialize efi.runtime_version to make query_variable_info/update_capsule workable
        efi: Build EFI stub with EFI-appropriate options
        X86: Improve GOP detection in the EFI boot stub
    • Linus Torvalds's avatar
      Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 58ae9c0d
      Linus Torvalds authored
      Pull x86 debug update from Ingo Molnar:
       "Various small enhancements"
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/debug: Dump family, model, stepping of the boot CPU
        x86/iommu: Use NULL instead of plain 0 for __IOMMU_INIT
        x86/iommu: Drop duplicate const in __IOMMU_INIT
        x86/fpu/xsave: Keep __user annotation in casts
        x86/pci/probe_roms: Add missing __iomem annotation to pci_map_biosrom()
        x86/signals: ia32_signal.c: add __user casts to fix sparse warnings
        x86/vdso: Add __user annotation to VDSO32_SYMBOL
        x86: Fix __user annotations in asm/sys_ia32.h
    • Linus Torvalds's avatar
      Merge branches 'x86-cpu-for-linus' and 'x86-cpufeature-for-linus' of... · 4a553e14
      Linus Torvalds authored
      Merge branches 'x86-cpu-for-linus' and 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      Pull x86/cpu and x86/cpufeature from Ingo Molnar:
       "One tiny cleanup, and prepare for SMAP (Supervisor Mode Access
        Prevention) support on x86"
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Remove the useless branch in c_start()
      * 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, cpufeature: Add feature bit for SMAP
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 08815bc2
      Linus Torvalds authored
      Pull x86/cleanups from Ingo Molnar:
       "Smaller cleanups"
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        arch/x86: Remove unecessary semicolons
        x86, boot: Remove obsolete and unused constant RAMDISK
    • Linus Torvalds's avatar
      Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 67b1f348
      Linus Torvalds authored
      Pull x86/build changes from Ingo Molnar:
       "defconfig and kconfig cleanups/fixes"
      * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/Kconfig: Clean up Kconfig defaults
        x86/Kconfig: Turn off DEBUG_NX_TEST module in defconfigs
        x86/Kconfig: Turn off CONFIG_BLK_DEV_RAM
        x86/Kconfig: Disable CONFIG_CRC_T10DIF in defconfigs
        x86/Kconfig: Switch to ext4 in defconfigs
        x86/Kconfig: Update defconfigs to current results of "make savedefconfig"
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · da834796
      Linus Torvalds authored
      Pull x86/asm changes from Ingo Molnar:
       "The one change that stands out is the alternatives patching change
        that prevents us from ever patching back instructions from SMP to UP:
        this simplifies things and speeds up CPU hotplug.
        Other than that it's smaller fixes, cleanups and improvements."
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Unspaghettize do_trap()
        x86_64: Work around old GAS bug
        x86: Use REP BSF unconditionally
        x86: Prefer TZCNT over BFS
        x86/64: Adjust types of temporaries used by ffs()/fls()/fls64()
        x86: Drop unnecessary kernel_eflags variable on 64-bit
        x86/smp: Don't ever patch back to UP if we unplug cpus
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 80749df4
      Linus Torvalds authored
      Pull x86/apic changes from Ingo Molnar:
       "Smaller fixes and cleanups"
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/api: Rename mp_register_lapic in a comment
        x86/irq/i8259: Fix incorrect comment
        x86: dt: Use linear irq domain for ioapic(s)
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2fff5664
      Linus Torvalds authored
      Pull timer changes from Ingo Molnar:
       "Timer enhancements, generalizations and cleanups from Tejun Heo, in
        preparation for workqueue facility enhancements."
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        timer: Implement TIMER_IRQSAFE
        timer: Clean up timer initializers
        timer: Relocate declarations of init_timer_on_stack_key()
        timer: Generalize timer->base flags handling
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0b981cb9
      Linus Torvalds authored
      Pull scheduler changes from Ingo Molnar:
       "Continued quest to clean up and enhance the cputime code by Frederic
        Weisbecker, in preparation for future tickless kernel features.
        Other than that, smallish changes."
      Fix up trivial conflicts due to additions next to each other in arch/{x86/}Kconfig
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
        cputime: Make finegrained irqtime accounting generally available
        cputime: Gather time/stats accounting config options into a single menu
        ia64: Reuse system and user vtime accounting functions on task switch
        ia64: Consolidate user vtime accounting
        vtime: Consolidate system/idle context detection
        cputime: Use a proper subsystem naming for vtime related APIs
        sched: cpu_power: enable ARCH_POWER
        sched/nohz: Clean up select_nohz_load_balancer()
        sched: Fix load avg vs. cpu-hotplug
        sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW
        sched: Fix nohz_idle_balance()
        sched: Remove useless code in yield_to()
        sched: Add time unit suffix to sched sysctl knobs
        sched/debug: Limit sd->*_idx range on sysctl
        sched: Remove AFFINE_WAKEUPS feature flag
        s390: Remove leftover account_tick_vtime() header
        cputime: Consolidate vtime handling on context switch
        sched: Move cputime code to its own file
        cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING
        tile: Remove SD_PREFER_LOCAL leftover
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4cba3335
      Linus Torvalds authored
      Pull perf fix from Ingo Molnar:
       "Leftover perf/urgent fix from the v3.6 cycle"
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/x86: Fix typo in uncore_pmu_to_box
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7e92daae
      Linus Torvalds authored
      Pull perf update from Ingo Molnar:
       "Lots of changes in this cycle as well, with hundreds of commits from
        over 30 contributors.  Most of the activity was on the tooling side.
        Higher level changes:
         - New 'perf kvm' analysis tool, from Xiao Guangrong.
         - New 'perf trace' system-wide tracing tool
         - uprobes fixes + cleanups from Oleg Nesterov.
         - Lots of patches to make perf build on Android out of box, from
           Irina Tirdea
         - Extend ftrace function tracing utility to be more dynamic for its
           users.  It allows for data passing to the callback functions, as
           well as reading regs as if a breakpoint were to trigger at function
           The main goal of this patch series was to allow kprobes to use
           ftrace as an optimized probe point when a probe is placed on an
           ftrace nop.  With lots of help from Masami Hiramatsu, and going
           through lots of iterations, we finally came up with a good
         - Add cpumask for uncore pmu, use it in 'stat', from Yan, Zheng.
         - Various tracing updates from Steve Rostedt
         - Clean up and improve 'perf sched' performance by elliminating lots
           of needless calls to libtraceevent.
         - Event group parsing support, from Jiri Olsa
         - UI/gtk refactorings and improvements from Namhyung Kim
         - Add support for non-tracepoint events in perf script python, from
           Feng Tang
         - Add --symbols to 'script', similar to the one in 'report', from
           Feng Tang.
        Infrastructure enhancements and fixes:
         - Convert the trace builtins to use the growing evsel/evlist
           tracepoint infrastructure, removing several open coded constructs
           like switch like series of strcmp to dispatch events, etc.
           Basically what had already been showcased in 'perf sched'.
         - Add evsel constructor for tracepoints, that uses libtraceevent just
           to parse the /format events file, use it in a new 'perf test' to
           make sure the libtraceevent format parsing regressions can be more
           readily caught.
         - Some strange errors were happening in some builds, but not on the
           next, reported by several people, problem was some parser related
           files, generated during the build, didn't had proper make deps, fix
           from Eric Sandeen.
         - Introduce struct and cache information about the environment where
           a perf.data file was captured, from Namhyung Kim.
         - Fix handling of unresolved samples when --symbols is used in
           'report', from Feng Tang.
         - Add union member access support to 'probe', from Hyeoncheol Lee.
         - Fixups to die() removal, from Namhyung Kim.
         - Render fixes for the TUI, from Namhyung Kim.
         - Don't enable annotation in non symbolic view, from Namhyung Kim.
         - Fix pipe mode in 'report', from Namhyung Kim.
         - Move related stats code from stat to util/, will be used by the
           'stat' kvm tool, from Xiao Guangrong.
         - Remove die()/exit() calls from several tools.
         - Resolve vdso callchains, from Jiri Olsa
         - Don't pass const char pointers to basename, so that we can
           unconditionally use libgen.h and thus avoid ifdef BIONIC lines,
           from David Ahern
         - Refactor hist formatting so that it can be reused with the GTK
           browser, From Namhyung Kim
         - Fix build for another rbtree.c change, from Adrian Hunter.
         - Make 'perf diff' command work with evsel hists, from Jiri Olsa.
         - Use the only field_sep var that is set up: symbol_conf.field_sep,
           fix from Jiri Olsa.
         - .gitignore compiled python binaries, from Namhyung Kim.
         - Get rid of die() in more libtraceevent places, from Namhyung Kim.
         - Rename libtraceevent 'private' struct member to 'priv' so that it
           works in C++, from Steven Rostedt
         - Remove lots of exit()/die() calls from tools so that the main perf
           exit routine can take place, from David Ahern
         - Fix x86 build on x86-64, from David Ahern.
         - {int,str,rb}list fixes from Suzuki K Poulose
         - perf.data header fixes from Namhyung Kim
         - Allow user to indicate objdump path, needed in cross environments,
           from Maciek Borzecki
         - Fix hardware cache event name generation, fix from Jiri Olsa
         - Add round trip test for sw, hw and cache event names, catching the
           problem Jiri fixed, after Jiri's patch, the test passes
         - Clean target should do clean for lib/traceevent too, fix from David
         - Check the right variable for allocation failure, fix from Namhyung
         - Set up evsel->tp_format regardless of evsel->name being set
           already, fix from Namhyung Kim
         - Oprofile fixes from Robert Richter.
         - Remove perf_event_attr needless version inflation, from Jiri Olsa
         - Introduce libtraceevent strerror like error reporting facility,
           from Namhyung Kim
         - Add pmu mappings to perf.data header and use event names from cmd
           line, from Robert Richter
         - Fix include order for bison/flex-generated C files, from Ben
         - Build fixes and documentation corrections from David Ahern
         - Assorted cleanups from Robert Richter
         - Let O= makes handle relative paths, from Steven Rostedt
         - perf script python fixes, from Feng Tang.
         - Initial bash completion support, from Frederic Weisbecker
         - Allow building without libelf, from Namhyung Kim.
         - Support DWARF CFI based unwind to have callchains when %bp based
           unwinding is not possible, from Jiri Olsa.
         - Symbol resolution fixes, while fixing support PPC64 files with an
           .opt ELF section was the end goal, several fixes for code that
           handles all architectures and cleanups are included, from Cody
         - Assorted fixes for Documentation and build in 32 bit, from Robert
         - Cache the libtraceevent event_format associated to each evsel
           early, so that we avoid relookups, i.e.  calling pevent_find_event
           repeatedly when processing tracepoint events.
           [ This is to reduce the surface contact with libtraceevents and
              make clear what is that the perf tools needs from that lib: so
              far parsing the common and per event fields.  ]
         - Don't stop the build if the audit libraries are not installed, fix
           from Namhyung Kim.
         - Fix bfd.h/libbfd detection with recent binutils, from Markus
         - Improve warning message when libunwind devel packages not present,
           from Jiri Olsa"
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (282 commits)
        perf trace: Add aliases for some syscalls
        perf probe: Print an enum type variable in "enum variable-name" format when showing accessible variables
        perf tools: Check libaudit availability for perf-trace builtin
        perf hists: Add missing period_* fields when collapsing a hist entry
        perf trace: New tool
        perf evsel: Export the event_format constructor
        perf evsel: Introduce rawptr() method
        perf tools: Use perf_evsel__newtp in the event parser
        perf evsel: The tracepoint constructor should store sys:name
        perf evlist: Introduce set_filter() method
        perf evlist: Renane set_filters method to apply_filters
        perf test: Add test to check we correctly parse and match syscall open parms
        perf evsel: Handle endianity in intval method
        perf evsel: Know if byte swap is needed
        perf tools: Allow handling a NULL cpu_map as meaning "all cpus"
        perf evsel: Improve tracepoint constructor setup
        tools lib traceevent: Fix error path on pevent_parse_event
        perf test: Fix build failure
        trace: Move trace event enable from fs_initcall to core_initcall
        tracing: Add an option for disabling markers
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7a682942
      Linus Torvalds authored
      Pull trivial irq core update from Ingo Molnar:
       "Two symbol exports for modular irq-chip drivers"
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        genirq: Export dummy_irq_chip
        genirq: Export irq_set_chip_and_handler_name()
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 627312b9
      Linus Torvalds authored
      Pull core locking changes from Ingo Molnar:
       "It includes a lockdep improvement plus a spinlock inlining Kconfig
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        locking: Adjust spin lock inlining Kconfig options
        lockdep: Check if nested lock is actually held
    • Linus Torvalds's avatar
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 94095a1f
      Linus Torvalds authored
      Pull core kernel fixes from Ingo Molnar:
       "This is a complex task_work series from Oleg that fixes the bug that
        this VFS commit tried to fix:
          d35abdb2 hold task_lock around checks in keyctl
        but solves the problem without the lockup regression that d35abdb2
        introduced in v3.6.
        This series came late in v3.6 and I did not feel confident about it so
        late in the cycle.  Might be worth backporting to -stable if it proves
        itself upstream."
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        task_work: Simplify the usage in ptrace_notify() and get_signal_to_deliver()
        task_work: Revert "hold task_lock around checks in keyctl"
        task_work: task_work_add() should not succeed after exit_task_work()
        task_work: Make task_work_add() lockless
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 620e7753
      Linus Torvalds authored
      Pull RCU changes from Ingo Molnar:
       0. 'idle RCU':
           Adds RCU APIs that allow non-idle tasks to enter RCU idle mode and
           provides x86 code to make use of them, allowing RCU to treat
           user-mode execution as an extended quiescent state when the new
           RCU_USER_QS kernel configuration parameter is specified.  (Work is
           in progress to port this to a few other architectures, but is not
           part of this series.)
       1.  A fix for a latent bug that has been in RCU ever since the addition
           of CPU stall warnings.  This bug results in false-positive stall
           warnings, but thus far only on embedded systems with severely
           cut-down userspace configurations.
       2.  Further reductions in latency spikes for huge systems, along with
           additional boot-time adaptation to the actual hardware.
           This is a large change, as it moves RCU grace-period initialization
           and cleanup, along with quiescent-state forcing, from softirq to a
           kthread.  However, it appears to be in quite good shape (famous
           last words).
       3.  Updates to documentation and rcutorture, the latter category
           including keeping statistics on CPU-hotplug latencies and fixing
           some initialization-time races.
       4.  CPU-hotplug fixes and improvements.
       5.  Idle-loop fixes that were omitted on an earlier submission.
       6.  Miscellaneous fixes and improvements
      In certain RCU configurations new kernel threads will show up (rcu_bh,
      rcu_sched), showing RCU processing overhead.
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (90 commits)
        rcu: Apply micro-optimization and int/bool fixes to RCU's idle handling
        rcu: Userspace RCU extended QS selftest
        x86: Exit RCU extended QS on notify resume
        x86: Use the new schedule_user API on userspace preemption
        rcu: Exit RCU extended QS on user preemption
        rcu: Exit RCU extended QS on kernel preemption after irq/exception
        x86: Exception hooks for userspace RCU extended QS
        x86: Unspaghettize do_general_protection()
        x86: Syscall hooks for userspace RCU extended QS
        rcu: Switch task's syscall hooks on context switch
        rcu: Ignore userspace extended quiescent state by default
        rcu: Allow rcu_user_enter()/exit() to nest
        rcu: Settle config for userspace extended quiescent state
        rcu: Make RCU_FAST_NO_HZ handle adaptive ticks
        rcu: New rcu_user_enter_after_irq() and rcu_user_exit_after_irq() APIs
        rcu: New rcu_user_enter() and rcu_user_exit() APIs
        ia64: Add missing RCU idle APIs on idle loop
        xtensa: Add missing RCU idle APIs on idle loop
        score: Add missing RCU idle APIs on idle loop
        parisc: Add missing RCU idle APIs on idle loop
    • Linus Torvalds's avatar
      Merge tag 'ktest-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest · 6977b4c7
      Linus Torvalds authored
      Pull ktest fix from Steven Rostedt:
       "ktest has one fix needed for this merge window - fix parsing of ELSE
        IF in reading config file"
      * tag 'ktest-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
        ktest: Fix ELSE IF statements
    • Linus Torvalds's avatar
      Merge tag 'localmodconfig-v3.7-2' of... · 69e9576b
      Linus Torvalds authored
      Merge tag 'localmodconfig-v3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig
      Pull localmodconfig fixes from Steven Rostedt:
       "Bill Pemberton added some changes to make streamline-config.pl work
        again as a stand-alone tool (outside of make localmodconfig).
        Also, he added a couple of updates to make the code be more "Perl
        Added last minute fix to localyesconfig, that was the same as
        localmodconfig since v3.2, due to a change in the makefiles."
      * tag 'localmodconfig-v3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig:
        localmodconfig: Fix localyesconfig to set to 'y' not 'm'
        localmodconfig: Use my variable for loop in streamline_config.pl
        localmodconfig: Use 3 parameter open in streamline_config.pl
        localmodconfig: Rework find_config in streamline_config.pl
        localmodconfig: Set default value for ksource in streamline_config.pl