1. 26 Feb, 2013 11 commits
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 52caa59e
      Linus Torvalds authored
      Pull i2c updates from Wolfram Sang:
       "Highlights:
      
         - new drivers for Intel ismt & Broadcom bcm2835
         - a number of drivers got support for more variants and mostly got
           cleaned up on the way (sis630, i801, at91, tegra, designware)
         - i2c got rid of all *_set_drvdata(..., NULL) on remove/probe failure
         - removed the i2c_smbus_process_call from the core since there are no
           users
         - mxs can now switch between PIO and DMA depending on the message
           size and the bus speed can now be arbitrary
      
        In addition, there is the usual bunch of fixes, cleanups, devm_*
        conversions, etc"
      
      Fixed conflict (and buggy devm_* conversion) in i2c-s3c2410.c
      
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (39 commits)
        i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls
        i2c: pxa: remove incorrect __exit annotations
        i2c: ocores: Fix pointer to integer cast warning
        i2c: tegra: remove warning dump if timeout happen in transfer
        i2c: fix i2c-ismt.c printk format warning
        i2c: i801: Add Device IDs for Intel Wellsburg PCH
        i2c: add bcm2835 driver
        i2c: ismt: Add Seth and Myself as maintainers
        i2c: sis630: checkpatch cleanup
        i2c: sis630: display unsigned hex
        i2c: sis630: use hex to constants for SMBus commands
        i2c: sis630: fix behavior after collision
        i2c: sis630: clear sticky bits
        i2c: sis630: Add SIS964 support
        i2c: isch: Add module parameter for backbone clock rate if divider is unset
        i2c: at91: fix unsed variable warning when building with !CONFIG_OF
        i2c: Adding support for Intel iSMT SMBus 2.0 host controller
        i2c: sh_mobile: don't send a stop condition by default inside transfers
        i2c: sh_mobile: eliminate an open-coded "goto" loop
        i2c: sh_mobile: fix timeout error handling
        ...
      52caa59e
    • Linus Torvalds's avatar
      Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux · 4c8c225a
      Linus Torvalds authored
      Pull GPIO changes from Grant Likely:
       "This branch contains the usual set of individual driver improvements
        and bug fixes, as well as updates to the core code.  The more notable
        changes include:
      
         - Internally add new API for referencing GPIOs by gpio_desc instead
           of number.  Eventually this will become a public API
      
         - ACPI GPIO binding support"
      
      * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux: (33 commits)
        arm64: select ARCH_WANT_OPTIONAL_GPIOLIB
        gpio: em: Use irq_domain_add_simple() to fix runtime error
        gpio: using common order: let 'static const' instead of 'const static'
        gpio/vt8500: memory cleanup missing
        gpiolib: Fix locking on gpio debugfs files
        gpiolib: let gpio_chip reference its descriptors
        gpiolib: use descriptors internally
        gpiolib: use gpio_chips list in gpiochip_find_base
        gpiolib: use gpio_chips list in sysfs ops
        gpiolib: use gpio_chips list in gpiochip_find
        gpiolib: use gpio_chips list in gpiolib_sysfs_init
        gpiolib: link all gpio_chips using a list
        gpio/langwell: cleanup driver
        gpio/langwell: Add Cloverview ids to pci device table
        gpio/lynxpoint: add chipset gpio driver.
        gpiolib: add missing braces in gpio_direction_show
        gpiolib-acpi: Fix error checks in interrupt requesting
        gpio: mpc8xxx: don't set IRQ_TYPE_NONE when creating irq mapping
        gpiolib: remove gpiochip_reserve()
        arm: pxa: tosa: do not use gpiochip_reserve()
        ...
      4c8c225a
    • Linus Torvalds's avatar
      Merge tag 'for-3.9-rc1' of git://gitorious.org/linux-pwm/linux-pwm · 3eb05225
      Linus Torvalds authored
      Pull PWM changes from Thierry Reding:
       "A new driver has been added to support the PWM mode of the timer
        counter blocks found on Atmel AT91 SoCs.  The VT8500 driver now
        supports changing the PWM signal polarity and the TI drivers (EHRPWM
        and ECAP) gained suspend and resume functionality.
      
        User drivers can now query the core for whether access to a PWM device
        will sleep (if the PWM chip is on a slow bus such as I2C or SPI).
      
        The pwm-backlight driver now handles the backlight BL_CORE_FBBLANK
        state in addition to the FB layer's blanking states.
      
        To round things off, a few fixes and cleanups are also included"
      
      * tag 'for-3.9-rc1' of git://gitorious.org/linux-pwm/linux-pwm:
        pwm: twl: Use to_twl() instead of container_of()
        pwm: tegra: assume CONFIG_OF
        pwm_backlight: Validate dft_brightness in main probe function
        pwm: Export pwm_{set,get}_chip_data()
        pwm: Make Kconfig entries more consistent
        pwm: Add can_sleep property to drivers
        pwm: Add pwm_can_sleep() as exported API to users
        pwm-backlight: handle BL_CORE_FBBLANK state
        pwm: pwm-tiecap: Low power sleep support
        pwm: pwm-tiehrpwm: Low power sleep support
        pwm: pwm-tiehrpwm: Update the clock handling of pwm-tiehrpwm driver
        pwm: vt8500: Add polarity support
        pwm: vt8500: Register write busy test performed incorrectly
        pwm: atmel: add Timer Counter Block PWM driver
      3eb05225
    • Linus Torvalds's avatar
      Merge tag 'mmc-updates-for-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · ed5dc237
      Linus Torvalds authored
      Pull MMC update from Chris Ball:
       "MMC highlights for 3.9:
      
        Core:
         - Support for packed commands in eMMC 4.5.  (This requires a host
           capability to be turned on.  It increases write throughput by 20%+,
           but may also increase average write latency; more testing needed.)
         - Add DT bindings for capability flags.
         - Add mmc_of_parse() for shared DT parsing between drivers.
      
        Drivers:
         - android-goldfish: New MMC driver for the Android Goldfish emulator.
         - mvsdio: Add DT bindings, pinctrl, use slot-gpio for card detection.
         - omap_hsmmc: Fix boot hangs with RPMB partitions.
         - sdhci-bcm2835: New driver for controller used by Raspberry Pi.
         - sdhci-esdhc-imx: Add 8-bit data, auto CMD23 support, use slot-gpio.
         - sh_mmcif: Add support for eMMC DDR, bundled MMCIF IRQs.
         - tmio_mmc: Add DT bindings, support for vccq regulator"
      
      * tag 'mmc-updates-for-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (92 commits)
        mmc: tegra: assume CONFIG_OF, remove platform data
        mmc: add DT bindings for more MMC capability flags
        mmc: tmio: add support for the VccQ regulator
        mmc: tmio: remove unused and deprecated symbols
        mmc: sh_mobile_sdhi: use managed resource allocations
        mmc: sh_mobile_sdhi: remove unused .pdata field
        mmc: tmio-mmc: parse device-tree bindings
        mmc: tmio-mmc: define device-tree bindings
        mmc: sh_mmcif: use mmc_of_parse() to parse standard MMC DT bindings
        mmc: (cosmetic) remove "extern" from function declarations
        mmc: provide a standard MMC device-tree binding parser centrally
        mmc: detailed definition of CD and WP MMC line polarities in DT
        mmc: sdhi, tmio: only check flags in tmio-mmc driver proper
        mmc: sdhci: Fix parameter of sdhci_do_start_signal_voltage_switch()
        mmc: sdhci: check voltage range only on regulators aware of voltage value
        mmc: bcm2835: set SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK
        mmc: support packed write command for eMMC4.5 devices
        mmc: add packed command feature of eMMC4.5
        mmc: rtsx: remove driving adjustment
        mmc: use regulator_can_change_voltage() instead of regulator_count_voltages
        ...
      ed5dc237
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds · 0512c04a
      Linus Torvalds authored
      Pull LED subsystem update from Bryan Wu.
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (61 commits)
        leds: leds-sunfire: use dev_err()/pr_err() instead of printk()
        leds: 88pm860x: Add missing of_node_put()
        leds: tca6507: Use of_get_child_count()
        leds: leds-pwm: make it depend on PWM and not HAVE_PWM
        Documentation: leds: update LP55xx family devices
        leds-lp55xx: fix problem on removing LED attributes
        leds-lp5521/5523: add author and copyright description
        leds-lp5521/5523: use new lp55xx common header
        leds-lp55xx: clean up headers
        leds-lp55xx: clean up definitions
        leds-lp55xx: clean up unused data and functions
        leds-lp55xx: clean up _remove()
        leds-lp55xx: add new function for removing device attribtues
        leds-lp55xx: code refactoring on selftest function
        leds-lp55xx: use common device attribute driver function
        leds-lp55xx: support device specific attributes
        leds-lp5523: use generic firmware interface
        leds-lp5521: use generic firmware interface
        leds-lp55xx: support firmware interface
        leds-lp55xx: add new lp55xx_register_sysfs() for the firmware interface
        ...
      0512c04a
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma · 5115f3c1
      Linus Torvalds authored
      Pull slave-dmaengine updates from Vinod Koul:
       "This is fairly big pull by my standards as I had missed last merge
        window.  So we have the support for device tree for slave-dmaengine,
        large updates to dw_dmac driver from Andy for reusing on different
        architectures.  Along with this we have fixes on bunch of the drivers"
      
      Fix up trivial conflicts, usually due to #include line movement next to
      each other.
      
      * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (111 commits)
        Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT"
        ARM: dts: pl330: Add #dma-cells for generic dma binding support
        DMA: PL330: Register the DMA controller with the generic DMA helpers
        DMA: PL330: Add xlate function
        DMA: PL330: Add new pl330 filter for DT case.
        dma: tegra20-apb-dma: remove unnecessary assignment
        edma: do not waste memory for dma_mask
        dma: coh901318: set residue only if dma is in progress
        dma: coh901318: avoid unbalanced locking
        dmaengine.h: remove redundant else keyword
        dma: of-dma: protect list write operation by spin_lock
        dmaengine: ste_dma40: do not remove descriptors for cyclic transfers
        dma: of-dma.c: fix memory leakage
        dw_dmac: apply default dma_mask if needed
        dmaengine: ioat - fix spare sparse complain
        dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c
        ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING
        dw_dmac: add support for Lynxpoint DMA controllers
        dw_dmac: return proper residue value
        dw_dmac: fill individual length of descriptor
        ...
      5115f3c1
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-fixes-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · c41b3810
      Linus Torvalds authored
      Pull ACPI and power management fixes from Rafael Wysocki:
      
       - Fixes for blackfin and microblaze build problems introduced by the
         removal of global pm_idle.  From Lars-Peter Clausen.
      
       - OPP core build fix from Shawn Guo.
      
       - Error condition check fix for the new imx6q-cpufreq driver from Wei
         Yongjun.
      
       - Fix for an AER driver crash related to the lack of APEI
         initialization for acpi=off.  From Rafael J Wysocki.
      
       - Fix for a USB breakage on Thinkpad T430 related to ACPI power
         resources and PCI wakeup from Rafael J.  Wysocki.
      
      * tag 'pm+acpi-fixes-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / PM: Take unusual configurations of power resources into account
        imx6q-cpufreq: fix return value check in imx6q_cpufreq_probe()
        PM / OPP: fix condition for empty of_init_opp_table()
        ACPI / APEI: Fix crash in apei_hest_parse() for acpi=off
        microblaze idle: Fix compile error
        blackfin idle: Fix compile error
      c41b3810
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 556f12f6
      Linus Torvalds authored
      Pull PCI changes from Bjorn Helgaas:
       "Host bridge hotplug
          - Major overhaul of ACPI host bridge add/start (Rafael Wysocki, Yinghai Lu)
          - Major overhaul of PCI/ACPI binding (Rafael Wysocki, Yinghai Lu)
          - Split out ACPI host bridge and ACPI PCI device hotplug (Yinghai Lu)
          - Stop caching _PRT and make independent of bus numbers (Yinghai Lu)
      
        PCI device hotplug
          - Clean up cpqphp dead code (Sasha Levin)
          - Disable ARI unless device and upstream bridge support it (Yijing Wang)
          - Initialize all hot-added devices (not functions 0-7) (Yijing Wang)
      
        Power management
          - Don't touch ASPM if disabled (Joe Lawrence)
          - Fix ASPM link state management (Myron Stowe)
      
        Miscellaneous
          - Fix PCI_EXP_FLAGS accessor (Alex Williamson)
          - Disable Bus Master in pci_device_shutdown (Konstantin Khlebnikov)
          - Document hotplug resource and MPS parameters (Yijing Wang)
          - Add accessor for PCIe capabilities (Myron Stowe)
          - Drop pciehp suspend/resume messages (Paul Bolle)
          - Make pci_slot built-in only (not a module) (Jiang Liu)
          - Remove unused PCI/ACPI bind ops (Jiang Liu)
          - Removed used pci_root_bus (Bjorn Helgaas)"
      
      * tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (51 commits)
        PCI/ACPI: Don't cache _PRT, and don't associate them with bus numbers
        PCI: Fix PCI Express Capability accessors for PCI_EXP_FLAGS
        ACPI / PCI: Make pci_slot built-in only, not a module
        PCI/PM: Clear state_saved during suspend
        PCI: Use atomic_inc_return() rather than atomic_add_return()
        PCI: Catch attempts to disable already-disabled devices
        PCI: Disable Bus Master unconditionally in pci_device_shutdown()
        PCI: acpiphp: Remove dead code for PCI host bridge hotplug
        PCI: acpiphp: Create companion ACPI devices before creating PCI devices
        PCI: Remove unused "rc" in virtfn_add_bus()
        PCI: pciehp: Drop suspend/resume ENTRY messages
        PCI/ASPM: Don't touch ASPM if forcibly disabled
        PCI/ASPM: Deallocate upstream link state even if device is not PCIe
        PCI: Document MPS parameters pci=pcie_bus_safe, pci=pcie_bus_perf, etc
        PCI: Document hpiosize= and hpmemsize= resource reservation parameters
        PCI: Use PCI Express Capability accessor
        PCI: Introduce accessor to retrieve PCIe Capabilities Register
        PCI: Put pci_dev in device tree as early as possible
        PCI: Skip attaching driver in device_add()
        PCI: acpiphp: Keep driver loaded even if no slots found
        ...
      556f12f6
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · fffddfd6
      Linus Torvalds authored
      Pull drm merge from Dave Airlie:
       "Highlights:
      
         - TI LCD controller KMS driver
      
         - TI OMAP KMS driver merged from staging
      
         - drop gma500 stub driver
      
         - the fbcon locking fixes
      
         - the vgacon dirty like zebra fix.
      
         - open firmware videomode and hdmi common code helpers
      
         - major locking rework for kms object handling - pageflip/cursor
           won't block on polling anymore!
      
         - fbcon helper and prime helper cleanups
      
         - i915: all over the map, haswell power well enhancements, valleyview
           macro horrors cleaned up, killing lots of legacy GTT code,
      
         - radeon: CS ioctl unification, deprecated UMS support, gpu reset
           rework, VM fixes
      
         - nouveau: reworked thermal code, external dp/tmds encoder support
           (anx9805), fences sleep instead of polling,
      
         - exynos: all over the driver fixes."
      
      Lovely conflict in radeon/evergreen_cs.c between commit de0babd6
      ("drm/radeon: enforce use of radeon_get_ib_value when reading user cmd")
      and the new changes that modified that evergreen_dma_cs_parse()
      function.
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (508 commits)
        drm/tilcdc: only build on arm
        drm/i915: Revert hdmi HDP pin checks
        drm/tegra: Add list of framebuffers to debugfs
        drm/tegra: Fix color expansion
        drm/tegra: Split DC_CMD_STATE_CONTROL register write
        drm/tegra: Implement page-flipping support
        drm/tegra: Implement VBLANK support
        drm/tegra: Implement .mode_set_base()
        drm/tegra: Add plane support
        drm/tegra: Remove bogus tegra_framebuffer structure
        drm: Add consistency check for page-flipping
        drm/radeon: Use generic HDMI infoframe helpers
        drm/tegra: Use generic HDMI infoframe helpers
        drm: Add EDID helper documentation
        drm: Add HDMI infoframe helpers
        video: Add generic HDMI infoframe helpers
        drm: Add some missing forward declarations
        drm: Move mode tables to drm_edid.c
        drm: Remove duplicate drm_mode_cea_vic()
        gma500: Fix n, m1 and m2 clock limits for sdvo and lvds
        ...
      fffddfd6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 69086a78
      Linus Torvalds authored
      Pull vfs fix from Al Viro:
       "Fix for 3.8 breakage introduced by "vfs: Allow unprivileged
        manipulation of the mount namespace" - accessing mnt->mnt_ns is done
        there without needed locking *and* without any real need.
      
        Definite -stable fodder, fortunately not going too far back.
      
        This is *not* all - there will be much bigger vfs pull request
        tomorrow."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        get rid of unprotected dereferencing of mnt->mnt_ns
      69086a78
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 94f2f142
      Linus Torvalds authored
      Pull user namespace and namespace infrastructure changes from Eric W Biederman:
       "This set of changes starts with a few small enhnacements to the user
        namespace.  reboot support, allowing more arbitrary mappings, and
        support for mounting devpts, ramfs, tmpfs, and mqueuefs as just the
        user namespace root.
      
        I do my best to document that if you care about limiting your
        unprivileged users that when you have the user namespace support
        enabled you will need to enable memory control groups.
      
        There is a minor bug fix to prevent overflowing the stack if someone
        creates way too many user namespaces.
      
        The bulk of the changes are a continuation of the kuid/kgid push down
        work through the filesystems.  These changes make using uids and gids
        typesafe which ensures that these filesystems are safe to use when
        multiple user namespaces are in use.  The filesystems converted for
        3.9 are ceph, 9p, afs, ocfs2, gfs2, ncpfs, nfs, nfsd, and cifs.  The
        changes for these filesystems were a little more involved so I split
        the changes into smaller hopefully obviously correct changes.
      
        XFS is the only filesystem that remains.  I was hoping I could get
        that in this release so that user namespace support would be enabled
        with an allyesconfig or an allmodconfig but it looks like the xfs
        changes need another couple of days before it they are ready."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (93 commits)
        cifs: Enable building with user namespaces enabled.
        cifs: Convert struct cifs_ses to use a kuid_t and a kgid_t
        cifs: Convert struct cifs_sb_info to use kuids and kgids
        cifs: Modify struct smb_vol to use kuids and kgids
        cifs: Convert struct cifsFileInfo to use a kuid
        cifs: Convert struct cifs_fattr to use kuid and kgids
        cifs: Convert struct tcon_link to use a kuid.
        cifs: Modify struct cifs_unix_set_info_args to hold a kuid_t and a kgid_t
        cifs: Convert from a kuid before printing current_fsuid
        cifs: Use kuids and kgids SID to uid/gid mapping
        cifs: Pass GLOBAL_ROOT_UID and GLOBAL_ROOT_GID to keyring_alloc
        cifs: Use BUILD_BUG_ON to validate uids and gids are the same size
        cifs: Override unmappable incoming uids and gids
        nfsd: Enable building with user namespaces enabled.
        nfsd: Properly compare and initialize kuids and kgids
        nfsd: Store ex_anon_uid and ex_anon_gid as kuids and kgids
        nfsd: Modify nfsd4_cb_sec to use kuids and kgids
        nfsd: Handle kuids and kgids in the nfs4acl to posix_acl conversion
        nfsd: Convert nfsxdr to use kuids and kgids
        nfsd: Convert nfs3xdr to use kuids and kgids
        ...
      94f2f142
  2. 25 Feb, 2013 17 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · 8d168f71
      Linus Torvalds authored
      Pull KVM ARM compile fixes from Gleb Natapov:
       "Fix ARM KVM compilation breakage due to changes from kvm.git"
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        ARM: KVM: fix compilation after removal of user_alloc from struct kvm_memory_slot
        ARM: KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS
        ARM: KVM: fix kvm_arch_{prepare,commit}_memory_region
      8d168f71
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 32dc43e4
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
       "Here is the crypto update for 3.9:
      
         - Added accelerated implementation of crc32 using pclmulqdq.
      
         - Added test vector for fcrypt.
      
         - Added support for OMAP4/AM33XX cipher and hash.
      
         - Fixed loose crypto_user input checks.
      
         - Misc fixes"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (43 commits)
        crypto: user - ensure user supplied strings are nul-terminated
        crypto: user - fix empty string test in report API
        crypto: user - fix info leaks in report API
        crypto: caam - Added property fsl,sec-era in SEC4.0 device tree binding.
        crypto: use ERR_CAST
        crypto: atmel-aes - adjust duplicate test
        crypto: crc32-pclmul - Kill warning on x86-32
        crypto: x86/twofish - assembler clean-ups: use ENTRY/ENDPROC, localize jump labels
        crypto: x86/sha1 - assembler clean-ups: use ENTRY/ENDPROC
        crypto: x86/serpent - use ENTRY/ENDPROC for assember functions and localize jump targets
        crypto: x86/salsa20 - assembler cleanup, use ENTRY/ENDPROC for assember functions and rename ECRYPT_* to salsa20_*
        crypto: x86/ghash - assembler clean-up: use ENDPROC at end of assember functions
        crypto: x86/crc32c - assembler clean-up: use ENTRY/ENDPROC
        crypto: cast6-avx: use ENTRY()/ENDPROC() for assembler functions
        crypto: cast5-avx: use ENTRY()/ENDPROC() for assembler functions and localize jump targets
        crypto: camellia-x86_64/aes-ni: use ENTRY()/ENDPROC() for assembler functions and localize jump targets
        crypto: blowfish-x86_64: use ENTRY()/ENDPROC() for assembler functions and localize jump targets
        crypto: aesni-intel - add ENDPROC statements for assembler functions
        crypto: x86/aes - assembler clean-ups: use ENTRY/ENDPROC, localize jump targets
        crypto: testmgr - add test vector for fcrypt
        ...
      32dc43e4
    • Stephen Rothwell's avatar
      drm/tilcdc: only build on arm · be88298b
      Stephen Rothwell authored
      [airlied: hack for now until we fix cma helpers on other OF platforms]
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
      be88298b
    • Linus Torvalds's avatar
      Merge tag 'please-pull-vm_unwrapped' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · d414c104
      Linus Torvalds authored
      Pull ia64 update from Tony Luck:
       "ia64 vm patch series that was cooking in -mm tree"
      
      * tag 'please-pull-vm_unwrapped' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        mm: use vm_unmapped_area() in hugetlbfs on ia64 architecture
        mm: use vm_unmapped_area() on ia64 architecture
      d414c104
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · f6d43b93
      Linus Torvalds authored
      Pull security subsystem fixes from James Morris:
       "From Mimi:
      
          Both of these patches are bug fixes for patches, which were
          upstreamed in this open window.  The first patch addresses a merge
          issue.  The second patch addresses a CONFIG_BLOCK dependency."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        block: fix part_pack_uuid() build error
        ima: "remove enforce checking duplication" merge fix
      f6d43b93
    • Linus Torvalds's avatar
      Merge tag 'ktest-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest · c69d0a15
      Linus Torvalds authored
      Pull ktest update from Steven Rostedt:
       "Added ability to have all builds test warnings.
      
        Fixed failing reboot when the reboot produces a non fatal error.
      
        Config reading fixes and other cleanups"
      
      * tag 'ktest-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
        ktest: Remove indexes from warnings check
        ktest: Ignore warnings during reboot
        ktest: Search for linux banner for successful reboot
        ktest: Add make_warnings_file and process full warnings
        ktest: Allow a test option to use its default option
        ktest: Strip off '\n' when reading which files were modified
        ktest: Do not require CONSOLE for build or install bisects
      c69d0a15
    • Linus Torvalds's avatar
      Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 9043a265
      Linus Torvalds authored
      Pull module update from Rusty Russell:
       "The sweeping change is to make add_taint() explicitly indicate whether
        to disable lockdep, but it's a mechanical change."
      
      * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        MODSIGN: Add option to not sign modules during modules_install
        MODSIGN: Add -s <signature> option to sign-file
        MODSIGN: Specify the hash algorithm on sign-file command line
        MODSIGN: Simplify Makefile with a Kconfig helper
        module: clean up load_module a little more.
        modpost: Ignore ARC specific non-alloc sections
        module: constify within_module_*
        taint: add explicit flag to show whether lock dep is still OK.
        module: printk message when module signature fail taints kernel.
      9043a265
    • Mimi Zohar's avatar
      block: fix part_pack_uuid() build error · 446d64e3
      Mimi Zohar authored
      Commit "85865c1f ima: add policy support for file system uuid"
      introduced a CONFIG_BLOCK dependency.  This patch defines a
      wrapper called blk_part_pack_uuid(), which returns -EINVAL,
      when CONFIG_BLOCK is not defined.
      
      security/integrity/ima/ima_policy.c:538:4: error: implicit declaration
      of function 'part_pack_uuid' [-Werror=implicit-function-declaration]
      
      Changelog v2:
      - Reference commit number in patch description
      Changelog v1:
      - rename ima_part_pack_uuid() to blk_part_pack_uuid()
      - resolve scripts/checkpatch.pl warnings
      Changelog v0:
      - fix UUID scripts/Lindent msgs
      Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Reported-by: default avatarDavid Rientjes <rientjes@google.com>
      Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
      Acked-by: default avatarDavid Rientjes <rientjes@google.com>
      Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Cc: Jens Axboe <axboe@kernel.dk>
      Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
      446d64e3
    • Mimi Zohar's avatar
      ima: "remove enforce checking duplication" merge fix · a2c2c3a7
      Mimi Zohar authored
      Commit "750943a3 ima: remove enforce checking duplication" combined
      the 'in IMA policy' and 'enforcing file integrity' checks.  For
      the non-file, kernel module verification, a specific check for
      'enforcing file integrity' was not added.  This patch adds the
      check.
      Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
      Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
      a2c2c3a7
    • Marc Zyngier's avatar
      ARM: KVM: fix compilation after removal of user_alloc from struct kvm_memory_slot · 3b8cd8a0
      Marc Zyngier authored
      Commit 7a905b14 (KVM: Remove user_alloc from struct kvm_memory_slot)
      broke KVM/ARM by removing the user_alloc field from a public structure.
      
      As we only used this field to alert the user that we didn't support
      this operation mode, there is no harm in discarding this bit of code
      without any remorse.
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
      3b8cd8a0
    • Marc Zyngier's avatar
      ARM: KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS · 2b5e1e47
      Marc Zyngier authored
      Commit bbacc0c1 (KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS)
      broke KVM/ARM by changing a global #define.
      
      Apply the same change to fix the compilation breakage.
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
      2b5e1e47
    • Marc Zyngier's avatar
      ARM: KVM: fix kvm_arch_{prepare,commit}_memory_region · bef103aa
      Marc Zyngier authored
      Commit f82a8cfe (KVM: struct kvm_memory_slot.user_alloc -> bool)
      broke the ARM KVM port by changing the prototype of two global
      functions.
      
      Apply the same change to fix the compilation breakage.
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
      bef103aa
    • Linus Torvalds's avatar
      Merge tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · ab782659
      Linus Torvalds authored
      Pull MFS updates from Samuel Ortiz:
       "This is the MFD pull request for the 3.9 merge window.
      
        No new drivers this time, but a bunch of fairly big cleanups:
      
         - Roger Quadros worked on a OMAP USBHS and TLL platform data
           consolidation, OMAP5 support and clock management code cleanup.
      
         - The first step of a major sync for the ab8500 driver from Lee
           Jones.  In particular, the debugfs and the sysct interfaces got
           extended and improved.
      
         - Peter Ujfalusi sent a nice patchset for cleaning and fixing the
           twl-core driver, with a much needed module id lookup code
           improvement.
      
         - The regular wm5102 and arizona cleanups and fixes from Mark Brown.
      
         - Laxman Dewangan extended the palmas APIs in order to implement the
           palmas GPIO and rt drivers.
      
         - Laxman also added DT support for the tps65090 driver.
      
         - The Intel SCH and ICH drivers got a couple fixes from Aaron Sierra
           and Darren Hart.
      
         - Linus Walleij patchset for the ab8500 driver allowed ab8500 and
           ab9540 based devices to switch to the new abx500 pin-ctrl driver.
      
         - The max8925 now has device tree and irqdomain support thanks to
           Qing Xu.
      
         - The recently added rtsx driver got a few cleanups and fixes for a
           better card detection code path and now also supports the RTS5227
           chipset, thanks to Wei Wang and Roger Tseng."
      
      * tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (109 commits)
        mfd: lpc_ich: Use devres API to allocate private data
        mfd: lpc_ich: Add Device IDs for Intel Wellsburg PCH
        mfd: lpc_sch: Accomodate partial population of the MFD devices
        mfd: da9052-i2c: Staticize da9052_i2c_fix()
        mfd: syscon: Fix sparse warning
        mfd: twl-core: Fix kernel panic on boot
        mfd: rtsx: Fix issue that booting OS with SD card inserted
        mfd: ab8500: Fix compile error
        mfd: Add missing GENERIC_HARDIRQS dependecies
        Documentation: Add docs for max8925 dt
        mfd: max8925: Add dts
        mfd: max8925: Support dt for backlight
        mfd: max8925: Fix onkey driver irq base
        mfd: max8925: Fix mfd device register failure
        mfd: max8925: Add irqdomain for dt
        mfd: vexpress: Allow vexpress-sysreg to self-initialise
        mfd: rtsx: Support RTS5227
        mfd: rtsx: Implement driving adjustment to device-dependent callbacks
        mfd: vexpress: Add pseudo-GPIO based LEDs
        mfd: ab8500: Rename ab8500 to abx500 for hwmon driver
        ...
      ab782659
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 21fbd580
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
      
       - Some cleanups at V4L2 documentation
      
       - new drivers: ts2020 frontend, ov9650 sensor, s5c73m3 sensor,
         sh-mobile veu mem2mem driver, radio-ma901, davinci_vpfe staging
         driver
      
       - Lots of missing MAINTAINERS entries added
      
       - several em28xx driver improvements, including its conversion to
         videobuf2
      
       - several fixups on drivers to make them to better comply with the API
      
       - DVB core: add support for DVBv5 stats, allowing the implementation of
         statistics for new standards like ISDB
      
       - mb86a20s: add statistics to the driver
      
       - lots of new board additions, cleanups, and driver improvements.
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (596 commits)
        [media] media: Add 0x3009 USB PID to ttusb2 driver (fixed diff)
        [media] rtl28xxu: Add USB IDs for Compro VideoMate U620F
        [media] em28xx: add usb id for terratec h5 rev. 3
        [media] media: rc: gpio-ir-recv: add support for device tree parsing
        [media] mceusb: move check earlier to make smatch happy
        [media] radio-si470x doc: add info about v4l2-ctl and sox+alsa
        [media] staging: media: Remove unnecessary OOM messages
        [media] sh_vou: Use vou_dev instead of vou_file wherever possible
        [media] sh_vou: Use video_drvdata()
        [media] drivers/media/platform/soc_camera/pxa_camera.c: use devm_ functions
        [media] mt9t112: mt9t111 format set up differs from mt9t112
        [media] sh-mobile-ceu-camera: fix SHARPNESS control default
        Revert "[media] fc0011: Return early, if the frequency is already tuned"
        [media] cx18/ivtv: fix regression: remove __init from a non-init function
        [media] em28xx: fix analog streaming with USB bulk transfers
        [media] stv0900: remove unnecessary null pointer check
        [media] fc0011: Return early, if the frequency is already tuned
        [media] fc0011: Add some sanity checks and cleanups
        [media] fc0011: Fix xin value clamping
        Revert "[media] [PATH,1/2] mxl5007 move reset to attach"
        ...
      21fbd580
    • Linus Torvalds's avatar
      Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · d9978ec5
      Linus Torvalds authored
      Pull libata updates from Jeff Garzik:
      
      1) apply, and then revert, the sysfs export of ATA host controller
         number.  Discussion was continuing after patch application, trying to
         figure out how to best mesh exported data with the installers,
         boot-time agents and other parties that want this info.
      
      2) Merge Zero-Power Optical Device Driver (ZPODD) support, bringing the
         wonderfulness of sane power management to your CD/DVD device.
      
         Includes one SCSI-subsystem patch (with appropriate ACKs), adding
         runtime PM support to 'sr' driver.  That is the ZPODD interaction
         bits.
      
         Patchset went through some 13 revisions before it got here; kudos to
         Intel for persistence.
      
      3) pata_samsung_cf: use devm_clk_get()
      
      4) more ata_piix, ahci PCI IDs
      
      5) Add SATA driver for R-Car SoC
      
      6) Convert libata to use devm_ioremap_resource (Note: I think Greg sent
         this to you, also)
      
      7) Set proper Sense Key (SK) in the SCSI simulator when ATA passthrough
         indicates check condition.  Google and specification hawks everywhere
         shall rejoice.
      
      * tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (22 commits)
        [libata] fix smatch warning for zpodd_wake_dev
        [libata] Set proper SK when CK_COND is set.
        [libata] Convert to devm_ioremap_resource()
        libata: add R-Car SATA driver
        ahci: Add Device IDs for Intel Wellsburg PCH
        ata_piix: Add Device IDs for Intel Wellsburg PCH
        [SCSI] remove can_power_off flag from scsi_device
        [libata] scsi: no poll when ODD is powered off
        [SCSI] sr: support runtime pm
        ahci: AHCI-mode SATA patch for Intel Avoton DeviceIDs
        ata_piix: IDE-mode SATA patch for Intel Avoton DeviceIDs
        [libata] PM code cleanup for ata port
        [libata] pm: differentiate system and runtime pm for ata port
        Revert "libata: export host controller number thru /sys"
        libata: do not suspend port if normal ODD is attached
        libata: expose pm qos flags for ata device
        libata: handle power transition of ODD
        libata: check zero power ready status for ZPODD
        libata: move acpi notification code to zpodd
        libata: identify and init ZPODD devices
        ...
      d9978ec5
    • Nicolas Pitre's avatar
      tty vt: fix character insertion overflow · a883b70d
      Nicolas Pitre authored
      Commit 81732c3b ("tty vt: Fix line garbage in virtual console on
      command line edition") broke insert_char() in multiple ways.  Then
      commit b1a925f4 ("tty vt: Fix a regression in command line edition")
      partially fixed it.  However, the buffer being moved is still too large
      and overflowing beyond the end of the current line, corrupting existing
      characters on the next line.
      
      Example test case:
      
      echo -e "abc\nde\x1b[A\x1b[4h \x1b[4l\x1b[B"
      
      Expected result:
      
      ab c
      de
      
      Current result:
      
      ab c
       e
      
      Needless to say that this is very annoying when inserting words in the
      middle of paragraphs with certain text editors.
      Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
      Cc: Jean-François Moine <moinejf@free.fr>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a883b70d
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.9-rc0-tag' of... · 77be36de
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.9-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen update from Konrad Rzeszutek Wilk:
       "This has two new ACPI drivers for Xen - a physical CPU offline/online
        and a memory hotplug.  The way this works is that ACPI kicks the
        drivers and they make the appropiate hypercall to the hypervisor to
        tell it that there is a new CPU or memory.  There also some changes to
        the Xen ARM ABIs and couple of fixes.  One particularly nasty bug in
        the Xen PV spinlock code was fixed by Stefan Bader - and has been
        there since the 2.6.32!
      
        Features:
         - Xen ACPI memory and CPU hotplug drivers - allowing Xen hypervisor
           to be aware of new CPU and new DIMMs
         - Cleanups
        Bug-fixes:
         - Fixes a long-standing bug in the PV spinlock wherein we did not
           kick VCPUs that were in a tight loop.
         - Fixes in the error paths for the event channel machinery"
      
      Fix up a few semantic conflicts with the ACPI interface changes in
      drivers/xen/xen-acpi-{cpu,mem}hotplug.c.
      
      * tag 'stable/for-linus-3.9-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: event channel arrays are xen_ulong_t and not unsigned long
        xen: Send spinlock IPI to all waiters
        xen: introduce xen_remap, use it instead of ioremap
        xen: close evtchn port if binding to irq fails
        xen-evtchn: correct comment and error output
        xen/tmem: Add missing %s in the printk statement.
        xen/acpi: move xen_acpi_get_pxm under CONFIG_XEN_DOM0
        xen/acpi: ACPI cpu hotplug
        xen/acpi: Move xen_acpi_get_pxm to Xen's acpi.h
        xen/stub: driver for CPU hotplug
        xen/acpi: ACPI memory hotplug
        xen/stub: driver for memory hotplug
        xen: implement updated XENMEM_add_to_physmap_range ABI
        xen/smp: Move the common CPU init code a bit to prep for PVH patch.
      77be36de
  3. 24 Feb, 2013 12 commits