1. 03 Jun, 2014 5 commits
    • Linus Torvalds's avatar
      Merge tag 'tty-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty into next · 49eb7b07
      Linus Torvalds authored
      Pull tty/serial driver updates from Greg KH:
       "Here is the big tty / serial driver pull request for 3.16-rc1.
      
        A variety of different serial driver fixes and updates and additions,
        nothing huge, and no real major core tty changes at all.
      
        All have been in linux-next for a while"
      
      * tag 'tty-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (84 commits)
        Revert "serial: imx: remove the DMA wait queue"
        serial: kgdb_nmi: Improve console integration with KDB I/O
        serial: kgdb_nmi: Switch from tasklets to real timers
        serial: kgdb_nmi: Use container_of() to locate private data
        serial: cpm_uart: No LF conversion in put_poll_char()
        serial: sirf: Fix compilation failure
        console: Remove superfluous readonly check
        console: Use explicit pointer type for vc_uni_pagedir* fields
        vgacon: Fix & cleanup refcounting
        ARM: tty: Move HVC DCC assembly to arch/arm
        tty/hvc/hvc_console: Fix wakeup of HVC thread on hvc_kick()
        drivers/tty/n_hdlc.c: replace kmalloc/memset by kzalloc
        vt: emulate 8- and 24-bit colour codes.
        printk/of_serial: fix serial console cessation part way through boot.
        serial: 8250_dma: check the result of TX buffer mapping
        serial: uart: add hw flow control support configuration
        tty/serial: at91: add interrupts for modem control lines
        tty/serial: at91: use mctrl_gpio helpers
        tty/serial: Add GPIOLIB helpers for controlling modem lines
        ARM: at91: gpio: implement get_direction
        ...
      49eb7b07
    • Linus Torvalds's avatar
      Merge tag 'staging-3.16-rc1' of... · 5142c33e
      Linus Torvalds authored
      Merge tag 'staging-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging into next
      
      Pull staging driver updates from Greg KH:
       "Here is the big staging driver pull request for 3.16-rc1.
      
        Lots of stuff here, tons of cleanup patches, a few new drivers, and
        some removed as well, but I think we are still adding a few thousand
        more lines than we remove, due to the new drivers being bigger than
        the ones deleted.
      
        One notible bit of work did stand out, Jes Sorensen has gone on a
        tear, fixing up a wireless driver to be "more sane" than it originally
        was from the vendor, with over 500 patches merged here.  Good stuff,
        and a number of users laptops are better off for it.
      
        All of this has been in linux-next for a while"
      
      * tag 'staging-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1703 commits)
        staging: skein: fix sparse warning for static declarations
        staging/mt29f_spinand: coding style fixes
        staging: silicom: fix sparse warning for static variable
        staging: lustre: Fix coding style
        staging: android: binder.c: Use more appropriate functions for euid retrieval
        staging: lustre: fix integer as NULL pointer warnings
        Revert "staging: dgap: remove unneeded kfree() in dgap_tty_register_ports()"
        Staging: rtl8192u: r8192U_wx.c Fixed a misplaced brace
        staging: ion: shrink highmem pages on kswapd
        staging: ion: use compound pages on high order pages for system heap
        staging: ion: remove struct ion_page_pool_item
        staging: ion: simplify ion_page_pool_total()
        staging: ion: tidy up a bit
        staging: rtl8723au: Remove redundant casting in usb_ops_linux.c
        staging: rtl8723au: Remove redundant casting in rtl8723a_hal_init.c
        staging: rtl8723au: Remove redundant casting in rtw_xmit.c
        staging: rtl8723au: Remove redundant casting in rtw_wlan_util.c
        staging: rtl8723au: Remove redundant casting in rtw_sta_mgt.c
        staging: rtl8723au: Remove redundant casting in rtw_recv.c
        staging: rtl8723au: Remove redundant casting in rtw_mlme.c
        ...
      5142c33e
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.16-rc1' of... · 5da77761
      Linus Torvalds authored
      Merge tag 'driver-core-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core into next
      
      Pull driver core / kernfs changes from Greg KH:
       "Here is the "big" pull request for 3.16-rc1.
      
        Not a lot of changes here, some kernfs work, a revert of a very old
        driver core change that ended up cauing some memory leaks on driver
        probe error paths, and other minor things.
      
        As was pointed out earlier today, one commit here, 26fc9cd2
        ("kernfs: move the last knowledge of sysfs out from kernfs") is also
        needed in your 3.15-final branch as well.  If you could cherry-pick it
        there, it would be most appreciated by Andy Lutomirski to prevent a
        regression there.
      
        All of these have been in linux-next for a while"
      
      * tag 'driver-core-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        crypto/nx/nx-842: dev_set_drvdata can no longer fail
        kernfs: move the last knowledge of sysfs out from kernfs
        sysfs: fix attribute_group bin file path on removal
        sysfs.h: don't return a void-valued expression in sysfs_remove_file
        init.h: Update initcall_sync variants to fix build errors
        driver core: Inline dev_set/get_drvdata
        driver core: dev_get_drvdata: Don't check for NULL dev
        driver core: dev_set_drvdata returns void
        driver core: dev_set_drvdata can no longer fail
        driver core: Move driver_data back to struct device
        lib/devres.c: fix checkpatch warnings
        lib/devres.c: use dev in devm_request_and_ioremap
        kobject: Make support for uevent_helper optional.
        kernfs: make kernfs_notify() trigger inotify events too
        kernfs: implement kernfs_root->supers list
      5da77761
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.16-rc1' of... · 4046136a
      Linus Torvalds authored
      Merge tag 'char-misc-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc into next
      
      Pull char/misc driver patches from Greg KH:
       "Here is the big char / misc driver update for 3.16-rc1.
      
        Lots of different driver updates for a variety of different drivers
        and minor driver subsystems.
      
        All have been in linux-next with no reported issues"
      
      * tag 'char-misc-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (79 commits)
        hv: use correct order when freeing monitor_pages
        spmi: of: fixup generic SPMI devicetree binding example
        applicom: dereferencing NULL on error path
        misc: genwqe: fix uninitialized return value in genwqe_free_sync_sgl()
        miscdevice.h: Simple syntax fix to make pointers consistent.
        MAINTAINERS: Add miscdevice.h to file list for char/misc drivers.
        mcb: Add support for shared PCI IRQs
        drivers: Remove duplicate conditionally included subdirs
        misc: atmel_pwm: only build for supported platforms
        mei: me: move probe quirk to cfg structure
        mei: add per device configuration
        mei: me: read H_CSR after asserting reset
        mei: me: drop harmful wait optimization
        mei: me: fix hw ready reset flow
        mei: fix memory leak of mei_clients array
        uio: fix vma io range check in mmap
        drivers: uio_dmem_genirq: Fix memory leak in uio_dmem_genirq_probe()
        w1: do not unlock unheld list_mutex in __w1_remove_master_device()
        w1: optional bundling of netlink kernel replies
        connector: allow multiple messages to be sent in one packet
        ...
      4046136a
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu into next · b55a0ff8
      Linus Torvalds authored
      Pull m68knommu updates from Greg Ungerer:
       "Nothing too big, just a handfull of small changes.
      
        A couple of dragonball fixes, coldfire qspi cleanup and fixes, and
        some coldfire gpio cleanup, fixes and extensions"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68knommu: Implement gpio support for m54xx.
        m68knommu: Make everything thats not exported, static.
        m68knommu: setting the gpio data direction register to output doesn't dependent upon the value to output!
        m68knommu: add to_irq function so we can map gpios to external interrupts.
        m68knommu: qspi declutter.
        m68knommu: Fix the 5249/525x qspi base address.
        m68knommu: Add qspi clk for Coldfire SoCs without real clks.
        m68k: fix a compiler warning when building for DragonBall
        m68knommu: Fix mach_sched_init for EZ and VZ DragonBall chips
      b55a0ff8
  2. 02 Jun, 2014 21 commits
    • Linus Torvalds's avatar
      Merge tag 'drivers-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next · a727eaf6
      Linus Torvalds authored
      Pull ARM SoC driver changes from Olof Johansson:
       "SoC-near driver changes that we're merging through our tree.  Mostly
        because they depend on other changes we have staged, but in some cases
        because the driver maintainers preferred that we did it this way.
      
        This contains a largeish cleanup series of the omap_l3_noc bus driver,
        cpuidle rework for Exynos, some reset driver conversions and a long
        branch of TI EDMA fixes and cleanups, with more to come next release.
      
        The TI EDMA cleanups is a shared branch with the dmaengine tree, with
        a handful of Davinci-specific fixes on top.
      
        After discussion at last year's KS (and some more on the mailing
        lists), we are here adding a drivers/soc directory.  The purpose of
        this is to keep per-vendor shared code that's needed by different
        drivers but that doesn't fit into the MFD (nor drivers/platform)
        model.  We expect to keep merging contents for this hierarchy through
        arm-soc so we can keep an eye on what the vendors keep adding here and
        not making it a free-for-all to shove in crazy stuff"
      
      * tag 'drivers-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (101 commits)
        cpufreq: exynos: Fix driver compilation with ARCH_MULTIPLATFORM
        tty: serial: msm: Remove direct access to GSBI
        power: reset: keystone-reset: introduce keystone reset driver
        Documentation: dt: add bindings for keystone pll control controller
        Documentation: dt: add bindings for keystone reset driver
        soc: qcom: fix of_device_id table
        ARM: EXYNOS: Fix kernel panic when unplugging CPU1 on exynos
        ARM: EXYNOS: Move the driver to drivers/cpuidle directory
        ARM: EXYNOS: Cleanup all unneeded headers from cpuidle.c
        ARM: EXYNOS: Pass the AFTR callback to the platform_data
        ARM: EXYNOS: Move S5P_CHECK_SLEEP into pm.c
        ARM: EXYNOS: Move the power sequence call in the cpu_pm notifier
        ARM: EXYNOS: Move the AFTR state function into pm.c
        ARM: EXYNOS: Encapsulate the AFTR code into a function
        ARM: EXYNOS: Disable cpuidle for exynos5440
        ARM: EXYNOS: Encapsulate boot vector code into a function for cpuidle
        ARM: EXYNOS: Pass wakeup mask parameter to function for cpuidle
        ARM: EXYNOS: Remove ifdef for scu_enable in pm
        ARM: EXYNOS: Move scu_enable in the cpu_pm notifier
        ARM: EXYNOS: Use the cpu_pm notifier for pm
        ...
      a727eaf6
    • Linus Torvalds's avatar
      Merge tag 'dt-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next · 755a9ba7
      Linus Torvalds authored
      Pull ARM SoC devicetree updates from Olof Johansson:
       "As with previous release, this continues to be among the largest
        branches we merge, with lots of new contents.
      
        New things for this release are among other things:
      
         - DTSI contents for the new SoCs supported in 3.16 (see SoC pull request)
         - Qualcomm APQ8064 and APQ8084 SoCs and eval boards
         - Nvidia Jetson TK1 development board (Tegra T124-based)
      
        Two new SoCs that didn't need enough new platform code to stand out
        enough for me to notice when writing the SoC tag, but that adds new DT
        contents are:
      
         - TI DRA72
         - Marvell Berlin 2Q"
      
      * tag 'dt-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (500 commits)
        ARM: dts: add secure firmware support for exynos5420-arndale-octa
        ARM: dts: add pmu sysreg node to exynos3250
        ARM: dts: correct the usb phy node in exynos5800-peach-pi
        ARM: dts: correct the usb phy node in exynos5420-peach-pit
        ARM: dts: add dts files for exynos5410 and exynos5410-smdk5410
        ARM: dts: add dts files for exynos3250 SoC
        ARM: dts: add mfc node for exynos5800
        ARM: dts: add Vbus regulator for USB 3.0 on exynos5800-peach-pi
        ARM: dts: enable fimd for exynos5800-peach-pi
        ARM: dts: enable display controller for exynos5800-peach-pi
        ARM: dts: enable hdmi for exynos5800-peach-pi
        ARM: dts: add dts file for exynos5800-peach-pi board
        ARM: dts: add dts file for exynos5800 SoC
        ARM: dts: add dts file for exynos5260-xyref5260 board
        ARM: dts: add dts files for exynos5260 SoC
        ARM: dts: update watchdog node name in exynos5440
        ARM: dts: use key code macros on Origen and Arndale boards
        ARM: dts: enable RTC and WDT nodes on Origen boards
        ARM: dts: qcom: Add APQ8084-MTP board support
        ARM: dts: qcom: Add APQ8084 SoC support
        ...
      755a9ba7
    • Linus Torvalds's avatar
      Merge tag 'defconfig-for-3.16' of... · 7477838f
      Linus Torvalds authored
      Merge tag 'defconfig-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next
      
      Pull ARM SoC defconfig updates from Olof Johansson:
       "A number of defconfig updates for 3.16.  We have quite a few of these
        as new SoCs and drivers get supported, and we've started collecting
        them in one shared branch.
      
        We started halfway through the merge window so there'll be some small
        conflicts with other branches on nearby changes, but nothing major.
        Next cycle should be smoother"
      
      * tag 'defconfig-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: multi_v7_defconfig: Enable Exynos platform
        ARM: configs: update Allwinner options
        ARM: qcom: Enable GSBI driver in defconfig
        ARM: multi_v7_defconfig: Enable Zynq peripheral drivers
        ARM: at91/defconfig: sama5_defconfig: updated
        ARM: add drivers for Colibri T30 to multi_v7_defconfig
        ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig
        ARM: configs: enable XHCI mvebu support in multi_v7_defconfig
        ARM: multi_v7: Add Allwinner reset drivers to multi_v7_defconfig
        ARM: sunxi: Add A31 reset driver to sunxi_defconfig
        ARM: config: Update msm_defconfig
        ARM: mvebu: enable MSI support in mvebu_v7_defconfig
        ARM: config: Add qcom_defconfig
        ARM: configs: enable XHCI mvebu support in mvebu_v7_defconfig
      7477838f
    • Linus Torvalds's avatar
      Merge tag 'boards-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next · c67d9ce1
      Linus Torvalds authored
      Pull ARM SoC board support updates from Olof Johansson:
       "The bulk of this branch is updates for Renesas Shmobile.  They are
        still doing some enablement for classic boards first, and then come up
        with DT bindings when they've had a chance to learn more about the
        hardware.  Not necessarily a bad way to go about it, and they're
        looking at moving some of the temporary board code resulting from it
        to drivers/staging instead to avoid the churn here.
      
        As a result of the shmobile clock cleanups, we end up merging quite a
        bit of SH code here as well.  We ended up merging it here instead of
        in the cleanup branch due to the other board changes depending on it"
      
      * tag 'boards-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (130 commits)
        ARM: davinci: remove checks for CONFIG_USB_MUSB_PERIPHERAL
        ARM: add drivers for Colibri T30 to multi_v7_defconfig
        ARM: shmobile: Remove Genmai reference DTS
        ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB
        ARM: shmobile: Sync Genmai DTS with Genmai reference DTS
        ARM: shmobile: genmai-reference: Remove legacy clock support
        ARM: shmobile: Remove non-multiplatform Genmai reference support
        ARM: configs: enable XHCI mvebu support in multi_v7_defconfig
        ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP
        ARM: OMAP: AM3517EVM: remove check for CONFIG_PANEL_SHARP_LQ043T1DG01
        ARM: OMAP: SX1: remove check for CONFIG_SX1_OLD_FLASH
        ARM: OMAP: remove some dead code
        ARM: OMAP: omap3stalker: remove two Kconfig macros
        ARM: tegra: tegra_defconfig updates
        ARM: shmobile: r7s72100: use workaround for non DT-clocks
        ARM: shmobile: Add forward declaration of struct clk to silence warning
        ARM: shmobile: r7s72100: remove SPI DT clocks from legacy clock support
        ARM: shmobile: r7s72100: add spi clocks to dtsi
        ARM: shmobile: r7s72100: remove I2C DT clocks from legacy clock support
        ARM: shmobile: r7s72100: add i2c clocks to dtsi
        ...
      c67d9ce1
    • Linus Torvalds's avatar
      Merge tag 'soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next · 825f4e02
      Linus Torvalds authored
      Pull part one of ARM SoC updates from Olof Johansson:
       "A quite large set of SoC updates this cycle.  In no particular order:
      
         - Multi-cluster power management for Samsung Exynos, adding support
           for big.LITTLE CPU switching on EXYNOS5
      
         - SMP support for Marvell Armada 375 and 38x
      
         - SMP rework on Allwinner A31
      
         - Xilinx Zynq support for SOC_BUS, big endian
      
         - Marvell orion5x platform cleanup, modernizing the implementation
           and moving to DT.
      
         - _Finally_ moving Samsung Exynos over to support MULTIPLATFORM, so
           that their platform can be enabled in the same kernel binary as
           most of the other v7 platforms in the tree.  \o/
      
           The work isn't quite complete, there's some driver fixes still
           needed, but the basics now work.
      
        New SoC support added:
      
         - Freescale i.MX6SX
      
         - LSI Axxia AXM55xx SoCs
      
         - Samsung EXYNOS 3250, 5260, 5410, 5420 and 5800
      
         - STi STIH407
      
        plus a large set of various smaller updates for different platforms.
        I'm probably missing some important one here"
      
      * tag 'soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (281 commits)
        ARM: exynos: don't run exynos4 l2x0 setup on other platforms
        ARM: exynos: Fix "allmodconfig" build errors in mcpm and hotplug
        ARM: EXYNOS: mcpm rename the power_down_finish
        ARM: EXYNOS: Enable mcpm for dual-cluster exynos5800 SoC
        ARM: EXYNOS: Enable multi-platform build support
        ARM: EXYNOS: Consolidate Kconfig entries
        ARM: EXYNOS: Add support for EXYNOS5410 SoC
        ARM: EXYNOS: Support secondary CPU boot of Exynos3250
        ARM: EXYNOS: Add Exynos3250 SoC ID
        ARM: EXYNOS: Add 5800 SoC support
        ARM: EXYNOS: initial board support for exynos5260 SoC
        clk: exynos5410: register clocks using common clock framework
        ARM: debug: qcom: add UART addresses to Kconfig help for APQ8084
        ARM: sunxi: allow building without reset controller
        Documentation: devicetree: arm: sort enable-method entries
        ARM: rockchip: convert smp bringup to CPU_METHOD_OF_DECLARE
        clk: exynos5250: Add missing sysmmu clocks for DISP and ISP blocks
        ARM: dts: axxia: Add reset controller
        power: reset: Add Axxia system reset driver
        ARM: axxia: Adding defconfig for AXM55xx
        ...
      825f4e02
    • Linus Torvalds's avatar
      Merge tag 'cleanup-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next · 0a584715
      Linus Torvalds authored
      Pull ARM SoC cleanups from Olof Johansson:
       "Cleanups for 3.16.  Among these are:
      
         - a bunch of misc cleanups for Broadcom platforms, mostly
           housekeeping
         - enabling Common Clock Framework on the older s3c24xx Samsung
           chipsets
         - cleanup of the Versatile Express system controller code, moving it
           to syscon
         - power management cleanups for OMAP platforms
      
        plus a handful of other cleanups across the place"
      
      * tag 'cleanup-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (87 commits)
        ARM: kconfig: allow PCI support to be selected with ARCH_MULTIPLATFORM
        clk: samsung: fix build error
        ARM: vexpress: refine dependencies for new code
        clk: samsung: clk-s3c2410-dlck: do not use PNAME macro as it declares __initdata
        cpufreq: exynos: Fix the compile error
        ARM: S3C24XX: move debug-macro.S into the common space
        ARM: S3C24XX: use generic DEBUG_UART_PHY/_VIRT in debug macro
        ARM: S3C24XX: trim down debug uart handling
        ARM: compressed/head.S: remove s3c24xx special case
        ARM: EXYNOS: Remove unnecessary inclusion of cpu.h
        ARM: EXYNOS: Migrate Exynos specific macros from plat to mach
        ARM: EXYNOS: Remove exynos_subsys registration
        ARM: EXYNOS: Remove duplicate lines in Makefile
        ARM: EXYNOS: use v7_exit_coherency_flush macro for cache disabling
        ARM: OMAP4: PRCM: remove references to cm-regbits-44xx.h from PRCM core files
        ARM: OMAP3/4: PRM: add support of late_init call to prm_ll_ops
        ARM: OMAP3/OMAP4: PRM: add prm_features flags and add IO wakeup under it
        ARM: OMAP3/4: PRM: provide io chain reconfig function through irq setup
        ARM: OMAP2+: PRM: remove unnecessary cpu_is_XXX calls from prm_init / exit
        ARM: OMAP2+: PRCM: cleanup some header includes
        ...
      0a584715
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next · ff933a08
      Linus Torvalds authored
      Pull ARM SoC low-priority fixes from Olof Johansson:
       "A small selection of fixes coming in late during the release cycle and
        not being critical enough for 3.15 inclusion"
      
      * tag 'fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting
        ARM: msm: Silence readb/writeb warnings due to missing IOMEM()
        ARM: dts: am43xx: fix starting offset of NAND.filesystem MTD partition
        ARM: dts: am335x-boneblack: remove use of ti,vcc-aux-disable-is-sleep
        ARM: OMAP2+: free use_gptimer_clksrc variable after boot
        ARM: OMAP5: Redo THUMB mode switch on secondary CPU
        ARM: dts: AM4372: add l3-noc information
        ARM: dts: DRA7: Use dra7-l3-noc instead of omap4-l3-noc
        reset: Add of_reset_control_get to reset.h
      ff933a08
    • Linus Torvalds's avatar
      Merge branch 'for-3.16/drivers' of git://git.kernel.dk/linux-block into next · 80081ec3
      Linus Torvalds authored
      Pull block driver changes from Jens Axboe:
       "Now that the core bits are in, here's the pull request for the driver
        related changes for 3.16.  Nothing out of the ordinary here, mostly
        business as usual.  There are a few pulls of for-3.16/core into this
        branch, which were done when the blk-mq was modified after the
        mtip32xx conversion was put in.
      
        The pull request contains:
      
         - skd and cciss converted to use pci_enable_msix_exact().  From
           Alexander Gordeev.
      
         - A few mtip32xx fixes from Asai @ Micron.
      
         - The conversion of mtip32xx from make_request_fn to blk-mq, and a
           later small fix for that conversion on quiescing for non-queued IO.
           From me.
      
         - A fix for bsg to use an exported function to check whether this
           driver is request based or not.  Needed updating for blk-mq, which
           is request based, but does not have a request_fn hook.  From me.
      
         - Small floppy bug fix from Jiri.
      
         - A series of cleanups for the cdrom uniform layer from Joe Perches.
           Gets rid of various old ugly macros, making the code conform more
           to the modern coding style.
      
         - A series of patches for drbd from the drbd crew (Lars Ellenberg and
           Philipp Reisner).
      
         - A use-after-free fix for null_blk from Ming Lei.
      
         - Also from Ming Lei is a performance patch for virtio-blk, which can
           net us a 3x win on kvm platforms where world notification is
           expensive.
      
         - Ming Lei also fixed a stall issue in virtio-blk, due to a race
           between queue start/stop and resource limits.
      
         - A small batch of fixes for xen-blk{back,front} from Olaf Hering and
           Valentin Priescu"
      
      * 'for-3.16/drivers' of git://git.kernel.dk/linux-block: (54 commits)
        block: virtio_blk: don't hold spin lock during world switch
        xen-blkback: defer freeing blkif to avoid blocking xenwatch
        xen blkif.h: fix comment typo in discard-alignment
        xen/blkback: disable discard feature if requested by toolstack
        xen-blkfront: remove type check from blkfront_setup_discard
        floppy: do not corrupt bio.bi_flags when reading block 0
        mtip32xx: move error handling to service thread
        virtio_blk: fix race between start and stop queue
        mtip32xx: stop block hardware queues before quiescing IO
        mtip32xx: blk_mq_init_queue() returns an ERR_PTR
        mtip32xx: convert to use blk-mq
        cdrom: Remove unnecessary prototype for cdrom_get_disc_info
        cdrom: Remove unnecessary prototype for cdrom_mrw_exit
        cdrom: Remove cdrom_count_tracks prototype
        cdrom: Remove cdrom_get_next_writeable prototype
        cdrom: Remove cdrom_get_last_written prototype
        cdrom: Move mmc_ioctls above cdrom_ioctl to remove unnecessary prototype
        cdrom: Remove unnecessary sanitize_format prototype
        cdrom: Remove unnecessary check_for_audio_disc prototype
        cdrom: Remove prototype for open_for_data
        ...
      80081ec3
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.16-changes' of... · 42555320
      Linus Torvalds authored
      Merge tag 'pci-v3.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci into next
      
      Pull PCI changes from Bjorn Helgaas:
       "Enumeration
          - Notify driver before and after device reset (Keith Busch)
          - Use reset notification in NVMe (Keith Busch)
      
        NUMA
          - Warn if we have to guess host bridge node information (Myron Stowe)
          - Work around AMD Fam15h BIOSes that fail to provide _PXM (Suravee
            Suthikulpanit)
          - Clean up and mark early_root_info_init() as deprecated (Suravee
            Suthikulpanit)
      
        Driver binding
          - Add "driver_override" for force specific binding (Alex Williamson)
          - Fail "new_id" addition for devices we already know about (Bandan
            Das)
      
        Resource management
          - Support BAR sizes up to 8GB (Nikhil Rao, Alan Cox)
          - Don't move IORESOURCE_PCI_FIXED resources (Bjorn Helgaas)
          - Mark SBx00 HPET BAR as IORESOURCE_PCI_FIXED (Bjorn Helgaas)
          - Fail safely if we can't handle BARs larger than 4GB (Bjorn Helgaas)
          - Reject BAR above 4GB if dma_addr_t is too small (Bjorn Helgaas)
          - Don't convert BAR address to resource if dma_addr_t is too small
            (Bjorn Helgaas)
          - Don't set BAR to zero if dma_addr_t is too small (Bjorn Helgaas)
          - Don't print anything while decoding is disabled (Bjorn Helgaas)
          - Don't add disabled subtractive decode bus resources (Bjorn Helgaas)
          - Add resource allocation comments (Bjorn Helgaas)
          - Restrict 64-bit prefetchable bridge windows to 64-bit resources
            (Yinghai Lu)
          - Assign i82875p_edac PCI resources before adding device (Yinghai Lu)
      
        PCI device hotplug
          - Remove unnecessary "dev->bus" test (Bjorn Helgaas)
          - Use PCI_EXP_SLTCAP_PSN define (Bjorn Helgaas)
          - Fix rphahp endianess issues (Laurent Dufour)
          - Acknowledge spurious "cmd completed" event (Rajat Jain)
          - Allow hotplug service drivers to operate in polling mode (Rajat Jain)
          - Fix cpqphp possible NULL dereference (Rickard Strandqvist)
      
        MSI
          - Replace pci_enable_msi_block() by pci_enable_msi_exact()
            (Alexander Gordeev)
          - Replace pci_enable_msix() by pci_enable_msix_exact() (Alexander Gordeev)
          - Simplify populate_msi_sysfs() (Jan Beulich)
      
        Virtualization
          - Add Intel Patsburg (X79) root port ACS quirk (Alex Williamson)
          - Mark RTL8110SC INTx masking as broken (Alex Williamson)
      
        Generic host bridge driver
          - Add generic PCI host controller driver (Will Deacon)
      
        Freescale i.MX6
          - Use new clock names (Lucas Stach)
          - Drop old IRQ mapping (Lucas Stach)
          - Remove optional (and unused) IRQs (Lucas Stach)
          - Add support for MSI (Lucas Stach)
          - Fix imx6_add_pcie_port() section mismatch warning (Sachin Kamat)
      
        Renesas R-Car
          - Add gen2 device tree support (Ben Dooks)
          - Use new OF interrupt mapping when possible (Lucas Stach)
          - Add PCIe driver (Phil Edworthy)
          - Add PCIe MSI support (Phil Edworthy)
          - Add PCIe device tree bindings (Phil Edworthy)
      
        Samsung Exynos
          - Remove unnecessary OOM messages (Jingoo Han)
          - Fix add_pcie_port() section mismatch warning (Sachin Kamat)
      
        Synopsys DesignWare
          - Make MSI ISR shared IRQ aware (Lucas Stach)
      
        Miscellaneous
          - Check for broken config space aliasing (Alex Williamson)
          - Update email address (Ben Hutchings)
          - Fix Broadcom CNB20LE unintended sign extension (Bjorn Helgaas)
          - Fix incorrect vgaarb conditional in WARN_ON() (Bjorn Helgaas)
          - Remove unnecessary __ref annotations (Bjorn Helgaas)
          - Add arch/x86/kernel/quirks.c to MAINTAINERS PCI file patterns
            (Bjorn Helgaas)
          - Fix use of uninitialized MPS value (Bjorn Helgaas)
          - Tidy x86/gart messages (Bjorn Helgaas)
          - Fix return value from pci_user_{read,write}_config_*() (Gavin Shan)
          - Turn pcibios_penalize_isa_irq() into a weak function (Hanjun Guo)
          - Remove unused serial device IDs (Jean Delvare)
          - Use designated initialization in PCI_VDEVICE (Mark Rustad)
          - Fix powerpc NULL dereference in pci_root_buses traversal (Mike Qiu)
          - Configure MPS on ARM (Murali Karicheri)
          - Remove unnecessary includes of <linux/init.h> (Paul Gortmaker)
          - Move Open Firmware devspec attribute to PCI common code (Sebastian Ott)
          - Use pdev->dev.groups for attribute creation on s390 (Sebastian Ott)
          - Remove pcibios_add_platform_entries() (Sebastian Ott)
          - Add new ID for Intel GPU "spurious interrupt" quirk (Thomas Jarosch)
          - Rename pci_is_bridge() to pci_has_subordinate() (Yijing Wang)
          - Add and use new pci_is_bridge() interface (Yijing Wang)
          - Make pci_bus_add_device() void (Yijing Wang)
      
        DMA API
          - Clarify physical/bus address distinction in docs (Bjorn Helgaas)
          - Fix typos in docs (Emilio López)
          - Update dma_pool_create ()and dma_pool_alloc() descriptions (Gioh Kim)
          - Change dma_declare_coherent_memory() CPU address to phys_addr_t
            (Bjorn Helgaas)
          - Pass GAPSPCI_DMA_BASE CPU & bus address to dma_declare_coherent_memory()
            (Bjorn Helgaas)"
      
      * tag 'pci-v3.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (92 commits)
        MAINTAINERS: Add generic PCI host controller driver
        PCI: generic: Add generic PCI host controller driver
        PCI: imx6: Add support for MSI
        PCI: designware: Make MSI ISR shared IRQ aware
        PCI: imx6: Remove optional (and unused) IRQs
        PCI: imx6: Drop old IRQ mapping
        PCI: imx6: Use new clock names
        i82875p_edac: Assign PCI resources before adding device
        ARM/PCI: Call pcie_bus_configure_settings() to set MPS
        PCI: imx6: Fix imx6_add_pcie_port() section mismatch warning
        PCI: Make pci_bus_add_device() void
        PCI: exynos: Fix add_pcie_port() section mismatch warning
        PCI: Introduce new device binding path using pci_dev.driver_override
        PCI: rcar: Add gen2 device tree support
        PCI: cpqphp: Fix possible null pointer dereference
        PCI: rcar: Add R-Car PCIe device tree bindings
        PCI: rcar: Add MSI support for PCIe
        PCI: rcar: Add Renesas R-Car PCIe driver
        PCI: Fix return value from pci_user_{read,write}_config_*()
        PCI: exynos: Remove unnecessary OOM messages
        ...
      42555320
    • Linus Torvalds's avatar
      Merge branch 'for-3.16/core' of git://git.kernel.dk/linux-block into next · 681a2895
      Linus Torvalds authored
      Pull block core updates from Jens Axboe:
       "It's a big(ish) round this time, lots of development effort has gone
        into blk-mq in the last 3 months.  Generally we're heading to where
        3.16 will be a feature complete and performant blk-mq.  scsi-mq is
        progressing nicely and will hopefully be in 3.17.  A nvme port is in
        progress, and the Micron pci-e flash driver, mtip32xx, is converted
        and will be sent in with the driver pull request for 3.16.
      
        This pull request contains:
      
         - Lots of prep and support patches for scsi-mq have been integrated.
           All from Christoph.
      
         - API and code cleanups for blk-mq from Christoph.
      
         - Lots of good corner case and error handling cleanup fixes for
           blk-mq from Ming Lei.
      
         - A flew of blk-mq updates from me:
      
           * Provide strict mappings so that the driver can rely on the CPU
             to queue mapping.  This enables optimizations in the driver.
      
           * Provided a bitmap tagging instead of percpu_ida, which never
             really worked well for blk-mq.  percpu_ida relies on the fact
             that we have a lot more tags available than we really need, it
             fails miserably for cases where we exhaust (or are close to
             exhausting) the tag space.
      
           * Provide sane support for shared tag maps, as utilized by scsi-mq
      
           * Various fixes for IO timeouts.
      
           * API cleanups, and lots of perf tweaks and optimizations.
      
         - Remove 'buffer' from struct request.  This is ancient code, from
           when requests were always virtually mapped.  Kill it, to reclaim
           some space in struct request.  From me.
      
         - Remove 'magic' from blk_plug.  Since we store these on the stack
           and since we've never caught any actual bugs with this, lets just
           get rid of it.  From me.
      
         - Only call part_in_flight() once for IO completion, as includes two
           atomic reads.  Hopefully we'll get a better implementation soon, as
           the part IO stats are now one of the more expensive parts of doing
           IO on blk-mq.  From me.
      
         - File migration of block code from {mm,fs}/ to block/.  This
           includes bio.c, bio-integrity.c, bounce.c, and ioprio.c.  From me,
           from a discussion on lkml.
      
        That should describe the meat of the pull request.  Also has various
        little fixes and cleanups from Dave Jones, Shaohua Li, Duan Jiong,
        Fengguang Wu, Fabian Frederick, Randy Dunlap, Robert Elliott, and Sam
        Bradshaw"
      
      * 'for-3.16/core' of git://git.kernel.dk/linux-block: (100 commits)
        blk-mq: push IPI or local end_io decision to __blk_mq_complete_request()
        blk-mq: remember to start timeout handler for direct queue
        block: ensure that the timer is always added
        blk-mq: blk_mq_unregister_hctx() can be static
        blk-mq: make the sysfs mq/ layout reflect current mappings
        blk-mq: blk_mq_tag_to_rq should handle flush request
        block: remove dead code in scsi_ioctl:blk_verify_command
        blk-mq: request initialization optimizations
        block: add queue flag for disabling SG merging
        block: remove 'magic' from struct blk_plug
        blk-mq: remove alloc_hctx and free_hctx methods
        blk-mq: add file comments and update copyright notices
        blk-mq: remove blk_mq_alloc_request_pinned
        blk-mq: do not use blk_mq_alloc_request_pinned in blk_mq_map_request
        blk-mq: remove blk_mq_wait_for_tags
        blk-mq: initialize request in __blk_mq_alloc_request
        blk-mq: merge blk_mq_alloc_reserved_request into blk_mq_alloc_request
        blk-mq: add helper to insert requests from irq context
        blk-mq: remove stale comment for blk_mq_complete_request()
        blk-mq: allow non-softirq completions
        ...
      681a2895
    • Linus Torvalds's avatar
      Merge tag 'mmc-v3.16-1' of git://git.linaro.org/people/ulf.hansson/mmc into next · 6c52486d
      Linus Torvalds authored
      Pull MMC update from Ulf Hansson:
       "These patches are mainly updates for the mmci driver and have been
        tested in linux-next.
      
        Some ARM SoC related patches are also included and those have been
        acked from the corresponding maintainers to go through my mmc tree.
      
        Updates for mmci driver:
         - Put the device into low power state at system suspend.
         - Convert to the common mmc DT parser.
         - Add missing DT bindings needed for ux500.
      
        Updates for ARM ux500|u300:
         - Convert to the common mmc DT bindings.
         - Remove redundant board file for mmci platform data"
      
      * tag 'mmc-v3.16-1' of git://git.linaro.org/people/ulf.hansson/mmc: (22 commits)
        mmc: mmci: Enforce DMA configuration through DT
        mmc: mmci: Enforce max frequency configuration through DT
        mmc: mmci: Enforce mmc capabilities through DT
        mmc: mmci: Enforce DT for signal direction and feedback clock
        ARM: ux500: Remove redundant board file for mmci platform data
        ARM: ux500: Add a vmmc regulator through DT for the poped eMMC for href
        ARM: ux500: Add the mmc capabilities flags to DT
        mmc: mmci: Enable MMC_CAP_CMD23
        mmc: mmci: Mark the DT bindings for highspeed mode as deprecated
        ARM: u300: Convert to the common mmc DT bindings for highspeed mode
        ARM: nomadik: Convert to the common mmc DT bindings for highspeed mode
        ARM: ux500: Convert to the common mmc DT bindings for highspeed mode
        ARM: ux500: Add mmci signal directions and feeback clock in DT for href
        mmc: mmci: Use the common mmc DT parser
        mmc: mmci: Add DT bindings for feedback clock pin
        mmc: mmci: Add DT bindings for signal direction
        mmc: mmci: Update DT documentation
        mmc: mmci: Convert to devm functions
        mmc: mmci: Convert to the mmc gpio API
        mmc: mmci: Put the device into low power state at system suspend
        ...
      6c52486d
    • Linus Torvalds's avatar
      Merge tag 'hsi-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi into next · c9733c79
      Linus Torvalds authored
      Pull HSI (High Speed Syncronous Interface) changes from Sebastian Reichel:
       "Please pull the following changes for the HSI subsystem, which I have
        taken over from Carlos Chinea <carlos.chinea@nokia.com>.
      
        The below patches have been worked on in the linux-omap mailinglist
        for 10 months and are well tested in linux-next (have been in there
        for more than two weeks) without any problems arising.  Apart from
        that potential regressions are very limited, because the subsystem is
        not yet used by any platform in the mainline kernel.
      
         - Add some documentation for the HSI subsystem
      
         - Add Device Tree support for the HSI subsystem
      
         - Add OMAP3 SSI driver (SSI is a legacy variant of HSI)
      
         - Add Nokia N900 Modem driver (without speech support for now)"
      
      * tag 'hsi-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
        HSI: Introduce Nokia N900 modem driver
        HSI: Introduce driver for SSI Protocol
        Documentation: DT: omap-ssi binding documentation
        HSI: Introduce OMAP SSI driver
        HSI: Add common DT binding for HSI client devices
        HSI: export method to (un)register clients
        HSI: Add channel resource support to HSI clients
        HSI: method to unregister clients from an hsi port
        HSI: hsi-char: fix driver for multiport scenarios
        MAINTAINERS: update HSI entry
        Documentation: HSI: Add some general description for the HSI subsystem
      c9733c79
    • Linus Torvalds's avatar
      Merge tag 'edac_for_3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into next · 6885a7f1
      Linus Torvalds authored
      Pull EDAC changes from Borislav Petkov:
       "Just two small fixlets.
      
        We have more in the pipe but we didn't get ready in time so more stuff
        next time"
      
      * tag 'edac_for_3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC: Fix MC scrub mode comparsion bug for correctable errors
        EDAC, MCE, AMD: Remove leftover unused mask
      6885a7f1
    • Linus Torvalds's avatar
      Merge tag 'gpio-v3.16-1' of... · 80fb9747
      Linus Torvalds authored
      Merge tag 'gpio-v3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio into next
      
      Pull GPIO updates from Linus Walleij:
       "This is the bulk of GPIO changes for the v3.16 series.
      
        There is a lot of action in the GPIO subsystem doing refactorings and
        cleanups, almost as many deletions as insertions and minor feature
        growth and no new drivers this time.  Which is actually pretty nice.
        Some GPIO-related stuff will come in through the pin control tree as
        well.
      
        Details:
      
         - We are finalizing and fixing up the gpiochip irqchip helpers
           bringing a helpful irqchip implementation into the gpiolib core and
           avoiding duplicate code and, more importantly, duplicate bug fixes:
      
           * Support for using the helpers with threaded interrupt handlers as
             used on sleeping GPIO-irqchips
      
           * Do not set up hardware triggers for edges or levels if the
             default IRQ type is IRQ_TYPE_NONE - some drivers would exploit
             the fact that you could get default initialization of the IRQ
             type from the core at probe() but if no default type is set up
             from the helper, we should not call the driver to configure
             anything.  Wait until a consumer requests the interrupt instead.
      
           * Make the irqchip helpers put the GPIO irqs into their own lock
             class.  The GPIO irqchips can often emit (harmless, but annoying)
             lockdep warnings about recursions when they are in fact just
             cascaded IRQs.  By putting them into their own lock class we help
             the lockdep core to keep track of things.
      
           * Switch the tc3589x GPIO expanders to use the irqchip helpers
      
           * Switch the OMAP GPIO driver to use the irqchip helpers
      
           * Add some documentation for the irqchip helpers
      
           * select IRQ_DOMAIN when using the helpers since some platforms may
             not be using this by default and it's a strict dependency.
      
         - Continued GPIO descriptor refactoring:
      
           * Remove the one instance of gpio_to_desc() from the device tree
             code, making the OF GPIO code use GPIO descriptors only.
      
           * Introduce gpiod_get_optional() and gpiod_get_optional_index()
             akin to the similar regulator functions for cases where the use
             of GPIO is optional and not strictly required.
      
           * Make of_get_named_gpiod_flags() private - we do not want to
             unnecessarily expose APIs to drivers that make the gpiolib harder
             than necessary to maintain and refactor.  Privatize this
             function.
      
         - Support "-gpio" suffix for the OF GPIO retrieveal path.  We used to
           look for "foo-gpios" or just "gpios" in device tree nodes, but it
           turns out that some drivers with a single GPIO line will just state
           "foo-gpio" (singularis).  Sigh.  Support this with a fallback
           looking for it, as this simplifies driver code and handles it in
           core code.
      
         - Switch the ACPI GPIO core to fetch GPIOs with the *_cansleep
           function variants as the GPIO operation region handler can sleep,
           and shall be able to handle gpiochips that sleep.
      
         - Tons of cleanups and janitorial work from Jingoo Han, Axel Lin,
           Javier Martinez Canillas and Abdoulaye Berthe.  Notably Jingoo cut
           off a ton of pointless OOM messages.
      
         - Incremental development and fixes for various drivers, nothing
           really special here"
      
      * tag 'gpio-v3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (85 commits)
        gpio: select IRQ_DOMAIN for gpiolib irqchip helpers
        gpio: pca953x: use gpiolib irqchip helpers
        gpio: pcf857x: Add IRQF_SHARED when request irq
        gpio: pcf857x: Avoid calling irq_domain_cleanup twice
        gpio: mcp23s08: switch chip count to int
        gpio: dwapb: use a second irq chip
        gpio: ep93xx: Use devm_ioremap_resource()
        gpio: mcp23s08: fixed count variable for devicetree probing
        gpio: Add run-time dependencies to R-Car driver
        gpio: pch: add slab include
        Documentation / ACPI: Fix location of GPIO documentation
        gpio / ACPI: use *_cansleep version of gpiod_get/set APIs
        gpio: generic: add request function pointer
        gpio-pch: Fix Kconfig dependencies
        gpio: make of_get_named_gpiod_flags() private
        gpio: gpioep93xx: use devm functions
        gpio: janzttl: use devm function
        gpio: timberdale: use devm functions
        gpio: bt8xx: use devm function for memory allocation
        gpio: include linux/bug.h in interface header
        ...
      80fb9747
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.16-rc0-tag' of... · 9f888b3a
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.16-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip into next
      
      Pull Xen updates from David Vrabel:
       "xen: features and fixes for 3.16-rc0
         - support foreign mappings in PVH domains (needed when dom0 is PVH)
      
         - fix mapping high MMIO regions in x86 PV guests (this is also the
           first half of removing the PAGE_IOMAP PTE flag).
      
         - ARM suspend/resume support.
      
         - ARM multicall support"
      
      * tag 'stable/for-linus-3.16-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        x86/xen: map foreign pfns for autotranslated guests
        xen-acpi-processor: Don't display errors when we get -ENOSYS
        xen/pciback: Document the entry points for 'pcistub_put_pci_dev'
        xen/pciback: Document when the 'unbind' and 'bind' functions are called.
        xen-pciback: Document when we FLR an PCI device.
        xen-pciback: First reset, then free.
        xen-pciback: Cleanup up pcistub_put_pci_dev
        x86/xen: do not use _PAGE_IOMAP in xen_remap_domain_mfn_range()
        x86/xen: set regions above the end of RAM as 1:1
        x86/xen: only warn once if bad MFNs are found during setup
        x86/xen: compactly store large identity ranges in the p2m
        x86/xen: fix set_phys_range_identity() if pfn_e > MAX_P2M_PFN
        x86/xen: rename early_p2m_alloc() and early_p2m_alloc_middle()
        xen/x86: set panic notifier priority to minimum
        arm,arm64/xen: introduce HYPERVISOR_suspend()
        xen: refactor suspend pre/post hooks
        arm: xen: export HYPERVISOR_multicall to modules.
        arm64: introduce virt_to_pfn
        arm/xen: Remove definiition of virt_to_pfn in asm/xen/page.h
        arm: xen: implement multicall hypercall support.
      9f888b3a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of... · 5d70dacd
      Linus Torvalds authored
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k into next
      
      Pull m68k updates from Geert Uytterhoeven:
       "Highlights:
         - support for running kernels in fast TT-RAM instead of slow ST-RAM
           on Atari
         - multi-platform EARLY_PRINTK
         - better support for machines with lots of RAM (think ARAnyM), and
           for running kernels larger than 4 MiB (think multi-platform)"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k/hp300: Convert printk to pr_foo()
        m68k/apollo: Convert printk to pr_foo()
        m68k/amiga: Convert printk(foo to pr_foo()
        m68k: Increase initial mapping to 8 or 16 MiB if possible
        m68k: Update defconfigs for v3.15-rc2
        m68k/atari: fix SCC initialization for debug console
        m68k/mvme16x: Adopt common boot console
        m68k: Multi-platform EARLY_PRINTK
        m68k: Toward platform agnostic framebuffer debug logging
        m68k/atari - atari_scsi: use correct virt/phys translation for DMA buffer
        m68k/atari - ataflop: use correct virt/phys translation for DMA buffer
        m68k/atari - atafb: convert allocation of fb ram to new interface
        m68k/atari - stram: alloc ST-RAM pool even if kernel not in ST-RAM
      5d70dacd
    • Ulf Hansson's avatar
      mmc: mmci: Enforce DMA configuration through DT · 8c3a05b4
      Ulf Hansson authored
      Remove the option to provide DMA configuration as platform data,
      enforce it through DT.
      Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Roland Stigge <stigge@antcom.de>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      8c3a05b4
    • Linus Torvalds's avatar
      Linux 3.15-rc8 · fad01e86
      Linus Torvalds authored
      fad01e86
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 204fe038
      Linus Torvalds authored
      Pull powerpc fix from Ben Herrenschmidt:
       "Here's just one trivial patch to wire up sys_renameat2 which I seem to
        have completely missed so far.
      
        (My test build scripts fwd me warnings but miss the ones generated for
        missing syscalls)"
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: Wire renameat2() syscall
      204fe038
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 568180a5
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "A fair number of fixes across the field.  Nothing terribly
        complicated; the one liners in below changelog should be fairly
        descriptive.
      
        Noteworthy is the SB1 change which the result of changes to binutils
        resulting in one big gas warning for most files being assembled as
        well as the asid_cache and branch emulation fixes which fix corruption
        or possible uninteded behaviour of kernel or application code.  The
        remainder of fixes are more platforms or subsystem specific"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: R46000: Fix Micro-assembler field overflow for R4600 V2
        MIPS: ptrace: Avoid smp_processor_id() in preemptible code
        MIPS: Lemote 2F: cs5536: mfgpt: use raw locks
        MIPS: SB1: Fix excessive kernel warnings.
        MIPS: RC32434: fix broken PCI resource initialization
        MIPS: malta: memory.c: Initialize the 'memsize' variable
        MIPS: Fix typo when reporting cache and ftlb errors for ImgTec cores
        MIPS: Fix inconsistancy of __NR_Linux_syscalls value
        MIPS: Fix branch emulation of branch likely instructions.
        MIPS: Fix a typo error in AUDIT_ARCH definition
        MIPS: Change type of asid_cache to unsigned long
      568180a5
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 32439700
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "Various fixlets, mostly related to the (root-only) SCHED_DEADLINE
        policy, but also a hotplug bug fix and a fix for a NR_CPUS related
        overallocation bug causing a suspend/resume regression"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched: Fix hotplug vs. set_cpus_allowed_ptr()
        sched/cpupri: Replace NR_CPUS arrays
        sched/deadline: Replace NR_CPUS arrays
        sched/deadline: Restrict user params max value to 2^63 ns
        sched/deadline: Change sched_getparam() behaviour vs SCHED_DEADLINE
        sched: Disallow sched_attr::sched_policy < 0
        sched: Make sched_setattr() correctly return -EFBIG
      32439700
  3. 01 Jun, 2014 6 commits
  4. 31 May, 2014 8 commits
    • Alexandr Terekhov's avatar
      staging: lustre: fix integer as NULL pointer warnings · 5bcfab13
      Alexandr Terekhov authored
      Fix several sparse warnings "Using plain integer as NULL pointer"
      Signed-off-by: default avatarAlexandr Terekhov <a.terekhov@gmail.com>
      
       drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 4 ++--
       drivers/staging/lustre/lustre/obdclass/obd_mount.c | 4 ++--
       drivers/staging/lustre/lustre/obdecho/lproc_echo.c | 4 ++--
       drivers/staging/lustre/lustre/osc/osc_dev.c        | 2 +-
       drivers/staging/lustre/lustre/ptlrpc/import.c      | 2 +-
       5 files changed, 8 insertions(+), 8 deletions(-)
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      5bcfab13
    • Olof Johansson's avatar
      ARM: exynos: don't run exynos4 l2x0 setup on other platforms · b5b9324a
      Olof Johansson authored
      This was caught by a panic on Broadcom mobile platforms.
      
      Note that this code is all going away with the pending l2x0 cleanup
      series from Russell, but we need this here until that's landed so we
      can enable exynos multiplatform.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      b5b9324a
    • Linus Torvalds's avatar
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a4bf79eb
      Linus Torvalds authored
      Pull core futex/rtmutex fixes from Thomas Gleixner:
       "Three fixlets for long standing issues in the futex/rtmutex code
        unearthed by Dave Jones syscall fuzzer:
      
         - Add missing early deadlock detection checks in the futex code
         - Prevent user space from attaching a futex to kernel threads
         - Make the deadlock detector of rtmutex work again
      
        Looks large, but is more comments than code change"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        rtmutex: Fix deadlock detector for real
        futex: Prevent attaching to kernel threads
        futex: Add another early deadlock detection check
      a4bf79eb
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 80e06794
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Mostly quiet now:
      
        i915:
          fixing userspace visiblie issues, all stable marked
      
        radeon:
          one more pll fix, two crashers, one suspend/resume regression"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: Resume fbcon last
        drm/radeon: only allocate necessary size for vm bo list
        drm/radeon: don't allow RADEON_GEM_DOMAIN_CPU for command submission
        drm/radeon: avoid crash if VM command submission isn't available
        drm/radeon: lower the ref * post PLL maximum once more
        drm/i915: Prevent negative relocation deltas from wrapping
        drm/i915: Only copy back the modified fields to userspace from execbuffer
        drm/i915: Fix dynamic allocation of physical handles
      80e06794
    • Linus Torvalds's avatar
      dcache: add missing lockdep annotation · 9f12600f
      Linus Torvalds authored
      lock_parent() very much on purpose does nested locking of dentries, and
      is careful to maintain the right order (lock parent first).  But because
      it didn't annotate the nested locking order, lockdep thought it might be
      a deadlock on d_lock, and complained.
      
      Add the proper annotation for the inner locking of the child dentry to
      make lockdep happy.
      
      Introduced by commit 046b961b ("shrink_dentry_list(): take parent's
      ->d_lock earlier").
      Reported-and-tested-by: default avatarJosh Boyer <jwboyer@fedoraproject.org>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9f12600f
    • Abhilash Kesavan's avatar
      ARM: exynos: Fix "allmodconfig" build errors in mcpm and hotplug · 4081503b
      Abhilash Kesavan authored
      This fixes the following build errors:
      
      /tmp/ccRbZlaA.s: Assembler messages:
      /tmp/ccRbZlaA.s:69: Error: selected processor does not support ARM mode `isb '
      /tmp/ccRbZlaA.s:75: Error: selected processor does not support ARM mode `isb '
      /tmp/ccRbZlaA.s:76: Error: selected processor does not support ARM mode `dsb '
      make[1]: *** [arch/arm/mach-exynos/hotplug.o] Error 1
      
      /tmp/ccJEg4jw.s: Assembler messages:
      /tmp/ccJEg4jw.s:454: Error: selected processor does not support ARM mode `isb'
      /tmp/ccJEg4jw.s:455: Error: selected processor does not support ARM mode `dsb'
      /tmp/ccJEg4jw.s:465: Error: selected processor does not support ARM mode `isb'
      /tmp/ccJEg4jw.s:474: Error: selected processor does not support ARM mode `isb'
      /tmp/ccJEg4jw.s:475: Error: selected processor does not support ARM mode `dsb'
      /tmp/ccJEg4jw.s:516: Error: selected processor does not support ARM mode `isb'
      /tmp/ccJEg4jw.s:525: Error: selected processor does not support ARM mode `isb'
      /tmp/ccJEg4jw.s:526: Error: selected processor does not support ARM mode `dsb'
      make[1]: *** [arch/arm/mach-exynos/mcpm-exynos.o] Error 1
      Reported-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: default avatarAbhilash Kesavan <a.kesavan@samsung.com>
      Tested-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      4081503b
    • Sachin Kamat's avatar
      ARM: multi_v7_defconfig: Enable Exynos platform · c6ac4487
      Sachin Kamat authored
      Enable Exynos platform and its related IPs for multi_v7_defconfig.
      Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      c6ac4487
    • Olof Johansson's avatar
      Merge tag 'samsung-drivers-2' of... · 45e70b7d
      Olof Johansson authored
      Merge tag 'samsung-drivers-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
      
      Merge "Samsung 2nd drivers for 3.16" from Kukjin Kim:
      
      This is including fix exynos cpufreq driver compilation with
      ARCH_MULTIPLATFORM. Even though this is a work around, this
      is required for support exynos multiplatform for a while and
      will be updated in near future.
      
      This is based on tags/samsung-exynos.
      
      * tag 'samsung-drivers-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (24 commits)
        cpufreq: exynos: Fix driver compilation with ARCH_MULTIPLATFORM
        ARM: EXYNOS: Enable multi-platform build support
        ARM: EXYNOS: Consolidate Kconfig entries
        ARM: EXYNOS: Add support for EXYNOS5410 SoC
        ARM: EXYNOS: Support secondary CPU boot of Exynos3250
        ARM: EXYNOS: Add Exynos3250 SoC ID
        ARM: EXYNOS: Add 5800 SoC support
        ARM: EXYNOS: initial board support for exynos5260 SoC
        clk: exynos5250: Add missing sysmmu clocks for DISP and ISP blocks
        cpufreq: exynos: Fix the compile error
        ARM: S3C24XX: move debug-macro.S into the common space
        ARM: S3C24XX: use generic DEBUG_UART_PHY/_VIRT in debug macro
        ARM: S3C24XX: trim down debug uart handling
        ARM: compressed/head.S: remove s3c24xx special case
        ARM: EXYNOS: Remove unnecessary inclusion of cpu.h
        ARM: EXYNOS: Migrate Exynos specific macros from plat to mach
        ARM: EXYNOS: Remove exynos_subsys registration
        ARM: EXYNOS: Remove duplicate lines in Makefile
        ARM: EXYNOS: use v7_exit_coherency_flush macro for cache disabling
        ARM: dts: Remove g2d_pd node for exynos5420
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      45e70b7d