1. 08 Oct, 2014 25 commits
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · eb785bef
      Linus Torvalds authored
      Pull ARM SoC DT updates from Arnd Bergmann:
       "As usual, this is the largest branch, though this time a little under
        half of the total changes with 307 individual non-merge changesets.
        The largest changes are the addition of new machines, in particular
        the Tegra based Chromebook, the Renesas r8a7794 SoC, and DT support
        for the old i.MX1 platform.
        Other changes include
         - at91: various sam9 and sama5 updates
         - exynos: much extended Peach Pi/Pit (Chromebook 2) support
         - keystone: new peripherals
         - meson: added DT for meson6 SoC
         - mvebu: new device support for Armada 370/375
         - qcom: improved support for IPQ8064 and MSM8x60
         - rockchip: much improved support for rk3288
         - shmobile: lots of updates all over the place
         - sunxi: dts license change
         - sunxi: more a23 device support
         - vexpress: CLCD DT description"
      * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (308 commits)
        ARM: DTS: meson: update DTSI to add watchdog node
        ARM: dts: keystone-k2l: fix mdio io start address
        ARM: dts: keystone-k2e: fix mdio io start address
        ARM: dts: keystone-k2e: update usb1 node for dma properties
        ARM: dts: keystone: fix io range for usb_phy0
        Revert "Merge tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi into next/dt"
        Revert "ARM: dts: hix5hd2: add wdg node"
        ARM: dts: add rk3288 i2s controller
        ARM: vexpress: Add CLCD Device Tree properties
        ARM: bcm2835: add I2S pinctrl to device tree
        ARM: meson: documentation: add bindings documentation
        ARM: meson: dts: add basic Meson/Meson6/Meson6-atv1200 DTSI/DTS
        ARM: dts: mt6589: Change compatible string for GIC
        ARM: dts: mediatek: Add compatible property for aquaris5
        ARM: dts: mt6589-aquaris5: Add boot argument earlyprintk
        ARM: dts: mt6589: Fix typo in GIC unit address
        ARM: dts: Build dtb for Mediatek board
        ARM: dts: keystone: fix bindings for pcie and usb clock nodes
        ARM: dts: keystone: k2l: Fix chip selects for SPI devices
        ARM: dts: keystone: add dsp gpio controllers nodes
    • Linus Torvalds's avatar
      Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · cf377ad7
      Linus Torvalds authored
      Pull ARM SoC platform changes from Arnd Bergmann:
       "New and updated SoC support.  Among the things new for this release
         - at91: Added support for the new SAMA5D4 SoC, following the earlier
         - bcm: Added support for BCM63XX family of DSL SoCs
         - hisi: Added support for HiP04 server-class SoC
         - meson: Initial support for the Amlogic Meson6 (aka 8726MX) platform
         - shmobile: added support for new r8a7794 (R-Car E2) automotive SoC
        Noteworthy changes to existing SoC support are:
         - imx: convert i.MX1 to device tree
         - omap: lots of power management work
         - omap: base support to enable moving to standard UART driver
         - shmobile: lots of progress for multiplatform support, still
      * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (171 commits)
        ARM: hisi: depend on ARCH_MULTI_V7
        CNS3xxx: Fix debug UART.
        ARM: at91: fix nommu build regression
        ARM: meson: add basic support for MesonX SoCs
        ARM: meson: debug: add debug UART for earlyprintk support
        irq: Export handle_fasteoi_irq
        ARM: mediatek: Add earlyprintk support for mt6589
        ARM: hisi: Fix platmcpm compilation when ARMv6 is selected
        ARM: debug: fix alphanumerical order on debug uarts
        ARM: at91: document Atmel SMART compatibles
        ARM: at91: add sama5d4 support to sama5_defconfig
        ARM: at91: dt: add device tree file for SAMA5D4ek board
        ARM: at91: dt: add device tree file for SAMA5D4 SoC
        ARM: at91: SAMA5D4 SoC detection code and low level routines
        ARM: at91: introduce basic SAMA5D4 support
        clk: at91: add a driver for the h32mx clock
        ARM: pxa3xx: provide specific platform_devices for all ssp ports
        ARM: pxa: ssp: provide platform_device_id for PXA3xx
        ARM: OMAP4+: Remove static iotable mappings for SRAM
        ARM: OMAP4+: Move SRAM data to DT
    • Linus Torvalds's avatar
      Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 212fe84a
      Linus Torvalds authored
      Pull ARM SoC cleanups from Arnd Bergmann:
       "This time around, the cleanup branch contains mostly code removal.  A
        number of board files for at91, imx and msm have become obsolete
        because of the DT conversion and are now ready to be removed.  The
        OMAP platform has traditionally had its own DMA engine abstraction and
        as this is being phased out, a lot of the original code is now unused
        and can be removed as well.
        S3C24xx can be simplified now that the restart code is a proper device
        Finally, a number of cleanups in shmobile are done to prepare for the
        addition of new code in other branches"
      * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
        ARM: at91: Remove the support for the RSI EWS board
        arm: mach-omap2: Convert pr_warning to pr_warn
        ARM: OMAP: Remove unused pieces of legacy DMA API
        ARM: at91: remove board file for Acme Systems Fox G20
        ARM: orion5x: Convert pr_warning to pr_warn
        ARM: S3C24XX: remove separate restart code
        ARM: EXYNOS: Do not calculate boot address twice
        ARM: sunxi: Remove sun4i reboot code from mach directory
        ARM: imx: Remove mach-mxt_td60 board file
        ARM: shmobile: armadillo800eva legacy: Use rmobile_add_devices_to_domains()
        ARM: shmobile: r8a7740: Clean up pm domain table
        ARM: shmobile: r8a7740: Use rmobile_add_devices_to_domains()
        ARM: shmobile: sh7372: Make domain_devices[] static __initdata
        ARM: shmobile: mackerel: Make domain_devices[] static __initdata
        clocksource: tcb_clksrc: sanitize IRQ request
        ARM: at91/tclib: mask interruptions at shutdown and probe
        ARM: at91/tclib: move initialization from alloc to probe
        ARM: at91/tclib: prefer using of devm_* functions
        ARM: clps711x: Switch CLPS711X subarch to use clk and clocksource driver
        ARM: shmobile: r8a7791 is now called "R-Car M2-W"
    • Linus Torvalds's avatar
      Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4a4743e8
      Linus Torvalds authored
      Pull ARM SoC non-critical bug fixes from Arnd Bergmann:
       "These are bug fixes for harmless problems that were not important
        enough to get fixed in 3.17.  The majority of these are OMAP specific,
        but there are also a couple for Marvell mvebu, cns3xxx, and others, as
        well as some updates for the MAINTAINERS file.
        In particular, Robert Jarzmik and Daniel Mack now volunteered to help
        out maintaining the PXA platform, Krzysztof Halasa took over the
        cns3xxx platform, Carlo Caione is the maintainer for the new Amlogic
        meson platform, and Matthias Brugger is now listed for the mediatek
        platform he recently contributed"
      * tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (42 commits)
        MAINTAINERS: update Shawn's email address
        MAINTAINERS: condense some Tegra related entries
        MAINTAINERS: add Alexandre Courbot for Tegra
        MAINTAINERS: CNS3xxx and IXP4xx update.
        MAINTAINERS: Add maintainers entry for Mediatek SoCs
        arm, vt8500, LLVMLlinux: Use mcr instead of mcr% for mach-vt8500
        MAINTAINERS: add a third maintainer to mach-bcm
        CNS3xxx: Fix PCIe read size limit.
        CNS3xxx: Fix logical PCIe topology.
        CNS3xxx: Fix debug UART.
        MAINTAINERS: Add entry for the Amlogic MesonX SoCs
        MAINTAINERS: update ARM pxa maintainers
        ARM: at91/PMC: don't forget to write PMC_PCDR register to disable clocks
        ARM: at91: fix at91sam9263ek DT mmc pinmuxing settings
        ARM: mvebu: Netgear RN102: Use Hardware BCH ECC
        ARM: Kirkwood: Fix DT based DSA.
        ARM: OMAP2+: make of_device_ids const
        ARM: omap2: make arrays containing machine compatible strings const
        ARM: LPC32xx: Fix reset function
        ARM: mvebu: Netgear RN2120: Use Hardware BCH ECC
    • Shawn Guo's avatar
      MAINTAINERS: update Shawn's email address · 5df27823
      Shawn Guo authored
      My Freescale email address will be gone shortly.  Update my email to be
      the Linaro one.
      Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    • Stephen Warren's avatar
      MAINTAINERS: condense some Tegra related entries · 356d4142
      Stephen Warren authored
      There's little point having specific entries in MAINTAINERS for Tegra
      drivers that are already covered by the top-level Tegra architecture
      support entry, and maintained by people listed there. Remove the
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Acked-by: default avatarThierry Reding <treding@nvidia.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    • Stephen Warren's avatar
      MAINTAINERS: add Alexandre Courbot for Tegra · 554077c5
      Stephen Warren authored
      I'd like to propose Alexandre Courbot as an additional Tegra maintainer.
      He's been working on a variety of Tegra-related code for a while, and
      is now officially tasked with working on upstream support.
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Acked-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
      Acked-by: default avatarThierry Reding <treding@nvidia.com>
      * Use Alexandre's full name.
      * Use a non-NVIDIA email address to avoid Exchange Server patch corruption.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    • Arnd Bergmann's avatar
      Merge tag 'meson-wdt-dt-3.18' of https://github.com/carlocaione/linux-meson into next/dt · ee48874d
      Arnd Bergmann authored
      Merge "Meson6 WDT support" from Carlo Caione:
      This patch adds the support for the Meson6 watchdog in the DTSI
      * tag 'meson-wdt-dt-3.18' of https://github.com/carlocaione/linux-meson
        ARM: DTS: meson: update DTSI to add watchdog node
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    • Linus Torvalds's avatar
      Merge tag 'f2fs-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · da01e614
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "This patch-set introduces a couple of new features such as large
        sector size, FITRIM, and atomic/volatile writes.
        Several patches enhance power-off recovery and checkpoint routines.
        The fsck.f2fs starts to support fixing corrupted partitions with
        recovery hints provided by this patch-set.
         - retain some recovery information for fsck.f2fs
         - enhance checkpoint speed
         - enhance flush command management
         - bug fix for lseek
         - tune in-place-update policies
         - enhance roll-forward speed
         - revisit all the roll-forward and fsync rules
         - support larget sector size
         - support FITRIM
         - support atomic and volatile writes
        And several clean-ups and bug fixes are included"
      * tag 'f2fs-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (42 commits)
        f2fs: support volatile operations for transient data
        f2fs: support atomic writes
        f2fs: remove unused return value
        f2fs: clean up f2fs_ioctl functions
        f2fs: potential shift wrapping buf in f2fs_trim_fs()
        f2fs: call f2fs_unlock_op after error was handled
        f2fs: check the use of macros on block counts and addresses
        f2fs: refactor flush_nat_entries to remove costly reorganizing ops
        f2fs: introduce FITRIM in f2fs_ioctl
        f2fs: introduce cp_control structure
        f2fs: use more free segments until SSR is activated
        f2fs: change the ipu_policy option to enable combinations
        f2fs: fix to search whole dirty segmap when get_victim
        f2fs: fix to clean previous mount option when remount_fs
        f2fs: skip punching hole in special condition
        f2fs: support large sector size
        f2fs: fix to truncate blocks past EOF in ->setattr
        f2fs: update i_size when __allocate_data_block
        f2fs: use MAX_BIO_BLOCKS(sbi)
        f2fs: remove redundant operation during roll-forward recovery
    • Linus Torvalds's avatar
      Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux · 6dea0737
      Linus Torvalds authored
      Pull nfsd updates from Bruce Fields:
         - support the NFSv4.2 SEEK operation (allowing clients to support
           SEEK_HOLE/SEEK_DATA), thanks to Anna.
         - end the grace period early in a number of cases, mitigating a
           long-standing annoyance, thanks to Jeff
         - improve SMP scalability, thanks to Trond"
      * 'for-3.18' of git://linux-nfs.org/~bfields/linux: (55 commits)
        nfsd: eliminate "to_delegation" define
        NFSD: Implement SEEK
        NFSD: Add generic v4.2 infrastructure
        svcrdma: advertise the correct max payload
        nfsd: introduce nfsd4_callback_ops
        nfsd: split nfsd4_callback initialization and use
        nfsd: introduce a generic nfsd4_cb
        nfsd: remove nfsd4_callback.cb_op
        nfsd: do not clear rpc_resp in nfsd4_cb_done_sequence
        nfsd: fix nfsd4_cb_recall_done error handling
        nfsd4: clarify how grace period ends
        nfsd4: stop grace_time update at end of grace period
        nfsd: skip subsequent UMH "create" operations after the first one for v4.0 clients
        nfsd: set and test NFSD4_CLIENT_STABLE bit to reduce nfsdcltrack upcalls
        nfsd: serialize nfsdcltrack upcalls for a particular client
        nfsd: pass extra info in env vars to upcalls to allow for early grace period end
        nfsd: add a v4_end_grace file to /proc/fs/nfsd
        lockd: add a /proc/fs/lockd/nlm_end_grace file
        nfsd: reject reclaim request when client has already sent RECLAIM_COMPLETE
        nfsd: remove redundant boot_time parm from grace_done client tracking op
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.18-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 25641c0c
      Linus Torvalds authored
      Pull NFS client updates from Trond Myklebust:
       "Highlights include:
        Stable fixes:
         - fix an NFSv4.1 state renewal regression
         - fix open/lock state recovery error handling
         - fix lock recovery when CREATE_SESSION/SETCLIENTID_CONFIRM fails
         - fix statd when reconnection fails
         - don't wake tasks during connection abort
         - don't start reboot recovery if lease check fails
         - fix duplicate proc entries
        - pNFS block driver fixes and clean ups from Christoph
        - More code cleanups from Anna
        - Improve mmap() writeback performance
        - Replace use of PF_TRANS with a more generic mechanism for avoiding
          deadlocks in nfs_release_page"
      * tag 'nfs-for-3.18-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (66 commits)
        NFSv4.1: Fix an NFSv4.1 state renewal regression
        NFSv4: fix open/lock state recovery error handling
        NFSv4: Fix lock recovery when CREATE_SESSION/SETCLIENTID_CONFIRM fails
        NFS: Fabricate fscache server index key correctly
        SUNRPC: Add missing support for RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT
        NFSv3: Fix missing includes of nfs3_fs.h
        NFS/SUNRPC: Remove other deadlock-avoidance mechanisms in nfs_release_page()
        NFS: avoid waiting at all in nfs_release_page when congested.
        NFS: avoid deadlocks with loop-back mounted NFS filesystems.
        MM: export page_wakeup functions
        SCHED: add some "wait..on_bit...timeout()" interfaces.
        NFS: don't use STABLE writes during writeback.
        NFSv4: use exponential retry on NFS4ERR_DELAY for async requests.
        rpc: Add -EPERM processing for xs_udp_send_request()
        rpc: return sent and err from xs_sendpages()
        lockd: Try to reconnect if statd has moved
        SUNRPC: Don't wake tasks during connection abort
        Fixing lease renewal
        nfs: fix duplicate proc entries
        pnfs/blocklayout: Fix a 64-bit division/remainder issue in bl_map_stripe
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · ef0625b7
      Linus Torvalds authored
      Pull char/misc driver updates from Greg KH:
       "Here's the big set of driver patches for char/misc drivers.  Nothing
        major in here, the shortlog goes into the details.  All have been in
        the linux-next tree for a while with no issues"
      * tag 'char-misc-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (80 commits)
        mei: mei_txe_fw_sts can be static
        mei: fix kernel-doc warnings
        mei: fix KDoc documentation formatting
        mei: drop me_client_presentation_num
        mei: trivial: fix errors in prints in comments
        mei: remove include to pci header from mei module files
        mei: push pci cfg structure me hw
        mei: remove the reference to pdev from mei_device
        mei: move fw_status back to hw ops handlers
        mei: get rid of most of the pci dependencies in mei
        mei: push all standard settings into mei_device_init
        mei: move mei_hbm_hdr function from hbm.h the hbm.c
        mei: kill error message for allocation failure
        mei: nfc: fix style warning
        mei: fix style warning: Missing a blank line after declarations
        mei: pg: fix cat and paste error in comments
        mei: debugfs: add single buffer indicator
        mei: debugfs: adjust print buffer
        mei: add hbm and pg state in devstate debugfs print
        Drivers: hv: vmbus: Enable interrupt driven flow control
    • Linus Torvalds's avatar
      Merge tag 'compress-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 3fc1479c
      Linus Torvalds authored
      Pull compression update from Greg KH:
       "More fun with the LZO compression code.  Here's some patches that
        properly document what the logic is, and fix up all of the previously
        reported issues against the LZO code.
        This has been in linux-next for a while with no issues"
      * tag 'compress-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        lzo: check for length overrun in variable length encoding.
        Revert "lzo: properly check for overruns"
        Documentation: lzo: document part of the encoding
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.18-rc1' of... · bca51651
      Linus Torvalds authored
      Merge tag 'driver-core-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      Pull driver core update from Greg KH:
       "Here's the driver core patches for 3.18-rc1.  Just a few small things,
        and the addition of a new interface to dump firmware "core dumps" to
        userspace through sysfs that the wireless and graphic drivers want to
        All of these have been in linux-next for a while"
      * tag 'driver-core-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        dynamic_debug: change __dynamic_<foo>_dbg return types to void
        driver/base/node: remove unnecessary kfree of node struct from unregister_one_node
        devres: Improve devm_kasprintf()/kvasprintf() support
        Documentation: devres: Add missing devm_kstrdup() managed interface
        Documentation: devres: Add missing IRQ functions
        firmware_class: make sure fw requests contain a name
        driver core: Remove kerneldoc from local function
        attribute_container: fix coding style issues
        attribute_container: fix whitespace errors
        drivers/base: Fix length checks in create_syslog_header()/dev_vprintk_emit()
        device coredump: add new device coredump class
        Documentation/sysfs-rules.txt: Add device attribute error code documentation
    • Linus Torvalds's avatar
      Merge tag 'tty-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 683a52a1
      Linus Torvalds authored
      Pull tty/serial driver updates from Greg KH:
       "Here's the big tty/serial driver patchset for 3.18-rc1.
        Lots of little things in here, some good work from Peter Hurley on the
        tty core, and in lots of drivers.  There are also lots of other driver
        updates in here as well, full details in the changelogs.
        All have been in the linux-next tree for a while"
      * tag 'tty-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (99 commits)
        Revert "serial/core: Initialize the console pm state"
        tty: serial: 8250: use 32bit variable for rpm_tx_active
        tty: serial: msm: Add earlycon support
        serial/core: Initialize the console pm state
        serial: asc: Conditionally use readl_relaxed (COMPILE_TEST)
        serial: of-serial: add PM suspend/resume support
        m68k: AMIGA_BUILTIN_SERIAL should depend on TTY
        asm/uapi: Add definition of TIOC[SG]RS485
        tty/metag_da: Add console_poll module parameter
        serial: 8250_pci: remove rts_n override from Baytrail quirk
        serial: cadence: Add generic earlycon support
        serial: imx: change the wait even to interruptiable
        serial: imx: terminate the RX DMA when the UART is suspending
        serial: imx: fix throttle/unthrottle callbacks for hardware assisted flow control
        serial: 8250: Add Quark X1000 to 8250_pci.c
        tty: omap-serial: pull out calculation from baud_is_mode16
        tty: omap-serial: fix division by zero
        xen_hvc: no reason to write the type key on xenstore
        tty: serial: 8250_core: remove UART_IER_RDI in serial8250_stop_rx()
        tty: serial: 8250_core: use the ->line argument as a hint in serial8250_find_match_or_unused()
    • Linus Torvalds's avatar
      Merge tag 'staging-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · b9af5643
      Linus Torvalds authored
      Pull staging updates from Greg KH:
       "Here is the big staging patch set for 3.18-rc1.
        Once again, we are deleting more code than we added, with something
        like 150000 lines deleted overall.  Some of this is due to drivers
        being added to the networking tree, so the old versions are removed
        here, but even then, the overall difference is quite good.
        Other than driver deletions, lots and lots and lots of minor cleanups
        all over the place.  Full details are in the changelog"
      * tag 'staging-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1481 commits)
        staging: et131x: Remove et131x driver from drivers/staging
        staging: emxx_udc: Use min_t instead of min
        staging: emxx_udc: Fix replace printk(KERN_DEBUG ..) with dev_dbg
        staging: media: Fixed else after return or break warning
        staging: media: omap4iss: Fixed else after return or break warning
        staging: rtl8712: Fixed else not required after return
        staging: rtl8712: Fix missing blank line warning
        staging: rtl8192e: rtl8192e: Remove spaces before the semicolons
        staging: rtl8192e: rtl8192e: Remove unnecessary return statements
        staging: rtl8192e: Remove unneeded void return
        staging: rtl8192e: Fix void function return statements style
        staging: rtl8712: Fix unnecessary parentheses style warning
        staging: rtl8192e: Fix unnecessary space before function pointer arguments
        staging: rtl8192e: Array was made static const char * const
        staging: ft1000: ft1000-usb: Removed unnecessary else statement.
        staging: ft1000: ft1000-usb: Removed unnecessary else statement.
        staging: ft1000: ft1000-usb: Removed unnecessary parentheses.
        staging: ft1000: ft1000-usb: Added new line after declarations.
        staging: vt6655: Fixed C99 // comment errors in wpactl.c
        staging: speakup: Fixed warning <linux/serial.h> instead of <asm/serial.h>
    • Linus Torvalds's avatar
      Merge tag 'usb-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 46331196
      Linus Torvalds authored
      Pull USB updates from Greg KH:
       "Here's the big USB patchset for 3.18-rc1.  Also in here is the PHY
        tree, as it seems to fit well with the USB tree for various reasons...
        Anyway, lots of little changes in here, all over the place, full
        details in the changelog
        All have been in the linux-next tree for a while with no issues"
      * tag 'usb-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (244 commits)
        USB: host: st: fix typo 'CONFIG_USB_EHCI_HCD_ST'
        uas: Reduce number of function arguments for uas_alloc_foo functions
        xhci: Allow xHCI drivers to be built as separate modules
        xhci: Export symbols used by host-controller drivers
        xhci: Check for XHCI_COMP_MODE_QUIRK when disabling D3cold
        xhci: Introduce xhci_init_driver()
        usb: hcd: add generic PHY support
        usb: rename phy to usb_phy in HCD
        usb: gadget: uvc: fix up uvcg_v4l2_get_unmapped_area typo
        USB: host: st: fix ehci/ohci driver selection
        usb: host: ehci-exynos: Remove unnecessary usb-phy support
        usb: core: return -ENOTSUPP for all targeted hosts
        USB: Remove .owner field for driver
        usb: core: log higher level message on malformed LANGID descriptor
        usb: Add LED triggers for USB activity
        usb: Rename usb-common.c
        usb: gadget: Refactor request completion
        usb: gadget: Introduce usb_gadget_giveback_request()
        usb: dwc2/gadget: move phy bus legth initialization
        phy: remove .owner field for drivers using module_platform_driver
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 87d7bcee
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
       - add multibuffer infrastructure (single_task_running scheduler helper,
         OKed by Peter on lkml.
       - add SHA1 multibuffer implementation for AVX2.
       - reenable "by8" AVX CTR optimisation after fixing counter overflow.
       - add APM X-Gene SoC RNG support.
       - SHA256/SHA512 now handles unaligned input correctly.
       - set lz4 decompressed length correctly.
       - fix algif socket buffer allocation failure for 64K page machines.
       - misc fixes
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (47 commits)
        crypto: sha - Handle unaligned input data in generic sha256 and sha512.
        Revert "crypto: aesni - disable "by8" AVX CTR optimization"
        crypto: aesni - remove unused defines in "by8" variant
        crypto: aesni - fix counter overflow handling in "by8" variant
        hwrng: printk replacement
        crypto: qat - Removed unneeded partial state
        crypto: qat - Fix typo in name of tasklet_struct
        crypto: caam - Dynamic allocation of addresses for various memory blocks in CAAM.
        crypto: mcryptd - Fix typos in CRYPTO_MCRYPTD description
        crypto: algif - avoid excessive use of socket buffer in skcipher
        arm64: dts: add random number generator dts node to APM X-Gene platform.
        Documentation: rng: Add X-Gene SoC RNG driver documentation
        hwrng: xgene - add support for APM X-Gene SoC RNG support
        crypto: mv_cesa - Add missing #define
        crypto: testmgr - add test for lz4 and lz4hc
        crypto: lz4,lz4hc - fix decompression
        crypto: qat - Use pci_enable_msix_exact() instead of pci_enable_msix()
        crypto: drbg - fix maximum value checks on 32 bit systems
        crypto: drbg - fix sparse warning for cpu_to_be[32|64]
        crypto: sha-mb - sha1_mb_alg_state can be static
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 0223f9aa
      Linus Torvalds authored
      Pull m68k updates from Geert Uytterhoeven:
        - a fix for an intermittent crash in macsonic and hilkbd, marked for
        - build fixes for uncommon configs.
        Note: "m68k: AMIGA_BUILTIN_SERIAL should depend on TTY" was also
        picked up by GregKH for his TTY/Serial patches tree"
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Reformat arch/m68k/mm/hwtest.c
        m68k: Disable/restore interrupts in hwreg_present()/hwreg_write()
        m68k: AMIGA_BUILTIN_SERIAL should depend on TTY
        m68k: Add missing ioport_unmap()
        m68k/atari - stram: Add missing #include <linux/ioport.h>
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20141006' of git://github.com/sctscore/linux-off · 8a9e838f
      Linus Torvalds authored
      Pull S+core updates from Lennox Wu:
       "Three of the patches are for building allmodconfig, and the others are
        for removing useless flags"
      * tag 'for-linus-20141006' of git://github.com/sctscore/linux-off:
        score: Remove GENERIC_HAS_IOMAP
        arch/score/include/asm/Kbuild: Add generic "serial.h"
        score: remove deprecated IRQF_DISABLED
        arch/score/mm/cache.c: Export 'flush_icache_range'
        arch: score: Export necessary symbols in related files
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · f8e4fae2
      Linus Torvalds authored
      Pull arch/tile updates from Chris Metcalf:
       "The only substantive pieces in this batch are some more vDSO support,
        and removing the reference to &platform_bus in tile-srom.c.
        The rest are minor issues reported to me"
      * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        tile: add clock_gettime support to vDSO
        tile: switch to using seqlocks for the vDSO time code
        tile gxio: use better string copy primitive
        char: tile-srom: Add real platform bus parent
        Removed repeated word in comments
        tilegx: Enable ARCH_SUPPORTS_ATOMIC_RMW
        tile: Remove tile-specific _sinitdata and _einitdata
        tile: use ARRAY_SIZE
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 6325e940
      Linus Torvalds authored
      Pull arm64 updates from Catalin Marinas:
       - eBPF JIT compiler for arm64
       - CPU suspend backend for PSCI (firmware interface) with standard idle
         states defined in DT (generic idle driver to be merged via a
         different tree)
       - Support for unmapped cpu-release-addr (outside kernel linear mapping)
       - set_arch_dma_coherent_ops() implemented and bus notifiers removed
       - EFI_STUB improvements when base of DRAM is occupied
       - Typos in KGDB macros
       - Clean-up to (partially) allow kernel building with LLVM
       - Other clean-ups (extern keyword, phys_addr_t usage)
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (51 commits)
        arm64: Remove unneeded extern keyword
        ARM64: make of_device_ids const
        arm64: Use phys_addr_t type for physical address
        aarch64: filter $x from kallsyms
        arm64: Use DMA_ERROR_CODE to denote failed allocation
        arm64: Fix typos in KGDB macros
        arm64: insn: Add return statements after BUG_ON()
        arm64: debug: don't re-enable debug exceptions on return from el1_dbg
        Revert "arm64: dmi: Add SMBIOS/DMI support"
        arm64: Implement set_arch_dma_coherent_ops() to replace bus notifiers
        of: amba: use of_dma_configure for AMBA devices
        arm64: dmi: Add SMBIOS/DMI support
        arm64: Correct ftrace calls to aarch64_insn_gen_branch_imm()
        arm64:mm: initialize max_mapnr using function set_max_mapnr
        setup: Move unmask of async interrupts after possible earlycon setup
        arm64: LLVMLinux: Fix inline arm64 assembly for use with clang
        arm64: pageattr: Correctly adjust unaligned start addresses
        net: bpf: arm64: fix module memory leak when JIT image build fails
        arm64: add PSCI CPU_SUSPEND based cpu_suspend support
        arm64: kernel: introduce cpu_init_idle CPU operation
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 536fd93d
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "Included in these updates are:
         - Performance optimisation to avoid writing the control register at
           every exception.
         - Use static inline instead of extern inline in ftrace code.
         - Crypto ARM assembly updates for big endian
         - Alignment of initrd/.init memory to page sizes when freeing to
           ensure that we fully free the regions
         - Add gcov support
         - A couple of preparatory patches for VDSO support: use
           _install_special_mapping, and randomize the sigpage placement above
         - Add L2 ePAPR DT cache properties so that DT can specify the cache
         - Preparatory patch for FIQ (NMI) kernel C code for things like
           spinlock lockup debug.  Following on from this are a couple of my
           patches cleaning up show_regs() and removing an unused (probably
           since 1.x days) do_unexp_fiq() function.
         - Use pr_warn() rather than pr_warning().
         - A number of cleanups (smp, footbridge, return_address)"
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (21 commits)
        ARM: 8167/1: extend the reserved memory for initrd to be page aligned
        ARM: 8168/1: extend __init_end to a page align address
        ARM: 8169/1: l2c: parse cache properties from ePAPR definitions
        ARM: 8160/1: drop warning about return_address not using unwind tables
        ARM: 8161/1: footbridge: select machine dir based on ARCH_FOOTBRIDGE
        ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
        ARM: 8155/1: place sigpage at a random offset above stack
        ARM: 8154/1: use _install_special_mapping for sigpage
        ARM: 8153/1: Enable gcov support on the ARM architecture
        ARM: Avoid writing to control register on every exception
        ARM: 8152/1: Convert pr_warning to pr_warn
        ARM: remove unused do_unexp_fiq() function
        ARM: remove extraneous newline in show_regs()
        ARM: 8150/3: fiq: Replace default FIQ handler
        ARM: 8140/1: ep93xx: Enable DEBUG_LL_UART_PL01X
        ARM: 8139/1: versatile: Enable DEBUG_LL_UART_PL01X
        ARM: 8138/1: drop ISAR0 workaround for B15
        ARM: 8136/1: sa1100: add Micro ASIC platform device
        ARM: 8131/1: arm/smp: Absorb boot_secondary()
        ARM: 8126/1: crypto: enable NEON SHA-384/SHA-512 for big endian
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · e4e65676
      Linus Torvalds authored
      Pull KVM updates from Paolo Bonzini:
       "Fixes and features for 3.18.
        Apart from the usual cleanups, here is the summary of new features:
         - s390 moves closer towards host large page support
         - PowerPC has improved support for debugging (both inside the guest
           and via gdbstub) and support for e6500 processors
         - ARM/ARM64 support read-only memory (which is necessary to put
           firmware in emulated NOR flash)
         - x86 has the usual emulator fixes and nested virtualization
           improvements (including improved Windows support on Intel and
           Jailhouse hypervisor support on AMD), adaptive PLE which helps
           overcommitting of huge guests.  Also included are some patches that
           make KVM more friendly to memory hot-unplug, and fixes for rare
           caching bugs.
        Two patches have trivial mm/ parts that were acked by Rik and Andrew.
        Note: I will soon switch to a subkey for signing purposes"
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (157 commits)
        kvm: do not handle APIC access page if in-kernel irqchip is not in use
        KVM: s390: count vcpu wakeups in stat.halt_wakeup
        KVM: s390/facilities: allow TOD-CLOCK steering facility bit
        KVM: PPC: BOOK3S: HV: CMA: Reserve cma region only in hypervisor mode
        arm/arm64: KVM: Report correct FSC for unsupported fault types
        arm/arm64: KVM: Fix VTTBR_BADDR_MASK and pgd alloc
        kvm: Fix kvm_get_page_retry_io __gup retval check
        arm/arm64: KVM: Fix set_clear_sgi_pend_reg offset
        kvm: x86: Unpin and remove kvm_arch->apic_access_page
        kvm: vmx: Implement set_apic_access_page_addr
        kvm: x86: Add request bit to reload APIC access page address
        kvm: Add arch specific mmu notifier for page invalidation
        kvm: Rename make_all_cpus_request() to kvm_make_all_cpus_request() and make it non-static
        kvm: Fix page ageing bugs
        kvm/x86/mmu: Pass gfn and level to rmapp callback.
        x86: kvm: use alternatives for VMCALL vs. VMMCALL if kernel text is read-only
        kvm: x86: use macros to compute bank MSRs
        KVM: x86: Remove debug assertion of non-PAE reserved bits
        kvm: don't take vcpu mutex for obviously invalid vcpu ioctls
        kvm: Faults which trigger IO release the mmap_sem
    • Linus Torvalds's avatar
      Fix up missing dmaengine header inclusion from qce crypto engine · f89f4a06
      Linus Torvalds authored
      Commit 7bced397
       ("net_dma: simple removal") removed the long-dead
      net_dma code, but unintentionally broke the build for the qualcomm
      crypto engine (qce) that had accidentally depended on the inclusion of
      <linux/dmaengine.h> through the networking header files that used to
      have it.
      Add the required dmaengine.h include explicitly to fix the breakage.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
  2. 07 Oct, 2014 15 commits
    • Linus Torvalds's avatar
      Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 9a50aaef
      Linus Torvalds authored
      Pull SCSI updates from James Bottomley:
       "This patch set consists of the usual driver updates (megaraid_sas,
        arcmsr, be2iscsi, lpfc, mpt2sas, mpt3sas, qla2xxx, ufs) plus several
        assorted fixes and miscellaneous updates (including the
        pci_msix_enable_range() changes that have been pending for a while)"
      * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (202 commits)
        scsi: add a CONFIG_SCSI_MQ_DEFAULT option
        ufs: definitions for phy interface
        ufs: tune bkops while power managment events
        ufs: Add support for clock scaling using devfreq framework
        ufs: Add freq-table-hz property for UFS device
        ufs: Add support for clock gating
        ufs: refactor configuring power mode
        ufs: add UFS power management support
        ufs: introduce well known logical unit in ufs
        ufs: manually add well known logical units
        ufs: Active Power Mode - configuring bActiveICCLevel
        ufs: improve init sequence
        ufs: refactor query descriptor API support
        ufs: add voting support for host controller power
        ufs: Add clock initialization support
        ufs: Add regulator enable support
        ufs: Allow vendor specific initialization
        scsi: don't add scsi_device if its already visible
        scsi: fix the type for well known LUs
        scsi: fix comment in struct Scsi_Host definition
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 1e345ac6
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "A few new haptic/button drivers, a rudimentary support for laptops
        using FocalTech touchpads; xpad driver will bind to more devices, and
        a few other driver fixes."
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: soc_button_array - convert to platform bus
        Input: palmas-pwrbutton - fix typo in the license string
        Input: palmas-pwrbutton - use IRQF_ONESHOT
        Input: psmouse - add support for detecting FocalTech PS/2 touchpads
        Input: psmouse - add psmouse_matches_pnp_id helper function
        Input: joystick - use ktime for measuring timing
        Input: add haptic driver on max77693
        Input: introduce palmas-pwrbutton
        Input: add support for the DRV2667 haptic driver
        Input: xpad - sync device IDs with xboxdrv
        Input: xpad - add VID/PID for Razer Sabertooth
        Input: cros_ec_keyb - optimize ghosting algorithm
        Input: drv260x - fix binding document
        Input: drv260x - add check for ERM mode and LRA Libraries
        Input: drv260x - remove unused defines
        Input: drv260x - add TI drv260x haptics driver
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 39520eea
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       - quirk for devices that need to be pulled in much more aggresive way
         than mandated, by Johan Hovold
       - robustification of sanity checking of incoming reports in RMI driver,
         by Benjamin Tissoires
       - fixes, updates, and new HW support to SONY driver, by Frank Praznik
       - port of uHID to the new transport layer layout, by David Herrmann
       - robustification of Clear-Halt/reset in USB HID, by Alan Stern
       - native support for hopefully any future HID compliant wacom tablet.
         Those found on the various laptops (ISDv4/5) already are HID
         compliant and they should work in the future without any modification
         of the kernel.  Written by Benjamin Tissoires.
       - a lot more simple fixes and device ID additions all over the place
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (45 commits)
        HID: uHID: fix excepted report type
        HID: usbhid: add another mouse that needs QUIRK_ALWAYS_POLL
        HID: wacom: implement the finger part of the HID generic handling
        HID: wacom: implement generic HID handling for pen generic devices
        HID: wacom: move allocation of inputs earlier
        HID: wacom: split out input allocation and registration
        HID: wacom: rename failN with some meaningful information
        HID: sony: Update the DualShock 4 touchpad resolution
        HID: wacom: fix timeout on probe for some wacoms
        HID: sony: Set touchpad bits in the input_configured callback
        HID: sony: Update file header and correct comments
        HID: sony: Corrections for the DualShock 4 HID descriptor
        HID: rmi: check sanity of the incoming report
        HID: wacom: make the WL connection friendly for the desktop
        HID: wacom - enable LED support for Wireless Intuos5/Pro
        HID: wacom - remove report_id from wacom_get_report interface
        HID: wacom - Clean up of sysfs
        HID: wacom - Add default permission defines for sysfs attributes
        HID: usbhid: fix PIXART optical mouse
        HID: Add Holtek USB ID 04d9:a0c2 ETEKCITY Scroll
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 28596c97
      Linus Torvalds authored
      Pull "trivial tree" updates from Jiri Kosina:
       "Usual pile from trivial tree everyone is so eagerly waiting for"
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
        Remove MN10300_PROC_MN2WS0038
        mei: fix comments
        treewide: Fix typos in Kconfig
        kprobes: update jprobe_example.c for do_fork() change
        Documentation: change "&" to "and" in Documentation/applying-patches.txt
        Documentation: remove obsolete pcmcia-cs from Changes
        Documentation: update links in Changes
        Documentation: Docbook: Fix generated DocBook/kernel-api.xml
        score: Remove GENERIC_HAS_IOMAP
        gpio: fix 'CONFIG_GPIO_IRQCHIP' comments
        tty: doc: Fix grammar in serial/tty
        dma-debug: modify check_for_stack output
        treewide: fix errors in printk
        genirq: fix reference in devm_request_threaded_irq comment
        treewide: fix synchronize_rcu() in comments
        checkstack.pl: port to AArch64
        doc: queue-sysfs: minor fixes
        init/do_mounts: better syntax description
        MIPS: fix comment spelling
        powerpc/simpleboot: fix comment
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc · b6420ebd
      Linus Torvalds authored
      Pull documentation updates from Jiri Kosina:
       "Updates to kernel documentation.
        I took this over (hopefully temporarily) from Randy who was not
        willing to maintain it any longer.  This pile mostly is a relay of
        queue that Randy already had in his tree"
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc:
        Documentation: fix broken v4l-utils URL
        Documentation: update include path for mpssd
        Documentation: correct parameter error for dma_mapping_error
        MAINTAINERS: update location of linux-doc tree
        Documentation: remove networking/.gitignore
        tools: add more endian.h macros
        Make Documenation depend on headers_install
        Docs: this_cpu_ops: remove redundant add forms
        Documentation: disable vdso_test to avoid breakage with old glibc
        Documentation: update vDSO makefile to build portable examples
        Documentation: update .gitignore files
        Documentation: support glibc versions without htole macros
        v4l2-pci-skeleton: Only build if PCI is available
        Documentation: fix misc. warnings
        Documentation: make functions static to avoid prototype warnings
        Documentation: add makefiles for more targets
        Documentation: use subdir-y to avoid unnecessary built-in.o files
    • Linus Torvalds's avatar
      Merge tag 'spi-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · d2901069
      Linus Torvalds authored
      Pull spi updates from Mark Brown:
       "A quiet release for SPI, mainly driver updates and not too many of
         - Support for dummy transfers (for delays on startup) in drivers
           using transfer_one().
         - Lots of enhancements to the Designware driver to support new Intel
         - Support for newer Renesas chips.
         - DMA support for the i.MX driver.
         - One new driver for Broadcom BCM53xx chips"
      * tag 'spi-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (64 commits)
        spi: spi-mxs: fix a tiny typo in a comment
        spi: dw-mid: follow new DMAengine workflow
        spi: dw-mid: convert to use DMAengine wrappers
        spi: dw-mid: change magic numbers to the constants
        spi: orion: support armada extended baud rates
        spi: fsl: Sort include headers alphabetically
        spi: bcm53xx: Add missing module information
        spi: bcm53xx: Fix module dependency
        spi/rockchip: fix bug that cause the failure to read data in DMA mode
        spi: fsl-dspi: Remove probe info message
        spi: pl022: Add support for chip select extension
        spi: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
        spi: dw: fix style of code in few places
        spi: dw: introduce support of loopback mode
        spi: dw-mid: terminate ongoing transfers at exit
        spi: dw-mid: respect 8 bit mode
        spi: clps711x: Migrate to the new clk subsystem
        spi: pl022: Add missing error check for devm_kzalloc
        spi: spi-imx: add DMA support
        spi: davinci: add support for adding delay between word's transmissions
    • Linus Torvalds's avatar
      Merge tag 'regulator-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 81e29b7d
      Linus Torvalds authored
      Pull regulator updates from Mark Brown:
       "This time around most of the changes are a lot of new drivers along
        with the standard set of fixes and cleanups (thanks again largely to
        Axel Lin).  We do have one nice new feature in the core which factors
        out the disappointingly tricky code around DT parsing, only a couple
        of drivers have been converted so far:
         - Factor out the code for parsing the standard bindings for a set of
           regulators out of DT, making the probe part of a lot of drivers
         - New drivers for Dialog DA9213, HiSilicon HI6420, Intersil
           ISL9305/H, Ricoh RN5T618, Rockchip RK808, Skyworks SKY81452,
           Silergy SYR82x, and Qualcomm RPM"
      * tag 'regulator-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (71 commits)
        regulator: da9211: Fix a bug in update of mask bit
        regulator: pwm-regulator: add devicetree bindings for pwm regulator
        regulator: pwm-regulator: get voltage and duty table from dts
        regulator: qcom_rpm: Fix FORCE_MODE_IS_2_BITS macro
        regulator: qcom_rpm: Don't explicitly initialise the first field of config
        regulator: ltc3589: fix broken voltage transitions
        regulator: qcom-rpm: Regulator driver for the Qualcomm RPM
        regulator: axp20x: Use parent device as regulator configuration device
        regulator: fan53555: Fix null pointer dereference
        regulator: fan53555: Fixup report wrong vendor message
        regulator: fan53555: fix wrong cast in probe
        regulator: fan53555: add support for Silergy SYR82x regulators
        regulator: fan53555: add devicetree support
        regulator: add devicetree bindings for Fairchild FAN53555 regulators
        regulator: rk808: Add function for ramp delay for buck1/buck2
        regulator: fan53555: use set_ramp_delay to set the ramp up slew rate
        regulator: fan53555: enable vin supply
        regulator: rk808: Fix missing of_node_put
        regulator: rk808: Remove unused variables
        regulator: of: Add stub OF match function for !OF case
    • Linus Torvalds's avatar
      Merge tag 'regmap-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · c831dd73
      Linus Torvalds authored
      Pull regmap updates from Mark Brown:
       "The main update this time around is the addition of a standard DT
        binding for specifying the endianness of devices.  This allows drivers
        to support any endianness of device register map without any code,
        useful for configurable IP blocks.
        There's also a few bug fixes that I didn't get round to sending, none
        of them terribly severe or new, and a reduction in size for struct
      * tag 'regmap-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: Fix debugfs-file 'registers' mode
        regmap: fix possible ZERO_SIZE_PTR pointer dereferencing error.
        regmap: debugfs: fix possbile NULL pointer dereference
        regmap: fix NULL pointer dereference in _regmap_write/read
        regmap: fix NULL pointer dereference in regmap_get_val_endian
        regmap: cache: Do not fail silently from regcache_sync calls
        regmap: change struct regmap's internal locks as union
        regmap: Split regmap_get_endian() in two functions
        regmap: of_regmap_get_endian() cleanup
        regmap: Fix DT endianess parsing logic
        regmap: Add explicit dependencies to catch "select" misuse
        regmap: Restore L: linux-kernel@vger.kernel.org entry
        regmap: Add the DT binding documentation for endianness
        regmap: add DT endianness binding support.
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 2b425a3f
      Linus Torvalds authored
      Pull pin control changes from Linus Walleij:
       "This is the bulk of pin control changes for the v3.18 development
         - New drivers for the Freescale i.MX21, Qualcomm APQ8084 pin
         - Incremental new features on the Rockchip, atlas 6, OMAP, AM437x,
           APQ8064, prima2, AT91, Tegra, i.MX, Berlin and Nomadik.
         - Push Freescale drivers down into their own subdirectory.
         - Assorted sprays of syntax and semantic fixes"
      * tag 'pinctrl-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (48 commits)
        pinctrl: specify bindings for pins and groups
        pinctrl: nomadik: improve GPIO debug prints
        pinctrl: abx500: refactor DT parser to take two paths
        pinctrl: abx500: use helpers for map allocation/free
        pinctrl: alter device tree bindings for functions
        pinctrl: nomadik: refactor DT parser to take two paths
        pinctrl: nomadik: use utils map free function
        pinctrl: nomadik: use util function to reserve maps
        pinctrl: qcom: use restart_notifier mechanism for ps_hold
        pinctrl: sh-pfc: sh73a0: Remove unnecessary SoC data allocation
        pinctrl: berlin: fix the dt_free_map function
        pinctrl: at91: disable PD or PU before enabling PU or PD
        pinctrl: st: remove gpiochip in failure cases
        pinctrl: at91: Fix error handling while doing gpiochio_irqchip_add
        pinctrl: at91: Fix failure path in at91_gpio_probe path
        pinctrl: lantiq: Release gpiochip resources in fail case
        pinctrl: imx: detect uninitialized pins
        pinctrl: tegra: Add MIPI pad control
        pinctrl: at91: Switch to using managed clk_get
        pinctrl: adi2: Remove duplicate gpiochip_remove_pin_ranges
    • Linus Torvalds's avatar
      Merge tag 'edac_for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · c91662cb
      Linus Torvalds authored
      Pull EDAC fixes from Borislav Petkov:
       "Misc small fixes/improvements accumulated from the summer months,
        nothing earth-shattering.
        The mpc85xx_edac fix is tagged for stable but since it got confirmed
        only days before the final 3.17 release, I didn't rush a last minute
        pull request to you.  I hope that's ok as it will trickle down to
        stable anyway and we'll make sure it lands in 3.17-stable too"
      * tag 'edac_for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        mpc85xx_edac: Make L2 interrupt shared too
        amd64_edac: Modify usage of amd64_read_dct_pci_cfg()
        ppc4xx_edac: Fix build error caused by wrong member access
        EDAC: Fix mem_types strings type
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine · d0cd8481
      Linus Torvalds authored
      Pull dmaengine updates from Dan Williams:
       "Even though this has fixes marked for -stable, given the size and the
        needed conflict resolutions this is 3.18-rc1/merge-window material.
        These patches have been languishing in my tree for a long while.  The
        fact that I do not have the time to do proper/prompt maintenance of
        this tree is a primary factor in the decision to step down as
        dmaengine maintainer.  That and the fact that the bulk of drivers/dma/
        activity is going through Vinod these days.
        The net_dma removal has not been in -next.  It has developed simple
        conflicts against mainline and net-next (for-3.18).
        Continuing thanks to Vinod for staying on top of drivers/dma/.
         1/ Step down as dmaengine maintainer see commit 08223d80
            "dmaengine maintainer update"
         2/ Removal of net_dma, as it has been marked 'broken' since 3.13
            (commit 77873803 "net_dma: mark broken"), without reports of
            performance regression.
         3/ Miscellaneous fixes"
      * tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
        net: make tcp_cleanup_rbuf private
        net_dma: revert 'copied_early'
        net_dma: simple removal
        dmaengine maintainer update
        dmatest: prevent memory leakage on error path in thread
        ioat: Use time_before_jiffies()
        dmaengine: fix xor sources continuation
        dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup()
        dma: mv_xor: Remove all callers of mv_xor_slot_cleanup()
        dma: mv_xor: Remove unneeded mv_xor_clean_completed_slots() call
        ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()
        drivers: dma: Include appropriate header file in dca.c
        drivers: dma: Mark functions as static in dma_v3.c
        dma: mv_xor: Add DMA API error checks
        ioat/dca: Use dev_is_pci() to check whether it is pci device
    • Linus Torvalds's avatar
      Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · bdf428fe
      Linus Torvalds authored
      Pull module update from Rusty Russell:
       "Nothing major: support for compressing modules, and auto-tainting
        PS. My virtio-next tree is empty: DaveM took the patches I had.  There
            might be a virtio-rng starvation fix, but so far it's a bit voodoo
            so I will get to that in the next two days or it will wait"
      * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        moduleparam: Resolve missing-field-initializer warning
        kbuild: handle module compression while running 'make modules_install'.
        modinst: wrap long lines in order to enhance cmd_modules_install
        modsign: lookup lines ending in .ko in .mod files
        modpost: simplify file name generation of *.mod.c files
        modpost: reduce visibility of symbols and constify r/o arrays
        param: check for tainting before calling set op.
        drm/i915: taint the kernel if unsafe module parameters are set
        module: add module_param_unsafe and module_param_named_unsafe
        module: make it possible to have unsafe, tainting module params
        module: rename KERNEL_PARAM_FL_NOARG to avoid confusion
    • James Bottomley's avatar
    • Jaegeuk Kim's avatar
      f2fs: support volatile operations for transient data · 02a1335f
      Jaegeuk Kim authored
      This patch adds support for volatile writes which keep data pages in memory
      until f2fs_evict_inode is called by iput.
      For instance, we can use this feature for the sqlite database as follows.
      While supporting atomic writes for main database file, we can keep its journal
      data temporarily in the page cache by the following sequence.
      1. open
      2. writes
       : keep all the data in the page cache.
      3. flush to the database file with atomic writes
        a. ioctl(F2FS_IOC_START_ATOMIC_WRITE);
        b. writes
        c. ioctl(F2FS_IOC_COMMIT_ATOMIC_WRITE);
      4. close
       -> drop the cached data
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
    • Linus Torvalds's avatar
      Merge branch 'ipmi' (patches from Corey Minyard) · a40a7201
      Linus Torvalds authored
      Merge ipmi patches from Corey Minyard:
       "These have been in linux-next for a while, ready for 3.18"
      * emailed patches from Corey Minyard <minyard@acm.org>:
        ipmi: Clear drvdata when interface is removed
        ipmi: work around gcc-4.9 build warning
        ipmi/of: Don't use unavailable interfaces
        ipmi: Clean up the error handling for channel config errors