1. 06 Jul, 2013 6 commits
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 21884a83
      Linus Torvalds authored
      Pull timer core updates from Thomas Gleixner:
       "The timer changes contain:
      
         - posix timer code consolidation and fixes for odd corner cases
      
         - sched_clock implementation moved from ARM to core code to avoid
           duplication by other architectures
      
         - alarm timer updates
      
         - clocksource and clockevents unregistration facilities
      
         - clocksource/events support for new hardware
      
         - precise nanoseconds RTC readout (Xen feature)
      
         - generic support for Xen suspend/resume oddities
      
         - the usual lot of fixes and cleanups all over the place
      
        The parts which touch other areas (ARM/XEN) have been coordinated with
        the relevant maintainers.  Though this results in an handful of
        trivial to solve merge conflicts, which we preferred over nasty cross
        tree merge dependencies.
      
        The patches which have been committed in the last few days are bug
        fixes plus the posix timer lot.  The latter was in akpms queue and
        next for quite some time; they just got forgotten and Frederic
        collected them last minute."
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (59 commits)
        hrtimer: Remove unused variable
        hrtimers: Move SMP function call to thread context
        clocksource: Reselect clocksource when watchdog validated high-res capability
        posix-cpu-timers: don't account cpu timer after stopped thread runtime accounting
        posix_timers: fix racy timer delta caching on task exit
        posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule()
        selftests: add basic posix timers selftests
        posix_cpu_timers: consolidate expired timers check
        posix_cpu_timers: consolidate timer list cleanups
        posix_cpu_timer: consolidate expiry time type
        tick: Sanitize broadcast control logic
        tick: Prevent uncontrolled switch to oneshot mode
        tick: Make oneshot broadcast robust vs. CPU offlining
        x86: xen: Sync the CMOS RTC as well as the Xen wallclock
        x86: xen: Sync the wallclock when the system time is set
        timekeeping: Indicate that clock was set in the pvclock gtod notifier
        timekeeping: Pass flags instead of multiple bools to timekeeping_update()
        xen: Remove clock_was_set() call in the resume path
        hrtimers: Support resuming with two or more CPUs online (but stopped)
        timer: Fix jiffies wrap behavior of round_jiffies_common()
        ...
      21884a83
    • Linus Torvalds's avatar
      Merge branch 'for-v3.11' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · 8b70a90c
      Linus Torvalds authored
      Pull ARM DMA mapping updates from Marek Szyprowski:
       "This contains important bugfixes and an update for IOMMU integration
        support for ARM architecture"
      
      * 'for-v3.11' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        ARM: dma: Drop __GFP_COMP for iommu dma memory allocations
        ARM: DMA-mapping: mark all !DMA_TO_DEVICE pages in unmapping as clean
        ARM: dma-mapping: NULLify dev->archdata.mapping pointer on detach
        ARM: dma-mapping: convert DMA direction into IOMMU protection attributes
        ARM: dma-mapping: Get pages if the cpu_addr is out of atomic_pool
      8b70a90c
    • Linus Torvalds's avatar
      Merge tag 'metag-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag · 7644a448
      Linus Torvalds authored
      Pull Metag architecture changes from James Hogan:
       - Infrastructure and DT files for TZ1090 SoC (pin control drivers
         already merged via pinctrl tree).
       - Panic on boot instead of just warning if cache aliasing possible.
       - Various SMP/hotplug fixes.
       - Various other randconfig/sparse fixes.
      
      * tag 'metag-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag: (24 commits)
        metag: move EXPORT_SYMBOL(csum_partial) to metag_ksyms.c
        metag: cpu hotplug: route_irq: preserve irq mask
        metag: kick: add missing irq_enter/exit to kick_handler()
        metag: smp: don't spin waiting for CPU to start
        metag: smp: enable irqs after set_cpu_online
        metag: use clear_tasks_mm_cpumask()
        metag: tz1090: select and instantiate pinctrl-tz1090-pdc
        metag: tz1090: select and instantiate pinctrl-tz1090
        metag: don't check for cache aliasing on smp cpu boot
        metag: panic if cache aliasing possible
        metag: *.dts: include using preprocessor
        metag: add <dt-bindings/> symlink
        metag/.gitignore: Extend the *.dtb pattern to match the dtb.S files
        metag/traps: include setup.h for the per_cpu_trap_init declaration
        metag/traps: Mark die() as __noreturn to match the declaration.
        metag/processor.h: Add missing cpuinfo_op declaration.
        metag/setup: Restrict scope for the capabilities variable
        metag/mm/cache: Restrict scope for metag_lnkget_probe
        metag/asm/irq.h: Declare init_IRQ
        metag/kernel/irq.c: Declare root_domain as static
        ...
      7644a448
    • Linus Torvalds's avatar
      Merge tag 'xenarm-for-3.11-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen · 16984ce1
      Linus Torvalds authored
      Pull Xen ARM update rom Stefano Stabellini:
       "Just one commit this time: the implementation of the tmem hypercall
        for arm and arm64"
      
      * tag 'xenarm-for-3.11-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen:
        xen/arm and xen/arm64: implement HYPERVISOR_tmem_op
      16984ce1
    • Linus Torvalds's avatar
      Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux · 2cb7b5a3
      Linus Torvalds authored
      Pull irqdomain refactoring from Grant Likely:
       "This is the long awaited simplification of irqdomain.  It gets rid of
        the different types of irq domains and instead both linear and tree
        mappings can be supported in a single domain.  Doing this removes a
        lot of special case code and makes irq domains simpler to understand
        overall"
      
      * tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux:
        irq: fix checkpatch error
        irqdomain: Include hwirq number in /proc/interrupts
        irqdomain: make irq_linear_revmap() a fast path again
        irqdomain: remove irq_domain_generate_simple()
        irqdomain: Refactor irq_domain_associate_many()
        irqdomain: Beef up debugfs output
        irqdomain: Clean up aftermath of irq_domain refactoring
        irqdomain: Eliminate revmap type
        irqdomain: merge linear and tree reverse mappings.
        irqdomain: Add a name field
        irqdomain: Replace LEGACY mapping with LINEAR
        irqdomain: Relax failure path on setting up mappings
      2cb7b5a3
    • Thomas Gleixner's avatar
      hrtimer: Remove unused variable · 73b0cd67
      Thomas Gleixner authored
      Sigh, should have noticed myself.
      
      Reported-by: fengguang.wu@intel.com
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      73b0cd67
  2. 05 Jul, 2013 5 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · b2c31107
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
       - Do not idle omap device between crypto operations in one session.
       - Added sha224/sha384 shims for SSSE3.
       - More optimisations for camellia-aesni-avx2.
       - Removed defunct blowfish/twofish AVX2 implementations.
       - Added unaligned buffer self-tests.
       - Added PCLMULQDQ optimisation for CRCT10DIF.
       - Added support for Freescale's DCP co-processor
       - Misc fixes.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (44 commits)
        crypto: testmgr - test hash implementations with unaligned buffers
        crypto: testmgr - test AEADs with unaligned buffers
        crypto: testmgr - test skciphers with unaligned buffers
        crypto: testmgr - check that entries in alg_test_descs are in correct order
        Revert "crypto: twofish - add AVX2/x86_64 assembler implementation of twofish cipher"
        Revert "crypto: blowfish - add AVX2/x86_64 implementation of blowfish cipher"
        crypto: camellia-aesni-avx2 - tune assembly code for more performance
        hwrng: bcm2835 - fix MODULE_LICENSE tag
        hwrng: nomadik - use clk_prepare_enable()
        crypto: picoxcell - replace strict_strtoul() with kstrtoul()
        crypto: dcp - Staticize local symbols
        crypto: dcp - Use NULL instead of 0
        crypto: dcp - Use devm_* APIs
        crypto: dcp - Remove redundant platform_set_drvdata()
        hwrng: use platform_{get,set}_drvdata()
        crypto: omap-aes - Don't idle/start AES device between Encrypt operations
        crypto: crct10dif - Use PTR_RET
        crypto: ux500 - Cocci spatch "resource_size.spatch"
        crypto: sha256_ssse3 - add sha224 support
        crypto: sha512_ssse3 - add sha384 support
        ...
      b2c31107
    • Linus Torvalds's avatar
      Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi · 45175476
      Linus Torvalds authored
      Pull ubi fixes from Artem Bityutskiy:
       "A couple of fixes and clean-ups, allow for assigning user-defined UBI
        device numbers when attaching MTD devices by using the "mtd=" module
        parameter"
      
      * tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi:
        UBI: support ubi_num on mtd.ubi command line
        UBI: fastmap break out of used PEB search
        UBI: document UBI_IOCVOLUP better in user header
        UBI: do not abort init when ubi.mtd devices cannot be found
        UBI: drop redundant "UBI error" string
      45175476
    • Linus Torvalds's avatar
      Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs · 2dd1cb5a
      Linus Torvalds authored
      Pull ubifs fix from Artem Bityutskiy:
       "Only a single patch which fixes a message"
      
      * tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs:
        UBIFS: correct mount message
      2dd1cb5a
    • Thomas Gleixner's avatar
      hrtimers: Move SMP function call to thread context · 5ec2481b
      Thomas Gleixner authored
      smp_call_function_* must not be called from softirq context.
      
      But clock_was_set() which calls on_each_cpu() is called from softirq
      context to implement a delayed clock_was_set() for the timer interrupt
      handler. Though that almost never gets invoked. A recent change in the
      resume code uses the softirq based delayed clock_was_set to support
      Xens resume mechanism.
      
      linux-next contains a new warning which warns if smp_call_function_*
      is called from softirq context which gets triggered by that Xen
      change.
      
      Fix this by moving the delayed clock_was_set() call to a work context.
      Reported-and-tested-by: default avatarArtem Savkov <artem.savkov@gmail.com>
      Reported-by: default avatarSasha Levin <sasha.levin@oracle.com>
      Cc: David Vrabel <david.vrabel@citrix.com>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: H. Peter Anvin <hpa@zytor.com>,
      Cc: Konrad Wilk <konrad.wilk@oracle.com>
      Cc: John Stultz <john.stultz@linaro.org>
      Cc: xen-devel@lists.xen.org
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      5ec2481b
    • Thomas Gleixner's avatar
      clocksource: Reselect clocksource when watchdog validated high-res capability · 332962f2
      Thomas Gleixner authored
      Up to commit 5d33b883 (clocksource: Always verify highres capability)
      we had no sanity check when selecting a clocksource, which prevented
      that a non highres capable clocksource is used when the system already
      switched to highres/nohz mode.
      
      The new sanity check works as Alex and Tim found out. It prevents the
      TSC from being used. This happens because on x86 the boot process
      looks like this:
      
       tsc_start_freqency_validation(TSC);
       clocksource_register(HPET);
       clocksource_done_booting();
      	clocksource_select()
      		Selects HPET which is valid for high-res
      
       switch_to_highres();
      
       clocksource_register(TSC);
       	TSC is not selected, because it is not yet
      	flagged as VALID_HIGH_RES
      
       clocksource_watchdog()
      	Validates TSC for highres, but that does not make TSC
      	the current clocksource.
      
      Before the sanity check was added, we installed TSC unvalidated which
      worked most of the time. If the TSC was really detected as unstable,
      then the unstable logic removed it and installed HPET again.
      
      The sanity check is correct and needed. So the watchdog needs to kick
      a reselection of the clocksource, when it qualifies TSC as a valid
      high res clocksource.
      
      To solve this, we mark the clocksource which got the flag
      CLOCK_SOURCE_VALID_FOR_HRES set by the watchdog with an new flag
      CLOCK_SOURCE_RESELECT and trigger the watchdog thread. The watchdog
      thread evaluates the flag and invokes clocksource_select() when set.
      
      To avoid that the clocksource_done_booting() code, which is about to
      install the first real clocksource anyway, needs to go through
      clocksource_select and tick_oneshot_notify() pointlessly, split out
      the clocksource_watchdog_kthread() list walk code and invoke the
      select/notify only when called from clocksource_watchdog_kthread().
      
      So clocksource_done_booting() can utilize the same splitout code
      without the select/notify invocation and the clocksource_mutex
      unlock/relock dance.
      Reported-and-tested-by: default avatarAlex Shi <alex.shi@intel.com>
      Cc: Hans Peter Anvin <hpa@linux.intel.com>
      Cc: Tim Chen <tim.c.chen@linux.intel.com>
      Cc: Andi Kleen <andi.kleen@intel.com>
      Tested-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Davidlohr Bueso <davidlohr.bueso@hp.com>
      Cc: John Stultz <john.stultz@linaro.org>
      Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1307042239150.11637@ionos.tec.linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      332962f2
  3. 04 Jul, 2013 29 commits
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux · 74b9272b
      Linus Torvalds authored
      Pull device tree updates from Grant Likely:
       "This branch contains the following changes:
         - Removal of CONFIG_OF_DEVICE, it is always enabled by CONFIG_OF
         - Remove #ifdef from linux/of_platform.h to increase compiler syntax
           coverage
         - Bug fix for address decoding on Bimini and js2x powerpc platforms.
         - miscellaneous binding changes
      
        One note on the above.  The binding changes going in from all kinds of
        different trees has gotten rather out of hand.  I picked up some
        during this cycle, but even going though my tree isn't a great fit.
      
        Ian Campbell has prototyped splitting the bindings and .dtb files into
        a separate repository.  The plan is to migrate to using that sometime
        in the next few kernel releases which should get rid of a lot of the
        churn on binding docs and .dts files"
      
      * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
        of: Fix address decoding on Bimini and js2x machines
        of: remove CONFIG_OF_DEVICE
        usb: chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE
        of: remove of_platform_driver
        ibmebus: convert of_platform_driver to platform_driver
        driver core: move to_platform_driver to platform_device.h
        mfd: DT bindings for the palmas family MFD
        ARM: dts: omap3-devkit8000: fix NAND memory binding
        of/base: fix typos
        of: remove #ifdef from linux/of_platform.h
      74b9272b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · f5b63ac0
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "First round of updates for the input subsystem.
      
        You will get a new touchsreen driver for Cypress 4th generation
        devices, a driver for a special controller implementing PS/2 protocol
        in OLPC devices, and a driver for power key for SiRFprimaII PWRC.
      
        HID and bcm5497 now support for the 2013 MacBook Air.
      
        EVIOCGKEY and the rest of evdev ioctls now flush events of matching
        type from the client's event queue so that clients can be sure any
        events received after issuing EVIOCG* ioctl are new events.
      
        And a host of cleanups and improvements in other drivers"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (87 commits)
        Input: cyttsp4 - kfree xfer_buf on error path in probe()
        Input: tps6507x-ts - select INPUT_POLLDEV
        Input: bcm5974 - add support for the 2013 MacBook Air
        HID: apple: Add support for the 2013 Macbook Air
        Input: cyttsp4 - leak on error path in probe()
        Input: cyttsp4 - silence NULL dereference warning
        Input: cyttsp4 - silence shift wrap warning
        Input: tps6507x-ts - convert to polled input device infrastructure
        ARM: davinci: da850-evm: remove vref from touchscreen platform data
        Input: cyttsp4 - SPI driver for Cypress TMA4XX touchscreen devices
        Input: cyttsp4 - I2C driver for Cypress TMA4XX touchscreen devices
        Input: cyttsp4 - add core driver for Cypress TMA4XX touchscreen devices
        Input: cyttsp - I2C driver split into two modules
        Input: add OLPC AP-SP driver
        Input: nspire-keypad - remove redundant dev_err call in nspire_keypad_probe()
        Input: tps6507x-ts - remove vref from platform data
        Input: tps6507x-ts - use bool for booleans
        Input: tps6507x-ts - remove bogus unreachable code
        Input: samsung-keypad - let device core setup the default pin configuration
        Input: wacom_i2c - implement hovering capability
        ...
      f5b63ac0
    • Thomas Gleixner's avatar
      Merge branch 'timers/posix-cpu-timers-for-tglx' of · 2b0f8931
      Thomas Gleixner authored
      git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/core
      
      Frederic sayed: "Most of these patches have been hanging around for
      several month now, in -mmotm for a significant chunk. They already
      missed a few releases."
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      2b0f8931
    • Ferruh Yigit's avatar
      Input: cyttsp4 - kfree xfer_buf on error path in probe() · 57961e3b
      Ferruh Yigit authored
      If probe() fails after cd->xfer_buf allocated, it will not freed.
      Added kfree(cd->xfer_buf) with and error label.
      Signed-off-by: default avatarFerruh Yigit <fery@cypress.com>
      Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
      57961e3b
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 98f486f1
      Linus Torvalds authored
      Pull i2c updates from Wolfram Sang:
       - new drivers: Kontron PLD, Wondermedia VT
       - mv64xxx driver gained sun4i support and a bigger cleanup
       - duplicate driver 'intel-mid' removed
       - added generic device tree binding for sda holding time (and
         designware driver already uses it)
       - we tried to allow driver probing with only device tree and no i2c
         ids, but I had to revert it because of side effects.  Needs some
         rethinking.
       - driver bugfixes, cleanups...
      
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (34 commits)
        i2c-designware: use div_u64 to fix link
        i2c: Kontron PLD i2c bus driver
        i2c: iop3xxx: fix build failure after waitqueue changes
        i2c-designware: make SDA hold time configurable
        i2c: mv64xxx: Set bus frequency to 100kHz if clock-frequency is not provided
        i2c: imx: allow autoloading on dt ids
        i2c: mv64xxx: Fix transfer error code
        i2c: i801: SMBus patch for Intel Coleto Creek DeviceIDs
        i2c: omap: correct usage of the interrupt enable register
        i2c-pxa: prepare clock before use
        Revert "i2c: core: make it possible to match a pure device tree driver"
        i2c: nomadik: allocate adapter number dynamically
        i2c: nomadik: support elder Nomadiks
        i2c: mv64xxx: Add Allwinner sun4i compatible
        i2c: mv64xxx: make the registers offset configurable
        i2c: mv64xxx: Add macros to access parts of registers
        i2c: vt8500: Add support for I2C bus on Wondermedia SoCs
        i2c: designware: fix race between subsequent xfers
        i2c: bfin-twi: Read and write the FIFO in loop
        i2c: core: make it possible to match a pure device tree driver
        ...
      98f486f1
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 84cbd722
      Linus Torvalds authored
      Pull first round of SCSI updates from James Bottomley:
       "The patch set is mostly driver updates (usf, zfcp, lpfc, mpt2sas,
        megaraid_sas, bfa, ipr) and a few bug fixes.  Also of note is that the
        Buslogic driver has been rewritten to a better coding style and 64 bit
        support added.  We also removed the libsas limitation on 16 bytes for
        the command size (currently no drivers make use of this)"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (101 commits)
        [SCSI] megaraid: minor cut and paste error fixed.
        [SCSI] ufshcd-pltfrm: remove unnecessary dma_set_coherent_mask() call
        [SCSI] ufs: fix register address in UIC error interrupt handling
        [SCSI] ufshcd-pltfrm: add missing empty slot in ufs_of_match[]
        [SCSI] ufs: use devres functions for ufshcd
        [SCSI] ufs: Fix the response UPIU length setting
        [SCSI] ufs: rework link start-up process
        [SCSI] ufs: remove version check before IS reg clear
        [SCSI] ufs: amend interrupt configuration
        [SCSI] ufs: wrap the i/o access operations
        [SCSI] storvsc: Update the storage protocol to win8 level
        [SCSI] storvsc: Increase the value of scsi timeout for storvsc devices
        [SCSI] MAINTAINERS: Add myself as the maintainer for BusLogic SCSI driver
        [SCSI] BusLogic: Port driver to 64-bit.
        [SCSI] BusLogic: Fix style issues
        [SCSI] libiscsi: Added new boot entries in the session sysfs
        [SCSI] aacraid: Fix for arrays are going offline in the system. System hangs
        [SCSI] ipr: IOA Status Code(IOASC) update
        [SCSI] sd: Update WRITE SAME heuristics
        [SCSI] fnic: potential dead lock in fnic_is_abts_pending()
        ...
      84cbd722
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 80cc38b1
      Linus Torvalds authored
      Pull trivial tree updates from Jiri Kosina:
       "The usual stuff from trivial tree"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
        treewide: relase -> release
        Documentation/cgroups/memory.txt: fix stat file documentation
        sysctl/net.txt: delete reference to obsolete 2.4.x kernel
        spinlock_api_smp.h: fix preprocessor comments
        treewide: Fix typo in printk
        doc: device tree: clarify stuff in usage-model.txt.
        open firmware: "/aliasas" -> "/aliases"
        md: bcache: Fixed a typo with the word 'arithmetic'
        irq/generic-chip: fix a few kernel-doc entries
        frv: Convert use of typedef ctl_table to struct ctl_table
        sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
        doc: clk: Fix incorrect wording
        Documentation/arm/IXP4xx fix a typo
        Documentation/networking/ieee802154 fix a typo
        Documentation/DocBook/media/v4l fix a typo
        Documentation/video4linux/si476x.txt fix a typo
        Documentation/virtual/kvm/api.txt fix a typo
        Documentation/early-userspace/README fix a typo
        Documentation/video4linux/soc-camera.txt fix a typo
        lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment
        ...
      80cc38b1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 3366dd9f
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       - HID battery handling cleanup by David Herrmann
       - ELO 4000/4500 driver, which has been finally ported to be proper HID
         driver by Jiri Slaby
       - ps3remote driver functionality is now provided by generic sony
         driver, by Jiri Kosina
       - PS2/3 Buzz controllers support, by Colin Leitner
       - rework of wiimote driver including full extensions hotpluggin
         support, sub-device modularization and speaker support by David
         Herrmann
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (55 commits)
        HID: wacom: Intuos4 battery charging changes
        HID: i2c-hid: support sending HID output reports using the output register
        HID: kye: Add report fixup for Genius Gila Gaming mouse
        HID: wiimote: support Nintendo Wii U Pro Controller
        Input: make gamepad API keycodes more clear
        input: document gamepad API and add extra keycodes
        HID: explain out-of-range check better
        HID: fix false positive out of range values
        HID: wiimote: fix coccinelle warnings
        HID: roccat: check cdev_add return value
        HID: fold ps3remote driver into generic Sony driver
        HID: hyperv: convert alloc+memcpy to memdup
        HID: core: fix reporting of raw events
        HID: wiimote: discard invalid EXT data reports
        HID: wiimote: fix classic controller parsing
        HID: wiimote: init EXT/MP during device detection
        HID: wiimote: fix DRM debug-attr to correctly parse input
        HID: wiimote: add MP quirks
        HID: wiimote: remove old static extension support
        HID: wiimote: add "bboard_calib" attribute
        ...
      3366dd9f
    • Linus Torvalds's avatar
      Merge tag 'md-3.11' of git://neil.brown.name/md · 697a067f
      Linus Torvalds authored
      Pull md updates from NeilBrown:
       "Mostly fixes, with a few minor features (eg 'last_sync_action' sysfs
        file)
      
        A couple marked for -stable including one recent bug which causes a
        RAID10 reshape to complete without moving any data :-(
      
        A couple more bugfixes (at least) to come, but haven't confirmed the
        right solution yet."
      
      * tag 'md-3.11' of git://neil.brown.name/md:
        md/raid10: fix bug which causes all RAID10 reshapes to move no data.
        md/raid5: allow 5-device RAID6 to be reshaped to 4-device.
        md/raid10: fix two bugs affecting RAID10 reshape.
        md: remove doubled description for sync_max, merging it within sync_min/sync_max
        MD: Remember the last sync operation that was performed
        md: fix buglet in RAID5 -> RAID0 conversion.
        md/raid10: check In_sync flag in 'enough()'.
        md/raid10: locking changes for 'enough()'.
        md: replace strict_strto*() with kstrto*()
        md: Wait for md_check_recovery before attempting device removal.
        dm-raid: silence compiler warning on rebuilds_per_group.
        DM RAID: Fix raid_resume not reviving failed devices in all cases
        DM RAID: Break-up untidy function
        DM RAID: Add ability to restore transiently failed devices on resume
      697a067f
    • Linus Torvalds's avatar
      Merge branch 'kconfig-diet' from Dave Hansen · e61aca51
      Linus Torvalds authored
      Merge Kconfig menu diet patches from Dave Hansen:
       "I think the "Kernel Hacking" menu has gotten a bit out of hand.  It is
        over 120 lines long on my system with everything enabled and options
        are scattered around it haphazardly.
      
              http://sr71.net/~dave/linux/kconfig-horror.png
      
        Let's try to introduce some sanity.  This set takes that 120 lines
        down to 55 and makes it vastly easier to find some things.  It's a
        start.
      
        This set stands on its own, but there is plenty of room for follow-up
        patches.  The arch-specific debug options still end up getting stuck
        in the top-level "kernel hacking" menu.  OPTIMIZE_INLINING, for
        instance, could obviously go in to the "compiler options" menu, but
        the fact that it is defined in arch/ in a separate Kconfig file keeps
        it on its own for the moment.
      
        The Signed-off-by's in here look funky.  I changed employers while
        working on this set, so I have signoffs from both email addresses"
      
      * emailed patches from Dave Hansen <dave@sr71.net>:
        hang and lockup detection menu
        kconfig: consolidate printk options
        group locking debugging options
        consolidate compilation option configs
        consolidate runtime testing configs
        order memory debugging Kconfig options
        consolidate per-arch stack overflow debugging options
      e61aca51
    • Dave Hansen's avatar
      hang and lockup detection menu · 92aef8fb
      Dave Hansen authored
      The hard/softlockup and hung-task entries take up 6 lines
      of screen real-estate when enabled.  I bet folks don't
      mess with these _that_ often, so move them in a group
      down a level.
      Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      92aef8fb
    • Dave Hansen's avatar
      kconfig: consolidate printk options · 604ff0dc
      Dave Hansen authored
      Same deal, take the printk-related things and hide them in a menu.
      This takes another 4 items out of the top-level menu.
      Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      604ff0dc
    • Dave Hansen's avatar
      group locking debugging options · 9eade16b
      Dave Hansen authored
      Original posting:
      
      	http://lkml.kernel.org/r/20121214184208.D9E5804D@kernel.stglabs.ibm.com
      
      There are quite a few of these, and we want to make sure that
      there is one-stop-shopping for lock debugging.
      Signed-off-by: default avatarDave Hansen <dave@linux.vnet.ibm.com>
      Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9eade16b
    • Dave Hansen's avatar
      consolidate compilation option configs · 6dfc0665
      Dave Hansen authored
      Original Post:
      
      	http://lkml.kernel.org/r/20121214184207.6E00DDEC@kernel.stglabs.ibm.com
      
      Again, trying to come up with some common themes of the stuff in
      the kernel hacking menu...  There are quite a few options to
      tweak compilation in some way, or perform extra compile-time
      checks.  Give them their own menu.
      
      The diff here looks a bit funny... makes it look like I'm
      moving debugfs even though I'm actually moving the options on
      either side of it.
      Signed-off-by: default avatarDave Hansen <dave@linux.vnet.ibm.com>
      Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6dfc0665
    • Dave Hansen's avatar
      consolidate runtime testing configs · 881c5149
      Dave Hansen authored
      Original posting:
      
      	http://lkml.kernel.org/r/20121214184206.FC11422F@kernel.stglabs.ibm.com
      
      These runtime tests are great, except that there are a lot of them,
      and they are very rarely needed.  Give them their own menu so that
      only the folks who need them will have to go looking for them.
      
      Note that there are some other runtime tests that are not in here,
      like for RCU or locking.  This menu should only be used for tests
      that do not have a more appropriate home.
      Signed-off-by: default avatarDave Hansen <dave@linux.vnet.ibm.com>
      Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      881c5149
    • Dave Hansen's avatar
      order memory debugging Kconfig options · 0610c8a8
      Dave Hansen authored
      Original posting:
      
      	http://lkml.kernel.org/r/20121214184203.37E6C724@kernel.stglabs.ibm.com
      
      There are a *LOT* of memory debugging options.  They are just scattered
      all over the "Kernel Hacking" menu.  Sure, "memory debugging" is a very
      vague term and it's going to be hard to make absolute rules about what
      goes in here, but this has to be better than what we had before.
      
      This does, however, leave out the architecture-specific memory
      debugging options (like x86's DEBUG_SET_MODULE_RONX).  There would need
      to be some substantial changes to move those in here.  Kconfig can not
      easily mix arch-specific and generic options together: it really
      requires a file per-architecture, and I think having an
      arch/foo/Kconfig.debug-memory might be taking things a bit too far
      Signed-off-by: default avatarDave Hansen <dave@linux.vnet.ibm.com>
      Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0610c8a8
    • Dave Hansen's avatar
      consolidate per-arch stack overflow debugging options · d1a1dc0b
      Dave Hansen authored
      Original posting:
      
      	http://lkml.kernel.org/r/20121214184202.F54094D9@kernel.stglabs.ibm.com
      
      Several architectures have similar stack debugging config options.
      They all pretty much do the same thing, some with slightly
      differing help text.
      
      This patch changes the architectures to instead enable a Kconfig
      boolean, and then use that boolean in the generic Kconfig.debug
      to present the actual menu option.  This removes a bunch of
      duplication and adds consistency across arches.
      Signed-off-by: default avatarDave Hansen <dave@linux.vnet.ibm.com>
      Reviewed-by: default avatarH. Peter Anvin <hpa@zytor.com>
      Reviewed-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Acked-by: Chris Metcalf <cmetcalf@tilera.com> [for tile]
      Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d1a1dc0b
    • Linus Torvalds's avatar
      Merge branch 'hpfs' from Mikulas Patocka · da67db4e
      Linus Torvalds authored
      Merge hpfs patches from Mikulas Patocka.
      
      * emailed patches from Mikulas Patocka <mpatocka@artax.karlin.mff.cuni.cz>:
        hpfs: implement prefetch to improve performance
        hpfs: use mpage
        hpfs: better test for errors
      da67db4e
    • Mikulas Patocka's avatar
      hpfs: implement prefetch to improve performance · 275f495d
      Mikulas Patocka authored
      This patch implements prefetch to improve performance.  It helps mostly
      when scanning the bitmaps to calculate free space.
      Signed-off-by: default avatarMikulas Patocka <mpatocka@artax.karlin.mff.cuni.cz>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      275f495d
    • Mikulas Patocka's avatar
      hpfs: use mpage · a0c1b759
      Mikulas Patocka authored
      Use the mpage interface to improve performance.
      Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a0c1b759
    • Mikulas Patocka's avatar
      hpfs: better test for errors · 3ebacb05
      Mikulas Patocka authored
      The test if bitmap access is out of bound could errorneously pass if the
      device size is divisible by 16384 sectors and we are asking for one bitmap
      after the end.
      
      Check for invalid size in the superblock. Invalid size could cause integer
      overflows in the rest of the code.
      Signed-off-by: default avatarMikulas Patocka <mpatocka@artax.karlin.mff.cuni.cz>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3ebacb05
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 65b97fb7
      Linus Torvalds authored
      Pull powerpc updates from Ben Herrenschmidt:
       "This is the powerpc changes for the 3.11 merge window.  In addition to
        the usual bug fixes and small updates, the main highlights are:
      
         - Support for transparent huge pages by Aneesh Kumar for 64-bit
           server processors.  This allows the use of 16M pages as transparent
           huge pages on kernels compiled with a 64K base page size.
      
         - Base VFIO support for KVM on power by Alexey Kardashevskiy
      
         - Wiring up of our nvram to the pstore infrastructure, including
           putting compressed oopses in there by Aruna Balakrishnaiah
      
         - Move, rework and improve our "EEH" (basically PCI error handling
           and recovery) infrastructure.  It is no longer specific to pseries
           but is now usable by the new "powernv" platform as well (no
           hypervisor) by Gavin Shan.
      
         - I fixed some bugs in our math-emu instruction decoding and made it
           usable to emulate some optional FP instructions on processors with
           hard FP that lack them (such as fsqrt on Freescale embedded
           processors).
      
         - Support for Power8 "Event Based Branch" facility by Michael
           Ellerman.  This facility allows what is basically "userspace
           interrupts" for performance monitor events.
      
         - A bunch of Transactional Memory vs.  Signals bug fixes and HW
           breakpoint/watchpoint fixes by Michael Neuling.
      
        And more ...  I appologize in advance if I've failed to highlight
        something that somebody deemed worth it."
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (156 commits)
        pstore: Add hsize argument in write_buf call of pstore_ftrace_call
        powerpc/fsl: add MPIC timer wakeup support
        powerpc/mpic: create mpic subsystem object
        powerpc/mpic: add global timer support
        powerpc/mpic: add irq_set_wake support
        powerpc/85xx: enable coreint for all the 64bit boards
        powerpc/8xx: Erroneous double irq_eoi() on CPM IRQ in MPC8xx
        powerpc/fsl: Enable CONFIG_E1000E in mpc85xx_smp_defconfig
        powerpc/mpic: Add get_version API both for internal and external use
        powerpc: Handle both new style and old style reserve maps
        powerpc/hw_brk: Fix off by one error when validating DAWR region end
        powerpc/pseries: Support compression of oops text via pstore
        powerpc/pseries: Re-organise the oops compression code
        pstore: Pass header size in the pstore write callback
        powerpc/powernv: Fix iommu initialization again
        powerpc/pseries: Inform the hypervisor we are using EBB regs
        powerpc/perf: Add power8 EBB support
        powerpc/perf: Core EBB support for 64-bit book3s
        powerpc/perf: Drop MMCRA from thread_struct
        powerpc/perf: Don't enable if we have zero events
        ...
      65b97fb7
    • KOSAKI Motohiro's avatar
      posix-cpu-timers: don't account cpu timer after stopped thread runtime accounting · fa18f7bd
      KOSAKI Motohiro authored
      When tsk->signal->cputimer->running is 1, signal->cputimer (i.e. per process
      timer account) and tsk->sum_sched_runtime (i.e. per thread timer account)
      increase at the same pace because update_curr() increases both accounting.
      
      However, there is one exception. When thread exiting, __exit_signal() turns
      over task's sum_shced_runtime to sig->sum_sched_runtime, but it doesn't stop
      signal->cputimer accounting.
      
      This inconsistency makes POSIX timer wake up too early. This patch fixes it.
      Original-patch-by: default avatarOlivier Langlois <olivier@trillion01.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
      Signed-off-by: default avatarOlivier Langlois <olivier@trillion01.com>
      Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
      Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
      fa18f7bd
    • Benjamin Herrenschmidt's avatar
      of: Fix address decoding on Bimini and js2x machines · 6dd18e46
      Benjamin Herrenschmidt authored
       Commit:
      
        e38c0a1f
        of/address: Handle #address-cells > 2 specially
      
      broke real time clock access on Bimini, js2x, and similar powerpc
      machines using the "maple" platform. That code was indirectly relying
      on the old (broken) behaviour of the translation for the hypertransport
      to ISA bridge.
      
      This fixes it by treating hypertransport as a PCI bus
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
      Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
      6dd18e46
    • Jiri Kosina's avatar
    • Przemo Firszt's avatar
      HID: wacom: Intuos4 battery charging changes · 9d157624
      Przemo Firszt authored
      Intuos4 WL is separately reporting power supply and battery
      charging status - now hid-wacom is using that information.
      Previously hid-wacom was wrongly treating "battery charging" bit
      as "power supply connected". Now it should report battery charging,
      battery discharging, battery full and power supply status.
      
      Intuos4 WL sends reports when is in use (obvious) and when unplugging
      power supply. If means that if the device is being charged, but it's not
      being used it will never report "battery full". The same problem happens
      after the device has been connected, but it's not in use - the
      battery/ac status will be incorrect. Currently there is no mechanism to
      ask the device to send a report containing battery/ac status.
      Signed-off-by: default avatarPrzemo Firszt <przemo@firszt.eu>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      9d157624
    • Jiri Kosina's avatar
      Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into for-linus · 08ec2dcc
      Jiri Kosina authored
      Conflicts:
      	drivers/hid/hid-core.c
      08ec2dcc
    • Jiri Kosina's avatar
      Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and... · db583168
      Jiri Kosina authored
      Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and 'for-3.11/i2c-hid-fixed' into for-linus
      db583168
    • Andrew Duggan's avatar
      HID: i2c-hid: support sending HID output reports using the output register · 811adb96
      Andrew Duggan authored
      The current i2c hid driver does not support sending HID output reports using
      the output register for devices which support receiving reports through this
      method. This patch determines which method to use to send output reports based
       on the value of wMaxOutputLength in the device's HID descriptor.
      Signed-off-by: default avatarAndrew Duggan <aduggan@synaptics.com>
      Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      811adb96