1. 02 Oct, 2012 1 commit
  2. 01 Oct, 2012 39 commits
    • Olof Johansson's avatar
      drivers: bus: omap_l3: fixup merge conflict resolution · 974a847e
      Olof Johansson authored
      This fixes a local merge conflict resolution done wrong locally in
      arm-soc for-next. soc.h was added on a cleanup branch, but the driver
      was moved and the header no longer needed.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      [ .. and I did the same wrong merge, since git automatically does the
        whole rename detection etc, so applying this patch from Olof  - Linus ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 9cd11c0c
      Linus Torvalds authored
      Pull ARM soc multiplatform enablement from Olof Johansson:
       "This is a pretty significant branch.  It's the introduction of the
        first multiplatform support on ARM, and with this (and the later
        branch) merged, it is now possible to build one kernel that contains
        support for highbank, vexpress, mvebu, socfpga, and picoxcell.  More
        platforms will be convered over in the next few releases.
        Two critical last things had to be done for this to be practical and
         * Today each platform has its own include directory under
           mach-<mach>/include/mach/*, and traditionally that is where a lot
           of driver/platform shared definitions have gone, such as platform
           data structures.  They now need to move out to a common location
           instead, and this branch moves a large number of those out to
         * Each platform used to list the device trees to compile for its
           boards in mach-<mach>/Makefile.boot.
        Both of the above changes will mean that there are some merge
        conflicts to come (and some to resolve here).  It's a one-time move
        and once it settles in, we should be good for quite a while.  Sorry
        for the overhead."
      Fix conflicts as per Olof.
      * tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)
        ARM: add v7 multi-platform defconfig
        ARM: msm: Move core.h contents into common.h
        ARM: highbank: call highbank_pm_init from .init_machine
        ARM: dtb: move all dtb targets to common Makefile
        ARM: spear: move platform_data definitions
        ARM: samsung: move platform_data definitions
        ARM: orion: move platform_data definitions
        ARM: vexpress: convert to multi-platform
        ARM: initial multiplatform support
        ARM: mvebu: move armada-370-xp.h in mach dir
        ARM: vexpress: remove dependency on mach/* headers
        ARM: picoxcell: remove dependency on mach/* headers
        ARM: move all dtb targets out of Makefile.boot
        ARM: picoxcell: move debug macros to include/debug
        ARM: socfpga: move debug macros to include/debug
        ARM: mvebu: move debug macros to include/debug
        ARM: vexpress: move debug macros to include/debug
        ARM: highbank: move debug macros to include/debug
        ARM: move debug macros to common location
        ARM: make mach/gpio.h headers optional
    • Linus Torvalds's avatar
      Merge tag 'docs' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · b9541d94
      Linus Torvalds authored
      Pull ARM soc documentation updates from Olof Johansson:
       "Documentation update for Marvell SoCs, the secret decoder ring to all
        their crazy product names and numbers."
      * tag 'docs' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        arm: add documentation describing Marvell families of SoC
    • Linus Torvalds's avatar
      Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · e7b5ec99
      Linus Torvalds authored
      Pull ARM soc device tree updates, take 2 from Olof Johansson:
       "This branch contains mostly a set of changes for device tree bindings
        on Samsung Exynos.  It was staged behind the other branches due to
        dependencies on pincontrol and board changes."
      Fix up trivial conflict in drivers/clocksource/Makefile due to earlier
      conflict resolution.
      * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: dts: Add nodes for dw_mmc controllers for Samsung EXYNOS5250 platforms
        ARM: EXYNOS: Add AUXDATA support for MSHC controllers
        ARM: EXYNOS: Add support for MSHC controller clocks
        ARM: dts: Enable on-board keys as wakeup source for exynos4210-origen
        ARM: dts: use uart2 for console on smdkv310 and smdk5250
        ARM: dts: Add basic dts file for Samsung Trats board
        ARM: EXYNOS: Add OF compatibility lookups for EXYNOS4 i2c adapters
        ARM: dts: Specify address and size cells for i2c controllers for EXYNOS4
        ARM: dts: Assume status of all optional nodes as disabled for exynos4
        ARM: EXYNOS: Use exynos4 prefix instead of exynos4210 on exynos4-dt
        ARM: dts: Move parts common to EXYNOS4 from exynos4210.dtsi to exynos4.dtsi
    • Linus Torvalds's avatar
      Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 95360fd6
      Linus Torvalds authored
      Pull ARM soc board specific updates from Olof Johansson:
       "Misc board updates:
         - Greg added a handful of boards to KS8695 (since he has stepped up
           to maintain it).
         - Qualcomm has added DT-only board support for a couple of their
           newer SoCs.
         - misc other updates for Samsung and Freescale boards."
      Fix up trivial conflict in arch/arm/mach-shmobile/board-armadillo800eva.c
      due to gpio device data being added next to hdmi device data that got moved.
      * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: msm: Allow 8960 and 8660 to compile together
        ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
        ARM: EXYNOS: Add generic PWM lookup support for SMDKV310
        ARM: EXYNOS: Add generic PWM lookup support for SMDK4X12
        ARM: EXYNOS: Use generic pwm driver in Origen board
        ARM: shmobile: armadillo800eva: Add support RTC
        ARM: ks8695: add board support for the OpenGear boards based on the KS8695
        ARM: ks8695: add board support for the SnapGear boards based on the KS8695
        ARM: dts: Add heartbeat gpio-leds support to Origen
        ARM: dts: Use active low flag for gpio-keys on Origen
        ARM: shmobile: marzen: enable thermal sensor
        ARM: shmobile: marzen: fixup regulator id for smsc911x
        ARM: shmobile: marzen: add SDHI0 support
        ARM: mmp: enable debug uart port in defconfig
        ARM: mmp: implement DEBUG_LL port choice
        ARM: S3C64XX: Register audio platform devices for Bells on Cragganmore
        ARM: S3C64XX: Update configuration for WM5102 module on Cragganmore
        ARM: mx27pdk: Add audio support
        ARM: ttc_dkb: add nand support
    • Linus Torvalds's avatar
      Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 8f446a7a
      Linus Torvalds authored
      Pull ARM soc driver specific changes from Olof Johansson:
       - A long-coming conversion of various platforms to a common LED
       - AT91 is moved over to use the newer MCI driver for MMC
       - Pincontrol conversions for samsung platforms
       - DT bindings for gscaler on samsung
       - i2c driver fixes for tegra, acked by i2c maintainer
      Fix up conflicts as per Olof.
      * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
        drivers: bus: omap_l3: use resources instead of hardcoded irqs
        pinctrl: exynos: Fix wakeup IRQ domain registration check
        pinctrl: samsung: Uninline samsung_pinctrl_get_soc_data
        pinctrl: exynos: Correct the detection of wakeup-eint node
        pinctrl: exynos: Mark exynos_irq_demux_eint as inline
        pinctrl: exynos: Handle only unmasked wakeup interrupts
        pinctrl: exynos: Fix typos in gpio/wkup _irq_mask
        pinctrl: exynos: Set pin function to EINT in irq_set_type of GPIO EINTa
        drivers: bus: Move the OMAP interconnect driver to drivers/bus/
        i2c: tegra: dynamically control fast clk
        i2c: tegra: I2_M_NOSTART functionality not supported in Tegra20
        ARM: tegra: clock: remove unused clock entry for i2c
        ARM: tegra: clock: add connection name in i2c clock entry
        i2c: tegra: pass proper name for getting clock
        ARM: tegra: clock: add i2c fast clock entry in clock table
        ARM: EXYNOS: Adds G-Scaler device from Device Tree
        ARM: EXYNOS: Add clock support for G-Scaler
        ARM: EXYNOS: Enable pinctrl driver support for EXYNOS4 device tree enabled platform
        ARM: dts: Add pinctrl node entries for SAMSUNG EXYNOS4210 SoC
        ARM: EXYNOS: skip wakeup interrupt setup if pinctrl driver is used
    • Linus Torvalds's avatar
      Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 84be4ae2
      Linus Torvalds authored
      Pull ARM soc-specific updates, take 2 from Olof Johansson:
       "This branch converts the MXS Freescale platform to use irqdomains and
        sparse IRQ, in preparation for DT probing and multiplatform kernels."
      * tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: mxs: remove mach/irqs.h
        ARM: mxs: select SPARSE_IRQ
        ARM: mxs: adopt irq_domain support for icoll driver
        ARM: mxs: select MULTI_IRQ_HANDLER
        ARM: mxs: retrieve timer irq from device tree
        gpio/mxs: adopt irq_domain support for mxs gpio driver
    • Linus Torvalds's avatar
      Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · ac9e7ab3
      Linus Torvalds authored
      Pull ARM soc cleanups, part 2 from Olof Johansson:
       "A shorter cleanup branch submitted separately due to dependencies with
        some of the previous topics.
        Major thing here is that the Broadcom bcmring platform is removed.
        It's an SoC that's used on some stationary VoIP platforms, and is in
        desperate need of some cleanup.  Broadcom came back and suggested that
        we just deprecate the platform for now, since they aren't going to
        spend the resources needed on cleaning it up, and there are no users
        of the platform directly from mainline."
      Fix some conflicts due to BCM2835 getting added next to the removed
      BCMRING, and removal of tegra files that had been converted to
      * tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: Orion5x: ts78xx: Add IOMEM for virtual addresses.
        ARM: ux500: use __iomem pointers for MMIO
        ARM: Remove mach-bcmring
        ARM: clps711x: Remove board support for CEIVA
        ARM: clps711x: Fix register definitions
        ARM: clps711x: Fix lowlevel debug-macro
        ARM: clps711x: Added simple clock framework
        pinctrl: tegra: move pinconf-tegra.h content into drivers/pinctrl
        ARM: tegra: delete unused headers
        ARM: tegra: remove useless includes of <mach/*.h>
        ARM: tegra: remove dead code
    • Linus Torvalds's avatar
      Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 2a2bf85f
      Linus Torvalds authored
      Pull ARM soc device tree updates from Olof Johansson:
       "Device tree conversion and enablement branch.  Mostly a bunch of new
        bindings and setup for various platforms, but the Via/Winchip VT8500
        platform is also converted over from being 100% legacy to now use
        device tree for probing.  More of that will come for 3.8."
      Trivial conflicts due to removal of vt8500 files, and one documentation
      file that was added with slightly different contents both here and in
      the USb tree.
      * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (212 commits)
        arm: vt8500: Fixup for missing gpio.h
        ARM: LPC32xx: LED fix in PHY3250 DTS file
        ARM: dt: mmp-dma: add binding file
        arm: vt8500: Update arch-vt8500 to devicetree support.
        arm: vt8500: gpio: Devicetree support for arch-vt8500
        arm: vt8500: doc: Add device tree bindings for arch-vt8500 devices
        arm: vt8500: clk: Add Common Clock Framework support
        video: vt8500: Add devicetree support for vt8500-fb and wm8505-fb
        serial: vt8500: Add devicetree support for vt8500-serial
        rtc: vt8500: Add devicetree support for vt8500-rtc
        arm: vt8500: Add device tree files for VIA/Wondermedia SoC's
        ARM: tegra: Add Avionic Design Tamonten Evaluation Carrier support
        ARM: tegra: Add Avionic Design Medcom-Wide support
        ARM: tegra: Add Avionic Design Plutux support
        ARM: tegra: Add Avionic Design Tamonten support
        ARM: tegra: dts: Add pwm label
        ARM: ux500: Fix SSP register address format
        ARM: ux500: Apply tc3589x's GPIO/IRQ properties to HREF's DT
        ARM: ux500: Remove redundant #gpio-cell properties from Snowball DT
        ARM: ux500: Add all encompassing sound node to the HREF Device Tree
    • Linus Torvalds's avatar
      Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 11801e9d
      Linus Torvalds authored
      Pull ARM soc-specific updates from Olof Johansson:
       "Most notable here is probably the addition of basic support for the
        BCM2835, an SoC used in some of the Roku 2 players as well as the
        much-hyped Raspberry Pi, cleaned up and contributed by Stephen Warren.
        It's still early days on mainline support, with just the basics
        working.  But it has to start somewhere!
        Beyond that there's some conversions of clock infrastructure on tegra
        to common clock, misc updates for several other platforms, and OMAP
        now has its own bus (under drivers/bus) to manage its devices through.
        This branch adds two new directories outside of arch/arm:
        drivers/irqchip for new irq controllers, and drivers/bus for the above
        OMAP bus.  It's expected that some of the other platforms will migrate
        parts of their platforms to those directories over time as well."
      Fix up trivial conflicts with the clk infrastructure changes.
      * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (62 commits)
        ARM: shmobile: add new __iomem annotation for new code
        ARM: LPC32xx: Support GPI 28
        ARM: LPC32xx: Platform update for devicetree completion of spi-pl022
        ARM: LPC32xx: Board cleanup
        irqchip: fill in empty Kconfig
        ARM: SAMSUNG: Add check for NULL in clock interface
        ARM: EXYNOS: Put PCM, Slimbus, Spdif clocks to off state
        ARM: EXYNOS: Add bus clock for FIMD
        ARM: SAMSUNG: Fix HDMI related warnings
        ARM: S3C24XX: Add .get_rate callback for "camif-upll" clock
        ARM: EXYNOS: Fix incorrect help text
        ARM: EXYNOS: Turn off clocks for NAND, OneNAND and TSI controllers
        ARM: OMAP: AM33xx hwmod: fixup SPI after platform_data move
        MAINTAINERS: add an entry for the BCM2835 ARM sub-architecture
        ARM: bcm2835: instantiate console UART
        ARM: bcm2835: add stub clock driver
        ARM: bcm2835: add system timer
        ARM: bcm2835: add interrupt controller driver
        ARM: add infra-structure for BCM2835 and Raspberry Pi
        ARM: tegra20: add CPU hotplug support
    • Linus Torvalds's avatar
      Merge tag 'maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 1a58ddfc
      Linus Torvalds authored
      Pull ARM soc MAINTAINERS updates from Olof Johansson:
       "Maintainers updates for KS8965 adding Greg Ungerer, and removing
        myself and Colin Cross as tegra maintainers, since Stephen Warren has
        been handling it on his own for several releases now."
      * tag 'maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: ks8695: add maintainers entry
        MAINTAINERS: tegra: remove Olof/Colin, add device tree files
        MAINTAINERS: add defconfig file to TEGRA section
    • Linus Torvalds's avatar
      Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 61464c83
      Linus Torvalds authored
      Pull ARM soc general cleanups from Olof Johansson:
       "This is a large branch that contains a handful of different cleanups:
         - Fixing up the I/O space remapping on PCI on ARM.  This is a series
           from Rob Herring that restructures how all pci devices allocate I/O
           space, and it's part of the work to allow multiplatform kernels.
         - A number of cleanup series for OMAP, moving and removing some
           headers, sparse irq rework and in general preparation for
         - Final removal of all non-DT boards for Tegra, it is now
         - Removal of a stale platform, nxp4008.  It's an old mobile chipset
           that is no longer in use, and was very likely never really used
           with a mainline kernel.  We have not been able to find anyone
           interested in keeping it around in the kernel.
         - Removal of the legacy dmaengine driver on tegra
        + A handful of other things that I haven't described above."
      Fix up some conflicts with the staging tree (and because nxp4008 was
      * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (184 commits)
        ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6
        ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus
        ARM: mmp: using for_each_set_bit to simplify the code
        ARM: tegra: harmony: fix ldo7 regulator-name
        ARM: OMAP2+: Make omap4-keypad.h local
        ARM: OMAP2+: Make l4_3xxx.h local
        ARM: OMAP2+: Make l4_2xxx.h local
        ARM: OMAP2+: Make l3_3xxx.h local
        ARM: OMAP2+: Make l3_2xxx.h local
        ARM: OMAP1: Move irda.h from plat to mach
        ARM: OMAP2+: Make hdq1w.h local
        ARM: OMAP2+: Make gpmc-smsc911x.h local
        ARM: OMAP2+: Make gpmc-smc91x.h local
        ARM: OMAP1: Move flash.h from plat to mach
        ARM: OMAP2+: Make debug-devices.h local
        ARM: OMAP1: Move board-voiceblue.h from plat to mach
        ARM: OMAP1: Move board-sx1.h from plat to mach
        ARM: OMAP2+: Make omap-wakeupgen.h local
        ARM: OMAP2+: Make omap-secure.h local
        ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local
    • Linus Torvalds's avatar
      Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 47061eda
      Linus Torvalds authored
      Pull non-critical ARM soc bug fixes from Olof Johansson:
       "These were submitted as bug fixes before v3.6 but not considered
        important enough to be included in it.  Some of them cross over to
        cleanup territory as well, and aren't strictly bugfixes."
      * tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
        ARM: nomadik: remove NAND_NO_READRDY use
        ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()
        ARM: SAMSUNG: Add missing variable declaration in s3c64xx_spi1_set_platdata()
        ARM: S3C24XX: removes unnecessary semicolon
        ARM: S3C24xx: delete double assignment
        ARM: EXYNOS: fix address for EXYNOS4 MDMA1
        ARM: EXYNOS: fixed SYSMMU setup definition to mate parameter name
        ARM: ep93xx: Move ts72xx.h out of include/mach
        ARM: ep93xx: use __iomem pointers for MMIO
        ARM: msm: Fix early debug uart mapping on some memory configs
        ARM: msm: io: Change the default static iomappings to be shared
        ARM: msm: io: Remove 7x30 iomap region from 7x00
        ARM: msm: Remove call to missing FPGA init on 8660
        ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write
        ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT register save
        dma: tegra: make data used as *of_device_id.data const
        can: mpc5xxx_can: make data used as *of_device_id.data const
        macintosh/mediabay: make data used as *of_device_id.data const
        i2c/mpc: make data used as *of_device_id.data const
        mfd/da9052: make i2c_device_id array const
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · 797b9e5a
      Linus Torvalds authored
      Pull CIFS updates from Steve French:
       "This patchset is the final section of the SMB2.1 support merge for
        cifs.ko.  It also includes improvements to the cifs socket handling
        from Jeff, and also fixes a few cifs bug fixes.  It adds SMB2 support
        for file and inode operations as well as moves some existing cifs code
        to use ops server struct of protocol specific callbacks.
        Most of this code is SMB2 specific.  When enabled SMB2.1 does pass
        various functional tests including most of the connectathon test
        suite, For SMB2.1, Connectathon test 4 and some related tests fail due
        to not updating mode bits remotely (cifsacl support where mode bits
        are approximated with the cifs acl is not enable for smb2), and test8
        (symlink) support is not completed for SMB2 yet (note that we will
        likely have a "Unix Extensions" eventually, at least for Samba, so in
        the long run posix locks won't have to be emulated when mounting Linux
        to Linux, but for most NAS and for Windows mounts posix lock emulation
        will still used for SMB2 in a similar fashion as we do for cifs).
        SMB2.1 dialect is supported.  Although additional fixes to enable smb2
        (the original smb2.02) dialect and to add various optional features of
        the smb3 dialect are expected to be added in the future as testing
        progresses, currently mounting with the "vers=2.1" is supported (in
        order to mount using SMB2.1 to servers like Samba 4, and Windows 7,
        Windows 2008R2)."
      * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6: (82 commits)
        [CIFS] Fix indentation of fs/cifs/Kconfig entries
        [CIFS] Fix SMB2 negotiation support to select only one dialect (based on vers=)
        cifs: obtain file access during backup intent lookup (resend)
        CIFS: Fix possible freed pointer dereference in CIFS_SessSetup
        CIFS: Fix possible freed pointer dereference in SMB2_sess_setup
        CIFS: Make ops->close return void
        cifs: change DOS/NT/POSIX mapping of ERRnoresource
        cifs: remove support for deprecated "forcedirectio" and "strictcache" mount options
        cifs: remove support for CIFS_IOC_CHECKUMOUNT ioctl
        CIFS: Fix possible memory leaks in SMB2 code
        CIFS: Fix endian conversion of IndexNumber
        Trivial endian fixes
        MARK SMB2 support EXPERIMENTAL
        Update cifs version number
        cifs: add FL_CLOSE to fl_flags mask in cifs_read_flock
        cifs: Mangle string used for unc in /proc/mounts
        cifs: cleanups for cifs_mkdir_qinfo
        CIFS: Fix fast lease break after open problem
        CIFS: Add SMB2.1 lease break support
        CIFS: Fix cache coherency for read oplock case
    • Linus Torvalds's avatar
      Get rid of Documentation/feature-removal.txt · 9c0ece06
      Linus Torvalds authored
      This file has turned out to be a pure write-only file that causes merge
      conflicts and has no actual redeeming features.
      There is never any reason to add stuff to this idiotic file.  Either
      something isn't getting used, and you should just remove it, or there is
      no excuse for removing it in the first place.  Just stop the idiocy.
      It has also been the excuse for just plain bad behavior ("Hey, I don't
      like xyz, so let's mark it for removal" followed by "Hey, look, it been
      in feature-removal.txt for six months now, so we should remove it").
      The recent bogus setitimer() ABI change request was just the most recent
      example of pointless and incorrect mental masturbation involving this
      file, and I'm tired of the silly and pointless conflicts in the file.
      This removal was discussed during the recent kernel summit, and while
      Steven Rostedt suggested we should just enter the file itself in the
      feature-removal schedule (to see if anybody who edits the file actually
      looks at it), that's cute but non-productive.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Olof Johansson's avatar
      Merge branch 'next/dt2' into HEAD · 7b27fa25
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/boards' into HEAD · a8e1ceb7
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/drivers' into HEAD · 8b1a13b0
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/soc2' into HEAD · 5c008d70
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/cleanup2' into HEAD · 5d3a0a95
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/dt' into HEAD · 7e95c548
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/soc' into HEAD · 6d55d596
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/maintainers' into HEAD · f7b967bf
      Olof Johansson authored
    • Olof Johansson's avatar
      Merge branch 'next/cleanup' into HEAD · ed0a0ed0
      Olof Johansson authored
    • Olof Johansson's avatar
    • Linus Torvalds's avatar
      Merge branch 'x86-smap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 15385dfe
      Linus Torvalds authored
      Pull x86/smap support from Ingo Molnar:
       "This adds support for the SMAP (Supervisor Mode Access Prevention) CPU
        feature on Intel CPUs: a hardware feature that prevents unintended
        user-space data access from kernel privileged code.
        It's turned on automatically when possible.
        This, in combination with SMEP, makes it even harder to exploit kernel
        bugs such as NULL pointer dereferences."
      Fix up trivial conflict in arch/x86/kernel/entry_64.S due to newly added
      includes right next to each other.
      * 'x86-smap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, smep, smap: Make the switching functions one-way
        x86, suspend: On wakeup always initialize cr4 and EFER
        x86-32: Start out eflags and cr4 clean
        x86, smap: Do not abuse the [f][x]rstor_checking() functions for user space
        x86-32, smap: Add STAC/CLAC instructions to 32-bit kernel entry
        x86, smap: Reduce the SMAP overhead for signal handling
        x86, smap: A page fault due to SMAP is an oops
        x86, smap: Turn on Supervisor Mode Access Prevention
        x86, smap: Add STAC and CLAC instructions to control user space access
        x86, uaccess: Merge prototypes for clear_user/__clear_user
        x86, smap: Add a header file with macros for STAC/CLAC
        x86, alternative: Add header guards to <asm/alternative-asm.h>
        x86, alternative: Use .pushsection/.popsection
        x86, smap: Add CR4 bit for SMAP
        x86-32, mm: The WP test should be done on a kernel page
    • Linus Torvalds's avatar
      Merge tag 'please-pull-ia64-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · a57d985e
      Linus Torvalds authored
      Pull ia64 update from Tony Luck:
       "Usual mish-mash of ia64 fixes for next merge window"
      * tag 'please-pull-ia64-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        [IA64] xen: Fix return value check in xencomm_vtop()
        [IA64] Must enable interrupts in do_notify_resume_user before calling tracehook_notify_resume()
        [IA64] kexec: Move the dereference below the NULL test
        [IA64] Fix a node distance bug
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · cdeb9b01
      Linus Torvalds authored
      Pull m68k updates from Geert Uytterhoeven:
       "All pretty boring, seems like all of us had better things to do last
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
        m68k/q40: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
        m68k/amiga: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
        m68k/apollo: Remove disabled definitions in apollohw.h
    • Linus Torvalds's avatar
      Merge tag 'dlm-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · 40689ac4
      Linus Torvalds authored
      Pull dlm updates from David Teigland:
       "There are two main patches in this set, both related to the userland
        dlm_controld daemon.
        The first fixes a deadlock between dlm_controld and the dlm_send
        workqueue when both access configfs data simultaneously.
        The second reworks some code to get around a long standing, but
        intentional, unlock balance warning.  The userland daemon no longer
        takes a lock that is later released from the kernel.
        The other commits are minor fixes and changes."
      * tag 'dlm-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: check the maximum size of a request from user
        dlm: cleanup send_to_sock routine
        dlm: convert add_sock routine return value type to void
        dlm: remove redundant variable assignments
        dlm: fix unlock balance warnings
        dlm: fix uninitialized spinlock
        dlm: fix deadlock between dlm_send and dlm_controld
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · cc150a28
      Linus Torvalds authored
      Pull hwmon updates from Guenter Roeck:
       "New drivers for: MCP3221, ADT7410, MAX197
        Chip support added to existing drivers: LM71, LM74, MAX1110, MAX1112,
        MAX1113, INA220, INA230, MCP3221
        Cleanup: Use devm_ functions, fixed build warnings, removed deprecated
        sysfs attributes, code simplifications, dropped dependencies on
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (64 commits)
        hwmon: (mcp3021) Add MCP3221 support
        hwmon: (mcp3021) Prepare MCP3021 driver to support other chips
        hwmon: (w83791d) Drop unnecessary compare statements
        hwmon: (lm93) Drop unnecessary compare statement
        hwmon: (lm70) Simplify show_name function
        hwmon: (adcxx) Simplify show_name function
        hwmon: Drop dependencies on EXPERIMENTAL
        hwmon: (it87) Fix Kconfig for IT87 driver
        hwmon: (sht15) move header to linux/platform_data/
        hwmon: (asus_atk0110) Remove useless kfree
        hwmon: (ina2xx) Add support for INA220 and INA230
        hwmon: (ina2xx) Use structure array to distinguish chip types
        hwmon: (max1111) Add support for MAX1110, MAX1112, and MAX1113
        hwmon: (lm70) Add support for LM71 and LM74
        hwmon: (Documentation) Update feature-removal-schedule.txt
        hwmon: (w83793) Remove legacy chassis intrusion detection sysfs attributes
        hwmon: (w83792d) Remove legacy chassis intrusion detection attributes
        hwmon: (adm9240) Remove legacy chassis intrusion detection sysfs attribute
        hwmon: (lm70) Allow 4wire SPI bus with LM70
        hwmon: (sht15) remove multiple driver registration
    • Linus Torvalds's avatar
      Merge tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · d9a80746
      Linus Torvalds authored
      Pull USB changes from Greg Kroah-Hartman:
       "Here is the big USB pull request for 3.7-rc1
        There are lots of gadget driver changes (including copying a bunch of
        files into the drivers/staging/ccg/ directory so that the other gadget
        drivers can be fixed up properly without breaking that driver), and we
        remove the old obsolete ub.c driver from the tree.
        There are also the usual XHCI set of updates, and other various driver
        changes and updates.  We also are trying hard to remove the old dbg()
        macro, but the final bits of that removal will be coming in through
        the networking tree before we can delete it for good.
        All of these patches have been in the linux-next tree.
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      Fix up several annoying - but fairly mindless - conflicts due to the
      termios structure having moved into the tty device, and often clashing
      with dbg -> dev_dbg conversion.
      * tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (339 commits)
        USB: ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc
        USB: uas: fix gcc warning
        USB: uas: fix locking
        USB: Fix race condition when removing host controllers
        USB: uas: add locking
        USB: uas: fix abort
        USB: uas: remove aborted field, replace with status bit.
        USB: uas: fix task management
        USB: uas: keep track of command urbs
        xhci: Intel Panther Point BEI quirk.
        powerpc/usb: remove checking PHY_CLK_VALID for UTMI PHY
        USB: ftdi_sio: add TIAO USB Multi-Protocol Adapter (TUMPA) support
        Revert "usb : Add sysfs files to control port power."
        USB: serial: remove vizzini driver
        usb: host: xhci: Fix Null pointer dereferencing with 71c731a2 for non-x86 systems
        Increase XHCI suspend timeout to 16ms
        USB: ohci-at91: fix null pointer in ohci_hcd_at91_overcurrent_irq
        USB: sierra_ms: don't keep unused variable
        fsl/usb: Add support for USB controller version 2.4
        USB: qcaux: add Pantech vendor class match
    • Linus Torvalds's avatar
      Merge tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 3498d13b
      Linus Torvalds authored
      Pull TTY changes from Greg Kroah-Hartman:
       "As we skipped the merge window for 3.6-rc1 for the tty tree,
        everything is now settled down and working properly, so we are ready
        for 3.7-rc1.  Here's the patchset, it's big, but the large changes are
        removing a firmware file and adding a staging tty driver (it depended
        on the tty core changes, so it's going through this tree instead of
        the staging tree.)
        All of these patches have been in the linux-next tree for a while.
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      Fix up more-or-less trivial conflicts in
       - drivers/char/pcmcia/synclink_cs.c:
          tty NULL dereference fix vs tty_port_cts_enabled() helper function
       - drivers/staging/{Kconfig,Makefile}:
          add-add conflict (dgrp driver added close to other staging drivers)
       - drivers/staging/ipack/devices/ipoctal.c:
          "split ipoctal_channel from iopctal" vs "TTY: use tty_port_register_device"
      * tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (235 commits)
        tty/serial: Add kgdb_nmi driver
        tty/serial/amba-pl011: Quiesce interrupts in poll_get_char
        tty/serial/amba-pl011: Implement poll_init callback
        tty/serial/core: Introduce poll_init callback
        kdb: Turn KGDB_KDB=n stubs into static inlines
        kdb: Implement disable_nmi command
        kernel/debug: Mask KGDB NMI upon entry
        serial: pl011: handle corruption at high clock speeds
        serial: sccnxp: Make 'default' choice in switch last
        serial: sccnxp: Remove mask termios caps for SW flow control
        serial: sccnxp: Report actual baudrate back to core
        serial: samsung: Add poll_get_char & poll_put_char
        Powerpc 8xx CPM_UART setting MAXIDL register proportionaly to baud rate
        Powerpc 8xx CPM_UART maxidl should not depend on fifo size
        Powerpc 8xx CPM_UART too many interrupts
        Powerpc 8xx CPM_UART desynchronisation
        serial: set correct baud_base for EXSYS EX-41092 Dual 16950
        serial: omap: fix the reciever line error case
        8250: blacklist Winbond CIR port
        8250_pnp: do pnp probe before legacy probe
    • Linus Torvalds's avatar
      Merge tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · def7cb8c
      Linus Torvalds authored
      Pull staging tree update from Greg Kroah-Hartman:
       "Here is the big staging tree update for the 3.7-rc1 merge window.
        There are a few patches in here that are outside of the staging area,
        namely HID and IIO patches, but all of them have been acked by the
        relevant subsystem maintainers.  The IIO stuff is still coming in
        through this tree as it hasn't entirely moved out of the staging tree,
        but is almost there.
        Other than that, there wa a ton of work on the comedi drivers to make
        them more readable and the correct style.  Doing that removed a lot of
        code, but we added a new driver to the staging tree, so we didn't end
        up with a net reduction this time around:
         662 files changed, 51649 insertions(+), 26582 deletions(-)
        All of these patches have been in the linux-next tree already.
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      * tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1094 commits)
        staging: comedi: jr3_pci: fix iomem dereference
        staging: comedi: drivers: use comedi_fc.h cmdtest helpers
        Staging: winbond: usb_free_urb(NULL) is safe
        Staging: winbond: checkpatch cleanup
        Staging: winbond: Removed undesired spaces, lines and tabs
        Staging: winbond: Typo corrections in comments
        Staging: winbond: Changed c99 comments to c89 comments
        staging: r8712u: Do not queue cloned skb
        staging: comedi: ni_mio_common: always lock in ni_ai_poll()
        staging: comedi: s626: add FIXME comment
        staging: comedi: s626: don't dereference insn->data
        staging: comedi: s526: fix if() check in s526_gpct_winsn()
        staging: comedi: s626: cleanup comments in s626_initialize()
        staging: comedi: s626: remove clear of kzalloc'ed data
        staging: comedi: s626: remove 'WDInterval' from private data
        staging: comedi: s626: remove 'ChargeEnabled' from private data
        staging: comedi: s626: remove 'IsBoardRevA' comment
        staging: comedi: s626: #if 0 out the "SAA7146 BUG WORKAROUND"
        staging: comedi: s626: remove 'allocatedBuf' from private data
        staging: comedi: s626: add final attach message
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 06d2fe15
      Linus Torvalds authored
      Pull driver core merge from Greg Kroah-Hartman:
       "Here is the big driver core update for 3.7-rc1.
        A number of firmware_class.c updates (as you saw a month or so ago),
        and some hyper-v updates and some printk fixes as well.  All patches
        that are outside of the drivers/base area have been acked by the
        respective maintainers, and have all been in the linux-next tree for a
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      * tag 'driver-core-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (95 commits)
        memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()
        device.h: Add missing inline to #ifndef CONFIG_PRINTK dev_vprintk_emit
        memory: emif: Add ifdef CONFIG_DEBUG_FS guard for emif_debugfs_[init|exit]
        Documentation: Fixes some translation error in Documentation/zh_CN/gpio.txt
        Documentation: Remove 3 byte redundant code at the head of the Documentation/zh_CN/arm/booting
        Documentation: Chinese translation of Documentation/video4linux/omap3isp.txt
        device and dynamic_debug: Use dev_vprintk_emit and dev_printk_emit
        dev: Add dev_vprintk_emit and dev_printk_emit
        netdev_printk/netif_printk: Remove a superfluous logging colon
        netdev_printk/dynamic_netdev_dbg: Directly call printk_emit
        dev_dbg/dynamic_debug: Update to use printk_emit, optimize stack
        driver-core: Shut up dev_dbg_reatelimited() without DEBUG
        tools/hv: Parse /etc/os-release
        tools/hv: Check for read/write errors
        tools/hv: Fix exit() error code
        tools/hv: Fix file handle leak
        Tools: hv: Implement the KVP verb - KVP_OP_GET_IP_INFO
        Tools: hv: Rename the function kvp_get_ip_address()
        Tools: hv: Implement the KVP verb - KVP_OP_SET_IP_INFO
        Tools: hv: Add an example script to configure an interface
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 3aebd34b
      Linus Torvalds authored
      Pull char/misc driver merge from Greg Kroah-Hartman:
       "Here is the "big" char/misc driver tree update for the 3.7-rc1 merge
        Nothing major, just a number of driver updates and fixes, all of which
        have been in the linux-next releases for a while now either in my
        tree, or in Andrew's (the lis3l driver changes came from his tree last
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      * tag 'char-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (52 commits)
        drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init
        drivers/misc/lis3lv02d/lis3lv02d_spi.c: add lis3lv02d device tree init
        drivers/misc/lis3lv02d: remove lis3lv02d driver DT init
        drivers/misc/lis3lv02d/lis3lv02d_spi.c: add DT matching table passthru code
        drivers/misc/lis3lv02d: add generic DT matching code
        lis3lv02d: fix some comments specific to lis331dlh driver
        MISC: hpilo, remove pci_disable_device
        pcmcia: synclink_cs: fix potential tty NULL dereference
        drivers/char/mmtimer.c: Remove useless kfree
        drivers/char: removes unnecessary semicolon
        char/misc: remove CONFIG_EXPERIMENTAL dependencies
        mei: don't print buffer as a string
        mei: struct mei_message_data doesn't have to be packed
        mei: add error messages for open count errors
        misc: use module_spi_driver
        tifm: use module_pci_driver
        misc/at25, dt: Improve at25 SPI eeprom device tree bindings.
        mei: add lynx point pci device ids
        mei: fix max number of open handles
        mei: rename struct pci_dev *mei_device to mei_pdev
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux · 2c0c86d5
      Linus Torvalds authored
      Pull clk framework update from Michael Turquette:
       "The common clk framework changes for 3.7 are dominated by ARM platform
        ports to the framework along with one MIPS port, one MFD port, one
        minor framework enhancement and one helper function for platforms
        expressing their clock data through device tree."
      * tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux:
        clk: add of_clk_src_onecell_get() support
        clk: ux500: Define smp_twd clock for u8500
        mfd: dbx500: Provide a more accurate smp_twd clock
        clk: ux500: Support for prmcu_rate clock
        clk: Provide option for clk_get_rate to issue hw for new rate
        clock: max77686: Add driver for Maxim 77686 32Khz crystal oscillator.
        ARM: ux500: Switch to use common clock framework
        clk: ux500: Clock definitions for u8500
        clk: ux500: First version of clock definitions for ux500
        clk: ux500: Adapt PRCMU and PRCC clocks for common clk
        clk: versatile: make config option boolean
        clk: add Loongson1B clock support
        arm: mmp: make all SOCs use common clock by default
        clk: mmp: add clock definition for mmp2
        clk: mmp: add clock definition for pxa910
        clk: mmp: add clock definition for pxa168
        clk: mmp: add mmp specific clocks
        clk: convert ARM RealView to common clk
        clk: prima2: move from arch/arm/mach to drivers/clk
        ARM: PRIMA2: convert to common clk and finish full clk tree
    • Linus Torvalds's avatar
      Merge tag 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · fdb2f9c2
      Linus Torvalds authored
      Pull PCI changes from Bjorn Helgaas:
       "Host bridge hotplug
          - Protect acpi_pci_drivers and acpi_pci_roots (Taku Izumi)
          - Clear host bridge resource info to avoid issue when releasing
            (Yinghai Lu)
          - Notify acpi_pci_drivers when hot-plugging host bridges (Jiang Liu)
          - Use standard list ops for acpi_pci_drivers (Jiang Liu)
        Device hotplug
          - Use pci_get_domain_bus_and_slot() to close hotplug races (Jiang
          - Remove fakephp driver (Bjorn Helgaas)
          - Fix VGA ref count in hotplug remove path (Yinghai Lu)
          - Allow acpiphp to handle PCIe ports without native hotplug (Jiang
          - Implement resume regardless of pciehp_force param (Oliver Neukum)
          - Make pci_fixup_irqs() work after init (Thierry Reding)
          - Add pci_pcie_type(dev) and remove pci_dev.pcie_type (Yijing Wang)
          - Factor out PCI Express Capability accessors (Jiang Liu)
          - Add pcibios_window_alignment() so powerpc EEH can use generic
            resource assignment (Gavin Shan)
          - Make pci_error_handlers const (Stephen Hemminger)
          - Cleanup drivers/pci/remove.c (Bjorn Helgaas)
          - Improve Vendor-Specific Extended Capability support (Bjorn
          - Use standard list ops for bus->devices (Bjorn Helgaas)
          - Avoid kmalloc in pci_get_subsys() and pci_get_class() (Feng Tang)
          - Reassign invalid bus number ranges (Intel DP43BF workaround)
            (Yinghai Lu)"
      * tag 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (102 commits)
        PCI: acpiphp: Handle PCIe ports without native hotplug capability
        PCI/ACPI: Use acpi_driver_data() rather than searching acpi_pci_roots
        PCI/ACPI: Protect acpi_pci_roots list with mutex
        PCI/ACPI: Use acpi_pci_root info rather than looking it up again
        PCI/ACPI: Pass acpi_pci_root to acpi_pci_drivers' add/remove interface
        PCI/ACPI: Protect acpi_pci_drivers list with mutex
        PCI/ACPI: Notify acpi_pci_drivers when hot-plugging PCI root bridges
        PCI/ACPI: Use normal list for struct acpi_pci_driver
        PCI/ACPI: Use DEVICE_ACPI_HANDLE rather than searching acpi_pci_roots
        PCI: Fix default vga ref_count
        ia64/PCI: Clear host bridge aperture struct resource
        x86/PCI: Clear host bridge aperture struct resource
        PCI: Stop all children first, before removing all children
        Revert "PCI: Use hotplug-safe pci_get_domain_bus_and_slot()"
        PCI: Provide a default pcibios_update_irq()
        PCI: Discard __init annotations for pci_fixup_irqs() and related functions
        PCI: Use correct type when freeing bus resource list
        PCI: Check P2P bridge for invalid secondary/subordinate range
        PCI: Convert "new_id"/"remove_id" into generic pci_bus driver attributes
        xen-pcifront: Use hotplug-safe pci_get_domain_bus_and_slot()
    • Linus Torvalds's avatar
      Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 81f56e53
      Linus Torvalds authored
      Pull arm64 support from Catalin Marinas:
       "Linux support for the 64-bit ARM architecture (AArch64)
        Features currently supported:
         - 39-bit address space for user and kernel (each)
         - 4KB and 64KB page configurations
         - Compat (32-bit) user applications (ARMv7, EABI only)
         - Flattened Device Tree (mandated for all AArch64 platforms)
         - ARM generic timers"
      * tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (35 commits)
        arm64: ptrace: remove obsolete ptrace request numbers from user headers
        arm64: Do not set the SMP/nAMP processor bit
        arm64: MAINTAINERS update
        arm64: Build infrastructure
        arm64: Miscellaneous header files
        arm64: Generic timers support
        arm64: Loadable modules
        arm64: Miscellaneous library functions
        arm64: Performance counters support
        arm64: Add support for /proc/sys/debug/exception-trace
        arm64: Debugging support
        arm64: Floating point and SIMD
        arm64: 32-bit (compat) applications support
        arm64: User access library functions
        arm64: Signal handling support
        arm64: VDSO support
        arm64: System calls handling
        arm64: ELF definitions
        arm64: SMP support
        arm64: DMA mapping API
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 6c09931b
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "The main new feature is machine support for System zEC12 including
        transactional memory, runtime instrumentation, support for scm block
        devices via eadm subchannels, and support for CEX4 crypto cards.
        In addition there are some nice improvements: bpf jit compiler, arch
        backend for cmpxchg_double, relative exception table entries, dasd
        partition detection independent from the dasd driver ioctls, and cpu
        cache information in /proc/cpuinfo and /sys/device/cpu.
        And last but not least a series of cleanup patches from Heiko."
      Fix up trivial add-add conflict in arch/s390/Kconfig due to commit
      b952741c ("cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING")
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (76 commits)
        s390: update defconfig
        s390/jump label,nss: let shared kernel support depend on !JUMP_LABEL
        s390/disassembler: fix decoding of risblg instruction
        s390/bpf,jit: add support for BPF_S_ANC_ALU_XOR_X instruction
        s390/traps: move call to print_modules() out of show_regs()
        s390/mm: mark free_initrd_mem() as __init
        s390/dasd: check count address during online setting
        drivers/s390/char/monreader.c: fix error return code
        s390/cmpxchg,percpu: implement cmpxchg_double()
        s390/percpu: implement this_cpu_add_return()
        s390/percpu: implement this_cpu_xchg()
        s390/kexec: remove CONFIG_KEXEC
        s390/irq: use designated initializers for irq class array
        s390: add uninitialized_var() to suppress false positive compiler warnings
        s390/crashdump: move fill_cpu_elf_notes() prototype to header file
        s390/process: add missing header include
        s390/ptrace: add missing ifdef
        s390/ipl,decrompressor: disable branch profiling
        s390/perf_events: compile only for CONFIG_64BIT
        s390/tape: remove even more tape block leftovers