1. 17 Jun, 2014 9 commits
    • Dan Carpenter's avatar
      misc: vexpress: fix error handling vexpress_syscfg_regmap_init() · fc96e661
      Dan Carpenter authored
      This function should be returning an ERR_PTR() on failure instead of
      NULL.  Also there is a use after free bug if regmap_init() fails because
      we free "func" and then dereference doing the return.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Acked-by: default avatarPawel Moll <pawel.moll@arm.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      fc96e661
    • Stephen Boyd's avatar
      ARM: Remove ARCH_HAS_CPUFREQ config option · 19682f72
      Stephen Boyd authored
      This config exists entirely to hide the cpufreq menu from the
      kernel configuration unless a platform has selected it. Nothing
      is actually built if this config is 'Y' and it just leads to more
      patches that add a select under a platform Kconfig so that some
      other CPUfreq option can be chosen. Let's remove the option so
      that we can always enable CPUfreq drivers on ARM platforms.
      Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
      Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      19682f72
    • Linus Walleij's avatar
      ARM: integrator: fix section mismatch problem · e1318391
      Linus Walleij authored
      This addresses a section mismatch problem in the IM-PD1
      driver in the Integrator/AP.
      
      The IM-PD1 contains a VIC interrupt controller and therefore
      the driver calls vic_init_cascaded() which is marked __init as
      irqchips are simply not hot-pluggable and specifically the VIC
      is assumed to initiate only on boot.
      
      However the module driver model of the Integrator LM bus
      assumes that logic tile drivers can be probed at runtime. This
      is not really the case for IM-PD1: these tiles are detected at
      boot and they cannot be plugged into a running system. Before
      this patch it is of course possible to modprobe them later.
      
      By first forcing the IM-PD1 to bool we make sure this driver
      gets compiled into the kernel, and we know it will be probed
      only at boot time when the tiles are detected, so we can tag
      its probe function __init_refok as we know it won't be called
      after boot now, and the section mismatch problem goes away.
      
      As a side effect, sysfs binding from userspace becomes
      impossible, so we tag the driver to suppress the bind/unbind
      sysfs attributes.
      
      Cc: Russell King <linux@arm.linux.org.uk>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      e1318391
    • Jason Cooper's avatar
      ARM: mvebu: DT: fix OpenBlocks AX3-4 RAM size · e47043ae
      Jason Cooper authored
      The OpenBlocks AX3-4 has a non-DT bootloader.  It also comes with 1GB of
      soldered on RAM, and a DIMM slot for expansion.
      
      Unfortunately, atags_to_fdt() doesn't work in big-endian mode, so we see
      the following failure when attempting to boot a big-endian kernel:
      
        686 slab pages
        17 pages shared
        0 pages swap cached
        [ pid ]   uid  tgid total_vm      rss nr_ptes swapents oom_score_adj name
        Kernel panic - not syncing: Out of memory and no killable processes...
      
        CPU: 1 PID: 351 Comm: kworker/u4:0 Not tainted 3.15.0-rc8-next-20140603 #1
        [<c0215a54>] (unwind_backtrace) from [<c021160c>] (show_stack+0x10/0x14)
        [<c021160c>] (show_stack) from [<c0802500>] (dump_stack+0x78/0x94)
        [<c0802500>] (dump_stack) from [<c0800068>] (panic+0x90/0x21c)
        [<c0800068>] (panic) from [<c02b5704>] (out_of_memory+0x320/0x340)
        [<c02b5704>] (out_of_memory) from [<c02b93a0>] (__alloc_pages_nodemask+0x874/0x930)
        [<c02b93a0>] (__alloc_pages_nodemask) from [<c02d446c>] (handle_mm_fault+0x744/0x96c)
        [<c02d446c>] (handle_mm_fault) from [<c02cf250>] (__get_user_pages+0xd0/0x4c0)
        [<c02cf250>] (__get_user_pages) from [<c02f3598>] (get_arg_page+0x54/0xbc)
        [<c02f3598>] (get_arg_page) from [<c02f3878>] (copy_strings+0x278/0x29c)
        [<c02f3878>] (copy_strings) from [<c02f38bc>] (copy_strings_kernel+0x20/0x28)
        [<c02f38bc>] (copy_strings_kernel) from [<c02f4f1c>] (do_execve+0x3a8/0x4c8)
        [<c02f4f1c>] (do_execve) from [<c025ac10>] (____call_usermodehelper+0x15c/0x194)
        [<c025ac10>] (____call_usermodehelper) from [<c020e9b8>] (ret_from_fork+0x14/0x3c)
        CPU0: stopping
        CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.15.0-rc8-next-20140603 #1
        [<c0215a54>] (unwind_backtrace) from [<c021160c>] (show_stack+0x10/0x14)
        [<c021160c>] (show_stack) from [<c0802500>] (dump_stack+0x78/0x94)
        [<c0802500>] (dump_stack) from [<c021429c>] (handle_IPI+0x138/0x174)
        [<c021429c>] (handle_IPI) from [<c02087f0>] (armada_370_xp_handle_irq+0xb0/0xcc)
        [<c02087f0>] (armada_370_xp_handle_irq) from [<c0212100>] (__irq_svc+0x40/0x50)
        Exception stack(0xc0b6bf68 to 0xc0b6bfb0)
        bf60:                   e9fad598 00000000 00f509a3 00000000 c0b6a000 c0b724c4
        bf80: c0b72458 c0b6a000 00000000 00000000 c0b66da0 c0b6a000 00000000 c0b6bfb0
        bfa0: c027bb94 c027bb24 60000313 ffffffff
        [<c0212100>] (__irq_svc) from [<c027bb24>] (cpu_startup_entry+0x54/0x214)
        [<c027bb24>] (cpu_startup_entry) from [<c0ac5b30>] (start_kernel+0x318/0x37c)
        [<c0ac5b30>] (start_kernel) from [<00208078>] (0x208078)
        ---[ end Kernel panic - not syncing: Out of memory and no killable processes...
      
      A similar failure will also occur if ARM_ATAG_DTB_COMPAT isn't selected.
      
      Fix this by setting a sane default (1 GB) in the dts file.
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      Tested-by: default avatarKevin Hilman <khilman@linaro.org>
      Cc: <stable@vger.kernel.org> #v3.13+
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      e47043ae
    • Arnd Bergmann's avatar
      ARM: samsung: make SAMSUNG_DMADEV optional · 27873b05
      Arnd Bergmann authored
      The only remaining driver using the samsung dmadev code is the broken
      samsung-ac97 sound driver. However, as found by Russell's autobuilder,
      the elaborate dependency chains around it cause problems with
      circular dependencies.
      
      This is an attempt to simplify those dependencies by making the
      SAMSUNG_DMADEV option user-selectable. I also try to keep the
      default settings for all related options unchanged, so we don't
      introduce any regressions against earlier testing on linux-next.
      
      In particular, all s3c64xx and s5p* platforms keep selecting the
      pl330 and pl08x drivers they require, but the select statement
      is now moved towards the main platform option, and it remains
      optional by unselecting CONFIG_DMADEVICES.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: Kukjin Kim <kgene.kim@samsung.com>
      27873b05
    • Arnd Bergmann's avatar
      remoteproc: da8xx: don't select CMA on no-MMU · 8c094524
      Arnd Bergmann authored
      We can only use CMA on systems that have an MMU, because of
      the requirement to use memory migration. NOMMU systems are
      rather constrained to start with, but it seems reasonable
      to assume that DMA allocations can still succeed in the
      constrained case for remoteproc on NOMMU, so this patch
      changes the da8xx implementation to not rely on CMA when
      the MMU is disabled.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: Ohad Ben-Cohen <ohad@wizery.com>
      Cc: Robert Tivy <rtivy@ti.com>
      8c094524
    • Arnd Bergmann's avatar
      bus/arm-cci: add dependency on OF && CPU_V7 · 30b6f37d
      Arnd Bergmann authored
      The arm-cci code uses device tree helpers for initialization
      that don't work on kernels built without CONFIG_OF. Further,
      it contains an inline assembly in cci_enable_port_for_self()
      that uses ARMv7 instructions and fails to build when targetting
      other ARM instruction set versions.
      
      This works around both issues by limiting the scope of the
      Kconfig symbol to platforms that can actually build this driver
      cleanly.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      30b6f37d
    • Arnd Bergmann's avatar
      ARM: keystone requires ARM_PATCH_PHYS_VIRT · 13ee8955
      Arnd Bergmann authored
      The dynamic relocation that the keystone platform performs
      only works if we can pick the phys offset at boot time. It's
      possible that there is another solution for this, but this
      is the easiest workaround. Kernels with ARM_PATCH_PHYS_VIRT
      are not portable across platforms, and I see no reason why
      anyone would run a kernel without ARM_PATCH_PHYS_VIRT on
      keystone.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
      13ee8955
    • Arnd Bergmann's avatar
      ARM: omap2: fix am43xx dependency on l2x0 cache · 2ad501cc
      Arnd Bergmann authored
      Commit d941f86f ("ARM: l2c: AM43x: add L2 cache support") enabled
      the L2 cache support for the am43xx SoC, but caused a build regression
      when the driver for that cache controller is disabled:
      
      arch/arm/mach-omap2/built-in.o: In function `am43xx_init_early':
      :(.init.text+0xb20): undefined reference to `omap_l2_cache_init'
      
      This did not happen for OMAP4, which has the same call, but enables
      the l2x0 driver unconditionally. We could do the same thing for
      am43xx, but it seems better to allow turning it off and make the
      code work in either case.
      
      This adds an inline wrapper for omap_l2_cache_init for the disabled
      case, and removes the 'select' from OMAP4 so it becomes a user
      visible option.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarTony Lindgren <tony@atomide.com>
      Cc: linux-omap@vger.kernel.org
      2ad501cc
  2. 11 Jun, 2014 11 commits
    • Linus Torvalds's avatar
      Merge tag 'soc2-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 2dc24b0d
      Linus Torvalds authored
      Pull part two of ARM SoC updates from Arnd Bergmann:
       "This is a small follow-up to the larger ARM SoC updates merged last
        week, almost entirely for the keystone platform.
      
        The main change here is to use the new dma-ranges parsing code that
        came in through Russell's ARM tree.  This allows the keystone platform
        to do cache-coherent DMA and to finally support all the available
        physical memory when LPAE is enabled.
      
        Aside from this, the keystone reset driver has been rewritten, and
        there is a small bug fix to allow building the orion5x platform again"
      
      * tag 'soc2-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: keystone: Drop use of meminfo since its not available anymore
        ARM: orion5x: fix mvebu_mbus_dt_init call
        ARM: configs: keystone: enable reset driver support
        ARM: dts: keystone: update reset node to work with reset driver
        ARM: keystone: remove redundant reset stuff
        ARM: keystone: Update the dma offset for non-dt platform devices
        ARM: keystone: Switch over to coherent memory address space
        ARM: configs: keystone: add MTD_SPI_NOR (new dependency for M25P80)
        ARM: configs: keystone: drop CONFIG_COMMON_CLK_DEBUG
      2dc24b0d
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 2840c566
      Linus Torvalds authored
      Pull reiserfs and ext3 changes from Jan Kara:
       "Big reiserfs cleanup from Jeff, an ext3 deadlock fix, and some small
        cleanups"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: (34 commits)
        reiserfs: Fix compilation breakage with CONFIG_REISERFS_CHECK
        ext3: Fix deadlock in data=journal mode when fs is frozen
        reiserfs: call truncate_setsize under tailpack mutex
        fs/jbd/revoke.c: replace shift loop by ilog2
        reiserfs: remove obsolete __constant_cpu_to_le32
        reiserfs: balance_leaf refactor, split up balance_leaf_when_delete
        reiserfs: balance_leaf refactor, format balance_leaf_finish_node
        reiserfs: balance_leaf refactor, format balance_leaf_new_nodes_paste
        reiserfs: balance_leaf refactor, format balance_leaf_paste_right
        reiserfs: balance_leaf refactor, format balance_leaf_insert_right
        reiserfs: balance_leaf refactor, format balance_leaf_paste_left
        reiserfs: balance_leaf refactor, format balance_leaf_insert_left
        reiserfs: balance_leaf refactor, pull out balance_leaf{left, right, new_nodes, finish_node}
        reiserfs: balance_leaf refactor, pull out balance_leaf_finish_node_paste
        reiserfs: balance_leaf refactor pull out balance_leaf_finish_node_insert
        reiserfs: balance_leaf refactor, pull out balance_leaf_new_nodes_paste
        reiserfs: balance_leaf refactor, pull out balance_leaf_new_nodes_insert
        reiserfs: balance_leaf refactor, pull out balance_leaf_paste_right
        reiserfs: balance_leaf refactor, pull out balance_leaf_insert_right
        reiserfs: balance_leaf refactor, pull out balance_leaf_paste_left
        ...
      2840c566
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 859862dd
      Linus Torvalds authored
      Pull btrfs updates from Chris Mason:
       "The biggest change here is Josef's rework of the btrfs quota
        accounting, which improves the in-memory tracking of delayed extent
        operations.
      
        I had been working on Btrfs stack usage for a while, mostly because it
        had become impossible to do long stress runs with slab, lockdep and
        pagealloc debugging turned on without blowing the stack.  Even though
        you upgraded us to a nice king sized stack, I kept most of the
        patches.
      
        We also have some very hard to find corruption fixes, an awesome sysfs
        use after free, and the usual assortment of optimizations, cleanups
        and other fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (80 commits)
        Btrfs: convert smp_mb__{before,after}_clear_bit
        Btrfs: fix scrub_print_warning to handle skinny metadata extents
        Btrfs: make fsync work after cloning into a file
        Btrfs: use right type to get real comparison
        Btrfs: don't check nodes for extent items
        Btrfs: don't release invalid page in btrfs_page_exists_in_range()
        Btrfs: make sure we retry if page is a retriable exception
        Btrfs: make sure we retry if we couldn't get the page
        btrfs: replace EINVAL with EOPNOTSUPP for dev_replace raid56
        trivial: fs/btrfs/ioctl.c: fix typo s/substract/subtract/
        Btrfs: fix leaf corruption after __btrfs_drop_extents
        Btrfs: ensure btrfs_prev_leaf doesn't miss 1 item
        Btrfs: fix clone to deal with holes when NO_HOLES feature is enabled
        btrfs: free delayed node outside of root->inode_lock
        btrfs: replace EINVAL with ERANGE for resize when ULLONG_MAX
        Btrfs: fix transaction leak during fsync call
        btrfs: Avoid trucating page or punching hole in a already existed hole.
        Btrfs: update commit root on snapshot creation after orphan cleanup
        Btrfs: ioctl, don't re-lock extent range when not necessary
        Btrfs: avoid visiting all extent items when cloning a range
        ...
      859862dd
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-3.16-rc1' of git://oss.sgi.com/xfs/xfs · 412dd3a6
      Linus Torvalds authored
      Pull xfs updates from Dave Chinner:
       "This update contains:
         - cleanup removing unused function args
         - rework of the filestreams allocator to use dentry cache parent
           lookups
         - new on-disk free inode btree and optimised inode allocator
         - various bug fixes
         - rework of internal attribute API
         - cleanup of superblock feature bit support to remove historic cruft
         - more fixes and minor cleanups
         - added a new directory/attribute geometry abstraction
         - yet more fixes and minor cleanups"
      
      * tag 'xfs-for-linus-3.16-rc1' of git://oss.sgi.com/xfs/xfs: (86 commits)
        xfs: fix xfs_da_args sparse warning in xfs_readdir
        xfs: Fix rounding in xfs_alloc_fix_len()
        xfs: tone down writepage/releasepage WARN_ONs
        xfs: small cleanup in xfs_lowbit64()
        xfs: kill xfs_buf_geterror()
        xfs: xfs_readsb needs to check for magic numbers
        xfs: block allocation work needs to be kswapd aware
        xfs: remove redundant geometry information from xfs_da_state
        xfs: replace attr LBSIZE with xfs_da_geometry
        xfs: pass xfs_da_args to xfs_attr_leaf_newentsize
        xfs: use xfs_da_geometry for block size in attr code
        xfs: remove mp->m_dir_geo from directory logging
        xfs: reduce direct usage of mp->m_dir_geo
        xfs: move node entry counts to xfs_da_geometry
        xfs: convert dir/attr btree threshold to xfs_da_geometry
        xfs: convert m_dirblksize to xfs_da_geometry
        xfs: convert m_dirblkfsbs to xfs_da_geometry
        xfs: convert directory segment limits to xfs_da_geometry
        xfs: convert directory db conversion to xfs_da_geometry
        xfs: convert directory dablk conversion to xfs_da_geometry
        ...
      412dd3a6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 23d4ed53
      Linus Torvalds authored
      Pull block layer fixes from Jens Axboe:
       "Final small batch of fixes to be included before -rc1.  Some general
        cleanups in here as well, but some of the blk-mq fixes we need for the
        NVMe conversion and/or scsi-mq.  The pull request contains:
      
         - Support for not merging across a specified "chunk size", if set by
           the driver.  Some NVMe devices perform poorly for IO that crosses
           such a chunk, so we need to support it generically as part of
           request merging avoid having to do complicated split logic.  From
           me.
      
         - Bump max tag depth to 10Ki tags.  Some scsi devices have a huge
           shared tag space.  Before we failed with EINVAL if a too large tag
           depth was specified, now we truncate it and pass back the actual
           value.  From me.
      
         - Various blk-mq rq init fixes from me and others.
      
         - A fix for enter on a dying queue for blk-mq from Keith.  This is
           needed to prevent oopsing on hot device removal.
      
         - Fixup for blk-mq timer addition from Ming Lei.
      
         - Small round of performance fixes for mtip32xx from Sam Bradshaw.
      
         - Minor stack leak fix from Rickard Strandqvist.
      
         - Two __init annotations from Fabian Frederick"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: add __init to blkcg_policy_register
        block: add __init to elv_register
        block: ensure that bio_add_page() always accepts a page for an empty bio
        blk-mq: add timer in blk_mq_start_request
        blk-mq: always initialize request->start_time
        block: blk-exec.c: Cleaning up local variable address returnd
        mtip32xx: minor performance enhancements
        blk-mq: ->timeout should be cleared in blk_mq_rq_ctx_init()
        blk-mq: don't allow queue entering for a dying queue
        blk-mq: bump max tag depth to 10K tags
        block: add blk_rq_set_block_pc()
        block: add notion of a chunk size for request merging
      23d4ed53
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20140610' of git://git.infradead.org/linux-mtd · e413a19a
      Linus Torvalds authored
      Pull MTD updates from Brian Norris:
       - refactor m25p80.c driver for use as a general SPI NOR framework for
         other drivers which may speak to SPI NOR flash without providing full
         SPI support (i.e., not part of drivers/spi/)
       - new Freescale QuadSPI driver (utilizing new SPI NOR framework)
       - updates for the STMicro "FSM" SPI NOR driver
       - fix sync/flush behavior on mtd_blkdevs
       - fixup subpage write support on a few NAND drivers
       - correct the MTD OOB test for odd-sized OOB areas
       - add BCH-16 support for OMAP NAND
       - fix warnings and trivial refactoring
       - utilize new ECC DT bindings in pxa3xx NAND driver
       - new LPDDR NVM driver
       - address a few assorted bugs caught by Coverity
       - add new imx6sx support for GPMI NAND
       - use a bounce buffer for NAND when non-DMA-able buffers are used
      
      * tag 'for-linus-20140610' of git://git.infradead.org/linux-mtd: (77 commits)
        mtd: gpmi: add gpmi support for imx6sx
        mtd: maps: remove check for CONFIG_MTD_SUPERH_RESERVE
        mtd: bf5xx_nand: use the managed version of kzalloc
        mtd: pxa3xx_nand: make the driver work on big-endian systems
        mtd: nand: omap: fix omap_calculate_ecc_bch() for-loop error
        mtd: nand: r852: correct write_buf loop bounds
        mtd: nand_bbt: handle error case for nand_create_badblock_pattern()
        mtd: nand_bbt: remove unused variable
        mtd: maps: sc520cdp: fix warnings
        mtd: slram: fix unused variable warning
        mtd: pfow: remove unused variable
        mtd: lpddr: fix Kconfig dependency, for I/O accessors
        mtd: nand: pxa3xx: Add supported ECC strength and step size to the DT binding
        mtd: nand: pxa3xx: Use ECC strength and step size devicetree binding
        mtd: nand: pxa3xx: Clean pxa_ecc_init() error handling
        mtd: nand: Warn the user if the selected ECC strength is too weak
        mtd: nand: omap: Documentation: How to select correct ECC scheme for your device ?
        mtd: nand: omap: add support for BCH16_ECC - NAND driver updates
        mtd: nand: omap: add support for BCH16_ECC - ELM driver updates
        mtd: nand: omap: add support for BCH16_ECC - GPMC driver updates
        ...
      e413a19a
    • Linus Torvalds's avatar
      Merge tag 'md/3.16' of git://neil.brown.name/md · 8d0304e6
      Linus Torvalds authored
      Pull md updates from Neil Brown:
       "Assorted md fixes for 3.16
      
        Mostly performance improvements with a few corner-case bug fixes"
      
      * tag 'md/3.16' of git://neil.brown.name/md:
        raid5: speedup sync_request processing
        md/raid5: deadlock between retry_aligned_read with barrier io
        raid5: add an option to avoid copy data from bio to stripe cache
        md/bitmap: remove confusing code from filemap_get_page.
        raid5: avoid release list until last reference of the stripe
        md: md_clear_badblocks should return an error code on failure.
        md/raid56: Don't perform reads to support writes until stripe is ready.
        md: refuse to change shape of array if it is active but read-only
      8d0304e6
    • Jan Kara's avatar
      reiserfs: Fix compilation breakage with CONFIG_REISERFS_CHECK · 19ef1229
      Jan Kara authored
      There was a bug in debug printout when CONFIG_REISERFS_CHECK was
      enabled so one of the assertions in do_balan.c didn't compile. Fix it.
      
      Fixes: 0080e9f9Signed-off-by: default avatarJan Kara <jack@suse.cz>
      19ef1229
    • Brian Norris's avatar
      Merge MTD pullreq from 3.15-rc5 · f1900c79
      Brian Norris authored
      f1900c79
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · dfb94547
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
       "This contains:
         - addition of the Intel MID watchdog
         - removal of W83697HF and W83697UG drivers (code was merged into
           w83627hf_wdt driver)
         - addition of Armada 375/380 SoC support
         - conversion of imx2_wdt to regmap API and to watchdog core API
         - lots of other small improvements and fixes"
      
      [ Wim was also tagged by gmail as a spammer, but not delayed by days
        unlike Ben ]
      
      * git://www.linux-watchdog.org/linux-watchdog: (25 commits)
        x86: intel-mid: add watchdog platform code for Merrifield
        watchdog: add Intel MID watchdog driver support
        watchdog: sp805: Set watchdog_device->timeout from ->set_timeout()
        booke/watchdog: refine and clean up the codes
        watchdog: iop_wdt only builds for mach-iop13xx
        watchdog: Remove drivers for W83697HF and W83697UG
        watchdog: w83627hf_wdt: Add early_disable module parameter
        ARM: mvebu: Add A375/A380 watchdog binding documentation
        watchdog: orion: Add Armada 375/380 SoC support
        watchdog: orion: Introduce per-SoC enabled() function
        watchdog: orion: Introduce per-SoC stop() function
        watchdog: orion: Remove unneeded atomic access
        watchdog: orion: Introduce a SoC-specific RSTOUT mapping
        watchdog: orion: Move the register ioremap'ing to its own function
        watchdog: xilinx: Make of_device_id array const
        watchdog: imx2_wdt: convert to watchdog core api
        watchdog: imx2_wdt: convert to use regmap API.
        watchdog: imx2_wdt: Sort the header files alphabetically
        watchdog: ath79_wdt: switch to clk_prepare/clk_disable
        watchdog: ath79_wdt: avoid spurious restarts on AR934x
        ...
      dfb94547
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · c5aec4c7
      Linus Torvalds authored
      Pull powerpc updates from Ben Herrenschmidt:
       "Here is the bulk of the powerpc changes for this merge window.  It got
        a bit delayed in part because I wasn't paying attention, and in part
        because I discovered I had a core PCI change without a PCI maintainer
        ack in it.  Bjorn eventually agreed it was ok to merge it though we'll
        probably improve it later and I didn't want to rebase to add his ack.
      
        There is going to be a bit more next week, essentially fixes that I
        still want to sort through and test.
      
        The biggest item this time is the support to build the ppc64 LE kernel
        with our new v2 ABI.  We previously supported v2 userspace but the
        kernel itself was a tougher nut to crack.  This is now sorted mostly
        thanks to Anton and Rusty.
      
        We also have a fairly big series from Cedric that add support for
        64-bit LE zImage boot wrapper.  This was made harder by the fact that
        traditionally our zImage wrapper was always 32-bit, but our new LE
        toolchains don't really support 32-bit anymore (it's somewhat there
        but not really "supported") so we didn't want to rely on it.  This
        meant more churn that just endian fixes.
      
        This brings some more LE bits as well, such as the ability to run in
        LE mode without a hypervisor (ie. under OPAL firmware) by doing the
        right OPAL call to reinitialize the CPU to take HV interrupts in the
        right mode and the usual pile of endian fixes.
      
        There's another series from Gavin adding EEH improvements (one day we
        *will* have a release with less than 20 EEH patches, I promise!).
      
        Another highlight is the support for the "Split core" functionality on
        P8 by Michael.  This allows a P8 core to be split into "sub cores" of
        4 threads which allows the subcores to run different guests under KVM
        (the HW still doesn't support a partition per thread).
      
        And then the usual misc bits and fixes ..."
      
      [ Further delayed by gmail deciding that BenH is a dirty spammer.
        Google knows.  ]
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (155 commits)
        powerpc/powernv: Add missing include to LPC code
        selftests/powerpc: Test the THP bug we fixed in the previous commit
        powerpc/mm: Check paca psize is up to date for huge mappings
        powerpc/powernv: Pass buffer size to OPAL validate flash call
        powerpc/pseries: hcall functions are exported to modules, need _GLOBAL_TOC()
        powerpc: Exported functions __clear_user and copy_page use r2 so need _GLOBAL_TOC()
        powerpc/powernv: Set memory_block_size_bytes to 256MB
        powerpc: Allow ppc_md platform hook to override memory_block_size_bytes
        powerpc/powernv: Fix endian issues in memory error handling code
        powerpc/eeh: Skip eeh sysfs when eeh is disabled
        powerpc: 64bit sendfile is capped at 2GB
        powerpc/powernv: Provide debugfs access to the LPC bus via OPAL
        powerpc/serial: Use saner flags when creating legacy ports
        powerpc: Add cpu family documentation
        powerpc/xmon: Fix up xmon format strings
        powerpc/powernv: Add calls to support little endian host
        powerpc: Document sysfs DSCR interface
        powerpc: Fix regression of per-CPU DSCR setting
        powerpc: Split __SYSFS_SPRSETUP macro
        arch: powerpc/fadump: Cleaning up inconsistent NULL checks
        ...
      c5aec4c7
  3. 10 Jun, 2014 20 commits