1. 27 Jun, 2015 14 commits
    • Geert Uytterhoeven's avatar
      bdi: Remove "inline" keyword from exported I_BDEV() implementation · ff5053f6
      Geert Uytterhoeven authored
      With gcc 3.4.6/4.1.2/4.2.4 (not with 4.4.7/4.6.4/4.8.4):
      
            CC      fs/block_dev.o
          include/linux/fs.h:804: warning: ‘I_BDEV’ declared inline after being called
          include/linux/fs.h:804: warning: previous declaration of ‘I_BDEV’ was here
      
      Commit a212b105 ("bdi: make inode_to_bdi() inline") added a
      caller of I_BDEV() in a header file, exposing the bogus "inline" on the
      exported implementation.
      
      Drop the "inline" keyword to fix this.
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarJens Axboe <axboe@fb.com>
      ff5053f6
    • Paolo Bonzini's avatar
      block: fix bogus EFAULT error from SG_IO ioctl · 2c4cffe8
      Paolo Bonzini authored
      Whenever blk_fill_sghdr_rq fails, its errno code is ignored and changed to
      EFAULT.  This can cause very confusing errors:
      
        $ sg_persist -k /dev/sda
        persistent reservation in: pass through os error: Bad address
      
      The fix is trivial, just propagate the return value from
      blk_fill_sghdr_rq.
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      Acked-by: default avatarJeff Moyer <jmoyer@redhat.com>
      Signed-off-by: default avatarJens Axboe <axboe@fb.com>
      2c4cffe8
    • Keith Busch's avatar
      NVMe: Fix filesystem deadlock on removal · 3399a3f7
      Keith Busch authored
      Move gendisk deletion before controller shutdown so filesystem may sync
      dirty pages. Before, this would deadlock trying to allocate requests
      on frozen queues that are about to be deleted.
      Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
      Signed-off-by: default avatarJens Axboe <axboe@fb.com>
      3399a3f7
    • Keith Busch's avatar
      NVMe: Failed controller initialization fixes · de3eff2b
      Keith Busch authored
      This fixes an infinite device reset loop that may occur on devices that
      fail initialization. If the drive fails to become ready for any reason
      that does not involve an admin command timeout, the probe task should
      assume the drive is unavailable and remove it from the topology. In
      the case an admin command times out during device probing, the driver's
      existing reset action will handle removing the drive.
      Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
      Signed-off-by: default avatarJens Axboe <axboe@fb.com>
      de3eff2b
    • Keith Busch's avatar
      NVMe: Unify controller probe and resume · ffe7704d
      Keith Busch authored
      This unifies probe and resume so they both may be scheduled in the same
      way. This is necessary for error handling that may occur during device
      initialization since the task to cleanup the device wouldn't be able to
      run if it is blocked on device initialization.
      Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
      Signed-off-by: default avatarJens Axboe <axboe@fb.com>
      ffe7704d
    • Keith Busch's avatar
      NVMe: Don't use fake status on cancelled command · 17188bb4
      Keith Busch authored
      Synchronized commands do different things for timed out commands
      vs. controller returned errors.
      Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
      Signed-off-by: default avatarJens Axboe <axboe@fb.com>
      17188bb4
    • Keith Busch's avatar
      NVMe: Fix device cleanup on initialization failure · 4af0e21c
      Keith Busch authored
      Don't release block queue and tagging resoureces if the driver never
      got them in the first place. This can happen if the controller fails to
      become ready, if memory wasn't available to allocate a tagset or admin
      queue, or if the resources were released as part of error recovery.
      Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
      Signed-off-by: default avatarJens Axboe <axboe@fb.com>
      4af0e21c
    • Linus Torvalds's avatar
      Merge branch 'for-4.2' of git://linux-nfs.org/~bfields/linux · d2c3ac7e
      Linus Torvalds authored
      Pull nfsd updates from Bruce Fields:
       "A relatively quiet cycle, with a mix of cleanup and smaller bugfixes"
      
      * 'for-4.2' of git://linux-nfs.org/~bfields/linux: (24 commits)
        sunrpc: use sg_init_one() in krb5_rc4_setup_enc/seq_key()
        nfsd: wrap too long lines in nfsd4_encode_read
        nfsd: fput rd_file from XDR encode context
        nfsd: take struct file setup fully into nfs4_preprocess_stateid_op
        nfsd: refactor nfs4_preprocess_stateid_op
        nfsd: clean up raparams handling
        nfsd: use swap() in sort_pacl_range()
        rpcrdma: Merge svcrdma and xprtrdma modules into one
        svcrdma: Add a separate "max data segs macro for svcrdma
        svcrdma: Replace GFP_KERNEL in a loop with GFP_NOFAIL
        svcrdma: Keep rpcrdma_msg fields in network byte-order
        svcrdma: Fix byte-swapping in svc_rdma_sendto.c
        nfsd: Update callback sequnce id only CB_SEQUENCE success
        nfsd: Reset cb_status in nfsd4_cb_prepare() at retrying
        svcrdma: Remove svc_rdma_xdr_decode_deferred_req()
        SUNRPC: Move EXPORT_SYMBOL for svc_process
        uapi/nfs: Add NFSv4.1 ACL definitions
        nfsd: Remove dead declarations
        nfsd: work around a gcc-5.1 warning
        nfsd: Checking for acl support does not require fetching any acls
        ...
      d2c3ac7e
    • Linus Torvalds's avatar
      Merge tag 'gfs2-merge-window' of git://git.kernel.org:/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · 546fac60
      Linus Torvalds authored
      Pull GFS2 updates from Bob Peterson:
       "Here are the patches we've accumulated for GFS2 for the current
        upstream merge window.  We have a good mixture this time.  Here are
        some of the features:
      
         - Fix a problem with RO mounts writing to the journal.
      
         - Further improvements to quotas on GFS2.
      
         - Added support for rename2 and RENAME_EXCHANGE on GFS2.
      
         - Increase performance by making glock lru_list less of a bottleneck.
      
         - Increase performance by avoiding unnecessary buffer_head releases.
      
         - Increase performance by using average glock round trip time from all CPUs.
      
         - Fixes for some compiler warnings and minor white space issues.
      
         - Other misc bug fixes"
      
      * tag 'gfs2-merge-window' of git://git.kernel.org:/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        GFS2: Don't brelse rgrp buffer_heads every allocation
        GFS2: Don't add all glocks to the lru
        gfs2: Don't support fallocate on jdata	files
        gfs2: s64 cast for negative quota value
        gfs2: limit quota log messages
        gfs2: fix quota updates on block boundaries
        gfs2: fix shadow warning in gfs2_rbm_find()
        gfs2: kerneldoc warning fixes
        gfs2: convert simple_str to kstr
        GFS2: make sure S_NOSEC flag isn't overwritten
        GFS2: add support for rename2 and RENAME_EXCHANGE
        gfs2: handle NULL rgd in set_rgrp_preferences
        GFS2: inode.c: indent with TABs, not spaces
        GFS2: mark the journal idle to fix ro mounts
        GFS2: Average in only non-zero round-trip times for congestion stats
        GFS2: Use average srttb value in congestion calculations
      546fac60
    • Linus Torvalds's avatar
      Revert "jbd2: speedup jbd2_journal_dirty_metadata()" · ebeaa8dd
      Linus Torvalds authored
      This reverts commit 2143c196.
      
      This commit seems to be the cause of the following jbd2 assertion
      failure:
      
         ------------[ cut here ]------------
         kernel BUG at fs/jbd2/transaction.c:1325!
         invalid opcode: 0000 [#1] SMP
         Modules linked in: bnep bluetooth fuse ip6t_rpfilter ip6t_REJECT nf_reject_ipv6 nf_conntrack_ipv6 ...
         CPU: 7 PID: 5509 Comm: gcc Not tainted 4.1.0-10944-g2a298679 #1
         Hardware name:                  /DH87RL, BIOS RLH8710H.86A.0327.2014.0924.1645 09/24/2014
         task: ffff8803bf866040 ti: ffff880308528000 task.ti: ffff880308528000
         RIP: jbd2_journal_dirty_metadata+0x237/0x290
         Call Trace:
           __ext4_handle_dirty_metadata+0x43/0x1f0
           ext4_handle_dirty_dirent_node+0xde/0x160
           ? jbd2_journal_get_write_access+0x36/0x50
           ext4_delete_entry+0x112/0x160
           ? __ext4_journal_start_sb+0x52/0xb0
           ext4_unlink+0xfa/0x260
           vfs_unlink+0xec/0x190
           do_unlinkat+0x24a/0x270
           SyS_unlink+0x11/0x20
           entry_SYSCALL_64_fastpath+0x12/0x6a
         ---[ end trace ae033ebde8d080b4 ]---
      
      which is not easily reproducible (I've seen it just once, and then Ted
      was able to reproduce it once).  Revert it while Ted and Jan try to
      figure out what is wrong.
      
      Cc: Jan Kara <jack@suse.cz>
      Acked-by: default avatarTheodore Ts'o <tytso@mit.edu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ebeaa8dd
    • Linus Torvalds's avatar
      Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · e0dd880a
      Linus Torvalds authored
      Pull workqueue updates from Tejun Heo:
       "Most of the changes are around implementing and fixing fallouts from
        sysfs and internal interface to limit the CPUs available to all
        unbound workqueues to help isolating CPUs.  It needs more work as
        ordered workqueues can roam unrestricted but still is a significant
        improvement"
      
      * 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: fix typos in comments
        workqueue: move flush_scheduled_work() to workqueue.h
        workqueue: remove the lock from wq_sysfs_prep_attrs()
        workqueue: remove the declaration of copy_workqueue_attrs()
        workqueue: ensure attrs changes are properly synchronized
        workqueue: separate out and refactor the locking of applying attrs
        workqueue: simplify wq_update_unbound_numa()
        workqueue: wq_pool_mutex protects the attrs-installation
        workqueue: fix a typo
        workqueue: function name in the comment differs from the real function name
        workqueue: fix trivial typo in Documentation/workqueue.txt
        workqueue: Allow modifying low level unbound workqueue cpumask
        workqueue: Create low-level unbound workqueues cpumask
        workqueue: split apply_workqueue_attrs() into 3 stages
      e0dd880a
    • Linus Torvalds's avatar
      Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · bbe179f8
      Linus Torvalds authored
      Pull cgroup updates from Tejun Heo:
      
       - threadgroup_lock got reorganized so that its users can pick the
         actual locking mechanism to use.  Its only user - cgroups - is
         updated to use a percpu_rwsem instead of per-process rwsem.
      
         This makes things a bit lighter on hot paths and allows cgroups to
         perform and fail multi-task (a process) migrations atomically.
         Multi-task migrations are used in several places including the
         unified hierarchy.
      
       - Delegation rule and documentation added to unified hierarchy.  This
         will likely be the last interface update from the cgroup core side
         for unified hierarchy before lifting the devel mask.
      
       - Some groundwork for the pids controller which is scheduled to be
         merged in the coming devel cycle.
      
      * 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: add delegation section to unified hierarchy documentation
        cgroup: require write perm on common ancestor when moving processes on the default hierarchy
        cgroup: separate out cgroup_procs_write_permission() from __cgroup_procs_write()
        kernfs: make kernfs_get_inode() public
        MAINTAINERS: add a cgroup core co-maintainer
        cgroup: fix uninitialised iterator in for_each_subsys_which
        cgroup: replace explicit ss_mask checking with for_each_subsys_which
        cgroup: use bitmask to filter for_each_subsys
        cgroup: add seq_file forward declaration for struct cftype
        cgroup: simplify threadgroup locking
        sched, cgroup: replace signal_struct->group_rwsem with a global percpu_rwsem
        sched, cgroup: reorganize threadgroup locking
        cgroup: switch to unsigned long for bitmasks
        cgroup: reorganize include/linux/cgroup.h
        cgroup: separate out include/linux/cgroup-defs.h
        cgroup: fix some comment typos
      bbe179f8
    • Stephen Rothwell's avatar
      power: axp288_charger: fix for API change · 4b703b1d
      Stephen Rothwell authored
      Caused by commit 843735b7 ("power: axp288_charger: axp288 charger
      driver") from the battery tree interacting with commit 046050f6
      ("extcon: Update the prototype of extcon_register_notifier() with enum
      extcon") from the extcon tree.
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4b703b1d
    • Linus Torvalds's avatar
      Merge tag 'dma-buf-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf · 93f0824c
      Linus Torvalds authored
      Pull dma-buf updates from Sumit Semwal:
       "Minor changes for 4.2
      
         - add ref-counting for kernel modules as exporters
         - minor code style fixes"
      
      * tag 'dma-buf-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf:
        dma-buf: Minor coding style fixes
        dma-buf: add ref counting for module as exporter
      93f0824c
  2. 26 Jun, 2015 26 commits
    • Linus Torvalds's avatar
      Merge tag 'usb-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 2a298679
      Linus Torvalds authored
      Pull USB updates from Greg KH:
       "Here's the big USB patchset for 4.2-rc1.  As is normal these days, the
        majority of changes are in the gadget drivers, with a bunch of other
        small driver changes.
      
        All of these have been in linux-next with no reported issues"
      
      * tag 'usb-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (175 commits)
        usb: dwc3: Use ASCII space in Kconfig
        usb: chipidea: add work-around for Marvell HSIC PHY startup
        usb: chipidea: allow multiple instances to use default ci_default_pdata
        dt-bindings: Consolidate ChipIdea USB ci13xxx bindings
        phy: add Marvell HSIC 28nm PHY
        phy: Add Marvell USB 2.0 OTG 28nm PHY
        dt-bindings: Add Marvell PXA1928 USB and HSIC PHY bindings
        USB: ssb: use devm_kzalloc
        USB: ssb: fix error handling in ssb_hcd_create_pdev()
        usb: isp1760: check for null return from kzalloc
        cdc-acm: Add support of ATOL FPrint fiscal printers
        usb: chipidea: usbmisc_imx: Remove unneeded semicolon
        USB: usbtmc: add device quirk for Rigol DS6104
        USB: serial: mos7840: Use setup_timer
        phy: twl4030-usb: add ABI documentation
        phy: twl4030-usb: remove incorrect pm_runtime_get_sync() in probe function.
        phy: twl4030-usb: remove pointless 'suspended' test in 'suspend' callback.
        phy: twl4030-usb: make runtime pm more reliable.
        drivers:usb:fsl: Fix compilation error for fsl ehci drv
        usb: renesas_usbhs: Don't disable the pipe if Control write status stage
        ...
      2a298679
    • Linus Torvalds's avatar
      Merge tag 'tty-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 8c7febe8
      Linus Torvalds authored
      Pull tty/serial driver updates from Greg KH:
       "Here's the tty and serial driver patches for 4.2-rc1.
      
        A number of individual driver updates, some code cleanups, and other
        minor things, full details in the shortlog.
      
        All have been in linux-next for a while with no reported issues"
      
      * tag 'tty-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (152 commits)
        Doc: serial-rs485.txt: update RS485 driver interface
        Doc: tty.txt: remove mention of the BKL
        MAINTAINERS: tty: add serial docs directory
        serial: sprd: check for NULL after calling devm_clk_get
        serial: 8250_pci: Correct uartclk for xr17v35x expansion chips
        serial: 8250_pci: Add support for 12 port Exar boards
        serial: 8250_uniphier: add bindings document for UniPhier UART
        serial: core: cleanup in uart_get_baud_rate()
        serial: stm32-usart: Add STM32 USART Driver
        tty/serial: kill off set_irq_flags usage
        tty: move linux/gsmmux.h to uapi
        doc: dt: add documentation for nxp,lpc1850-uart
        serial: 8250: add LPC18xx/43xx UART driver
        serial: 8250_uniphier: add UniPhier serial driver
        serial: 8250_dw: support ACPI platforms with integrated DMA engine
        serial: of_serial: check the return value of clk_prepare_enable()
        serial: of_serial: use devm_clk_get() instead of clk_get()
        serial: earlycon: Add support for big-endian MMIO accesses
        serial: sirf: use hrtimer for data rx
        serial: sirf: correct the fifo empty_bit
        ...
      8c7febe8
    • Linus Torvalds's avatar
      Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 23908db4
      Linus Torvalds authored
      Pull staging driver updates from Greg KH:
       "Here's the big, really big, staging tree patches for 4.2-rc1.
      
        Loads of stuff in here, almost all just coding style fixes / churn,
        and a few new drivers as well, one of which I just disabled from the
        build a few minutes ago due to way too many build warnings.
      
        Other than the one "disable this driver" patch, all of these have been
        in linux-next for quite a while with no reported issues"
      
      * tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1163 commits)
        staging: wilc1000: disable driver due to build warnings
        Staging: rts5208: fix CHANGE_LINK_STATE value
        Staging: sm750fb: ddk750_swi2c.c: Insert spaces before parenthesis
        Staging: sm750fb: ddk750_swi2c.c: Place braces on correct lines
        Staging: sm750fb: ddk750_swi2c.c: Insert spaces around operators
        Staging: sm750fb: ddk750_swi2c.c: Replace spaces with tabs
        Staging: sm750fb: ddk750_swi2c.h: Shorten lines to under 80 characters
        Staging: sm750fb: ddk750_swi2c.h: Replace spaces with tabs
        Staging: sm750fb: modedb.h: Shorten lines to under 80 characters
        Staging: sm750fb: modedb.h: Replace spaces with tabs
        staging: comedi: addi_apci_3120: rename 'this_board' variables
        staging: comedi: addi_apci_1516: rename 'this_board' variables
        staging: comedi: ni_atmio: cleanup ni_getboardtype()
        staging: comedi: vmk80xx: sanity check context used to get the boardinfo
        staging: comedi: vmk80xx: rename 'boardinfo' variables
        staging: comedi: dt3000: rename 'this_board' variables
        staging: comedi: adv_pci_dio: rename 'this_board' variables
        staging: comedi: cb_pcidas64: rename 'thisboard' variables
        staging: comedi: cb_pcidas: rename 'thisboard' variables
        staging: comedi: me4000: rename 'thisboard' variables
        ...
      23908db4
    • Linus Torvalds's avatar
      Merge tag 'driver-core-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 8d7804a2
      Linus Torvalds authored
      Pull driver core updates from Greg KH:
       "Here is the driver core / firmware changes for 4.2-rc1.
      
        A number of small changes all over the place in the driver core, and
        in the firmware subsystem.  Nothing really major, full details in the
        shortlog.  Some of it is a bit of churn, given that the platform
        driver probing changes was found to not work well, so they were
        reverted.
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'driver-core-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (31 commits)
        Revert "base/platform: Only insert MEM and IO resources"
        Revert "base/platform: Continue on insert_resource() error"
        Revert "of/platform: Use platform_device interface"
        Revert "base/platform: Remove code duplication"
        firmware: add missing kfree for work on async call
        fs: sysfs: don't pass count == 0 to bin file readers
        base:dd - Fix for typo in comment to function driver_deferred_probe_trigger().
        base/platform: Remove code duplication
        of/platform: Use platform_device interface
        base/platform: Continue on insert_resource() error
        base/platform: Only insert MEM and IO resources
        firmware: use const for remaining firmware names
        firmware: fix possible use after free on name on asynchronous request
        firmware: check for file truncation on direct firmware loading
        firmware: fix __getname() missing failure check
        drivers: of/base: move of_init to driver_init
        drivers/base: cacheinfo: fix annoying typo when DT nodes are absent
        sysfs: disambiguate between "error code" and "failure" in comments
        driver-core: fix build for !CONFIG_MODULES
        driver-core: make __device_attach() static
        ...
      8d7804a2
    • Linus Torvalds's avatar
      Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · d8782381
      Linus Torvalds authored
      Pull char/misc driver updates from Greg KH:
       "Here's the big char/misc driver pull request for 4.2-rc1.
      
        Lots of mei, extcon, coresight, uio, mic, and other driver updates in
        here.  Full details in the shortlog.  All of these have been in
        linux-next for some time with no reported problems"
      
      * tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (176 commits)
        mei: me: wait for power gating exit confirmation
        mei: reset flow control on the last client disconnection
        MAINTAINERS: mei: add mei_cl_bus.h to maintained file list
        misc: sram: sort and clean up included headers
        misc: sram: move reserved block logic out of probe function
        misc: sram: add private struct device and virt_base members
        misc: sram: report correct SRAM pool size
        misc: sram: bump error message level on unclean driver unbinding
        misc: sram: fix device node reference leak on error
        misc: sram: fix enabled clock leak on error path
        misc: mic: Fix reported static checker warning
        misc: mic: Fix randconfig build error by including errno.h
        uio: pruss: Drop depends on ARCH_DAVINCI_DA850 from config
        uio: pruss: Add CONFIG_HAS_IOMEM dependence
        uio: pruss: Include <linux/sizes.h>
        extcon: Redefine the unique id of supported external connectors without 'enum extcon' type
        char:xilinx_hwicap:buffer_icap - change 1/0 to true/false for bool type variable in function buffer_icap_set_configuration().
        Drivers: hv: vmbus: Allocate ring buffer memory in NUMA aware fashion
        parport: check exclusive access before register
        w1: use correct lock on error in w1_seq_show()
        ...
      d8782381
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · e3826082
      Linus Torvalds authored
      Pull tracing updates from Steven Rostedt:
       "This patch series contains several clean ups and even a new trace
        clock "monitonic raw".  Also some enhancements to make the ring buffer
        even faster.  But the biggest and most noticeable change is the
        renaming of the ftrace* files, structures and variables that have to
        deal with trace events.
      
        Over the years I've had several developers tell me about their
        confusion with what ftrace is compared to events.  Technically,
        "ftrace" is the infrastructure to do the function hooks, which include
        tracing and also helps with live kernel patching.  But the trace
        events are a separate entity altogether, and the files that affect the
        trace events should not be named "ftrace".  These include:
      
          include/trace/ftrace.h         ->    include/trace/trace_events.h
          include/linux/ftrace_event.h   ->    include/linux/trace_events.h
      
        Also, functions that are specific for trace events have also been renamed:
      
          ftrace_print_*()               ->    trace_print_*()
          (un)register_ftrace_event()    ->    (un)register_trace_event()
          ftrace_event_name()            ->    trace_event_name()
          ftrace_trigger_soft_disabled() ->    trace_trigger_soft_disabled()
          ftrace_define_fields_##call()  ->    trace_define_fields_##call()
          ftrace_get_offsets_##call()    ->    trace_get_offsets_##call()
      
        Structures have been renamed:
      
          ftrace_event_file              ->    trace_event_file
          ftrace_event_{call,class}      ->    trace_event_{call,class}
          ftrace_event_buffer            ->    trace_event_buffer
          ftrace_subsystem_dir           ->    trace_subsystem_dir
          ftrace_event_raw_##call        ->    trace_event_raw_##call
          ftrace_event_data_offset_##call->    trace_event_data_offset_##call
          ftrace_event_type_funcs_##call ->    trace_event_type_funcs_##call
      
        And a few various variables and flags have also been updated.
      
        This has been sitting in linux-next for some time, and I have not
        heard a single complaint about this rename breaking anything.  Mostly
        because these functions, variables and structures are mostly internal
        to the tracing system and are seldom (if ever) used by anything
        external to that"
      
      * tag 'trace-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (33 commits)
        ring_buffer: Allow to exit the ring buffer benchmark immediately
        ring-buffer-benchmark: Fix the wrong type
        ring-buffer-benchmark: Fix the wrong param in module_param
        ring-buffer: Add enum names for the context levels
        ring-buffer: Remove useless unused tracing_off_permanent()
        ring-buffer: Give NMIs a chance to lock the reader_lock
        ring-buffer: Add trace_recursive checks to ring_buffer_write()
        ring-buffer: Allways do the trace_recursive checks
        ring-buffer: Move recursive check to per_cpu descriptor
        ring-buffer: Add unlikelys to make fast path the default
        tracing: Rename ftrace_get_offsets_##call() to trace_event_get_offsets_##call()
        tracing: Rename ftrace_define_fields_##call() to trace_event_define_fields_##call()
        tracing: Rename ftrace_event_type_funcs_##call to trace_event_type_funcs_##call
        tracing: Rename ftrace_data_offset_##call to trace_event_data_offset_##call
        tracing: Rename ftrace_raw_##call event structures to trace_event_raw_##call
        tracing: Rename ftrace_trigger_soft_disabled() to trace_trigger_soft_disabled()
        tracing: Rename FTRACE_EVENT_FL_* flags to EVENT_FILE_FL_*
        tracing: Rename struct ftrace_subsystem_dir to trace_subsystem_dir
        tracing: Rename ftrace_event_name() to trace_event_name()
        tracing: Rename FTRACE_MAX_EVENT to TRACE_EVENT_TYPE_MAX
        ...
      e3826082
    • Linus Torvalds's avatar
      Merge tag 'trace-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · fcbc1777
      Linus Torvalds authored
      Pull tracing fixes from Steven Rostedt:
       "This isn't my 4.2 pull request (yet).  I found a few more bugs that I
        would have sent to fix 4.1, but since 4.1 is already out, I'm sending
        this before sending my 4.2 request (which is ready to go).
      
        After fixing the previous filter issue reported by Vince Weaver, I
        could not come up with a situation where the operand counter (cnt)
        could go below zero, so I added a WARN_ON_ONCE(cnt < 0).  Vince was
        able to trigger that warn on with his fuzzer test, but didn't have a
        filter input that caused it.
      
        Later, Sasha Levin was able to trigger that same warning, and was able
        to give me the filter string that triggered it.  It was simply a
        single operation ">".
      
        I wrapped the filtering code in a userspace program such that I could
        single step through the logic.  With a single operator the operand
        counter can legitimately go below zero, and should be reported to the
        user as an error, but should not produce a kernel warning.  The
        WARN_ON_ONCE(cnt < 0) should be just a "if (cnt < 0) break;" and the
        code following it will produce the error message for the user.
      
        While debugging this, I found that there was another bug that let the
        pointer to the filter string go beyond the filter string.  This too
        was fixed.
      
        Finally, there was a typo in a stub function that only gets compiled
        if trace events is disabled but tracing is enabled (I'm not even sure
        that's possible)"
      
      * tag 'trace-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Fix typo from "static inlin" to "static inline"
        tracing/filter: Do not allow infix to exceed end of string
        tracing/filter: Do not WARN on operand count going below zero
      fcbc1777
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · 099bfbfc
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "This is the main drm pull request for v4.2.
      
        I've one other new driver from freescale on my radar, it's been posted
        and reviewed, I'd just like to get someone to give it a last look, so
        maybe I'll send it or maybe I'll leave it.
      
        There is no major nouveau changes in here, Ben was working on
        something big, and we agreed it was a bit late, there wasn't anything
        else he considered urgent to merge.
      
        There might be another msm pull for some bits that are waiting on
        arm-soc, I'll see how we time it.
      
        This touches some "of" stuff, acks are in place except for the fixes
        to the build in various configs,t hat I just applied.
      
        Summary:
      
        New drivers:
            - virtio-gpu:
                      KMS only pieces of driver for virtio-gpu in qemu.
                      This is just the first part of this driver, enough to run
                      unaccelerated userspace on. As qemu merges more we'll start
                      adding the 3D features for the virgl 3d work.
            - amdgpu:
                      a new driver from AMD to driver their newer GPUs. (VI+)
                      It contains a new cleaner userspace API, and is a clean
                      break from radeon moving forward, that AMD are going to
                      concentrate on. It also contains a set of register headers
                      auto generated from AMD internal database.
      
        core:
            - atomic modesetting API completed, enabled by default now.
            - Add support for mode_id blob to atomic ioctl to complete interface.
            - bunch of Displayport MST fixes
            - lots of misc fixes.
      
        panel:
            - new simple panels
            - fix some long-standing build issues with bridge drivers
      
        radeon:
            - VCE1 support
            - add a GPU reset counter for userspace
            - lots of fixes.
      
        amdkfd:
            - H/W debugger support module
            - static user-mode queues
            - support killing all the waves when a process terminates
            - use standard DECLARE_BITMAP
      
        i915:
            - Add Broxton support
            - S3, rotation support for Skylake
            - RPS booting tuning
            - CPT modeset sequence fixes
            - ns2501 dither support
            - enable cmd parser on haswell
            - cdclk handling fixes
            - gen8 dynamic pte allocation
            - lots of atomic conversion work
      
        exynos:
            - Add atomic modesetting support
            - Add iommu support
            - Consolidate drm driver initialization
            - and MIC, DECON and MIPI-DSI support for exynos5433
      
        omapdrm:
            - atomic modesetting support (fixes lots of things in rewrite)
      
        tegra:
            - DP aux transaction fixes
            - iommu support fix
      
        msm:
            - adreno a306 support
            - various dsi bits
            - various 64-bit fixes
            - NV12MT support
      
        rcar-du:
            - atomic and misc fixes
      
        sti:
            - fix HDMI timing complaince
      
        tilcdc:
            - use drm component API to access tda998x driver
            - fix module unloading
      
        qxl:
            - stability fixes"
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (872 commits)
        drm/nouveau: Pause between setting gpu to D3hot and cutting the power
        drm/dp/mst: close deadlock in connector destruction.
        drm: Always enable atomic API
        drm/vgem: Set unique to "vgem"
        of: fix a build error to of_graph_get_endpoint_by_regs function
        drm/dp/mst: take lock around looking up the branch device on hpd irq
        drm/dp/mst: make sure mst_primary mstb is valid in work function
        of: add EXPORT_SYMBOL for of_graph_get_endpoint_by_regs
        ARM: dts: rename the clock of MIPI DSI 'pll_clk' to 'sclk_mipi'
        drm/atomic: Don't set crtc_state->enable manually
        drm/exynos: dsi: do not set TE GPIO direction by input
        drm/exynos: dsi: add support for MIC driver as a bridge
        drm/exynos: dsi: add support for Exynos5433
        drm/exynos: dsi: make use of array for clock access
        drm/exynos: dsi: make use of driver data for static values
        drm/exynos: dsi: add macros for register access
        drm/exynos: dsi: rename pll_clk to sclk_clk
        drm/exynos: mic: add MIC driver
        of: add helper for getting endpoint node of specific identifiers
        drm/exynos: add Exynos5433 decon driver
        ...
      099bfbfc
    • Linus Torvalds's avatar
      Merge tag 'dm-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 22165fa7
      Linus Torvalds authored
      Pull device mapper fixes from Mike Snitzer:
       "Apologies for not pressing this request-based DM partial completion
        issue further, it was an oversight on my part.  We'll have to get it
        fixed up properly and revisit for a future release.
      
         - Revert block and DM core changes the removed request-based DM's
           ability to handle partial request completions -- otherwise with the
           current SCSI LLDs these changes could lead to silent data
           corruption.
      
         - Fix two DM version bumps that were missing from the initial 4.2 DM
           pull request (enabled userspace lvm2 to know certain changes have
           been made)"
      
      * tag 'dm-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm cache policy smq: fix "default" version to be 1.4.0
        dm: bump the ioctl version to 4.32.0
        Revert "block, dm: don't copy bios for request clones"
        Revert "dm: do not allocate any mempools for blk-mq request-based DM"
      22165fa7
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · a2f54be9
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
       "This fixes the following issues:
      
         - move -O0 jitterentropy code into its own file instead of using gcc
           pragma magic.
      
         - kill testmgr warning for gcm-aes-aesni.
      
         - fix build failure in old rsa.
      
        Other minor fixes:
      
         - ignore asn1 files generated by new rsa.
      
         - remove unnecessary kzfree NULL checks in jitterentropy.
      
         - typo fix in akcipher"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: rsa - add .gitignore for crypto/*.-asn1.[ch] files
        crypto: asymmetric_keys/rsa - Use non-conflicting variable name
        crypto: testmgr - don't print info about missing test for gcm-aes-aesni
        crypto: jitterentropy - Delete unnecessary checks before the function call "kzfree"
        crypto: akcipher - fix spelling cihper -> cipher
        crypto: jitterentropy - avoid compiler warnings
      a2f54be9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · e8a0b37d
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "Bigger items included in this update are:
      
         - A series of updates from Arnd for ARM randconfig build failures
         - Updates from Dmitry for StrongARM SA-1100 to move IRQ handling to
           drivers/irqchip/
         - Move ARMs SP804 timer to drivers/clocksource/
         - Perf updates from Mark Rutland in preparation to move the ARM perf
           code into drivers/ so it can be shared with ARM64.
         - MCPM updates from Nicolas
         - Add support for taking platform serial number from DT
         - Re-implement Keystone2 physical address space switch to conform to
           architecture requirements
         - Clean up ARMv7 LPAE code, which goes in hand with the Keystone2
           changes.
         - L2C cleanups to avoid unlocking caches if we're prevented by the
           secure support to unlock.
         - Avoid cleaning a potentially dirty cache containing stale data on
           CPU initialisation
         - Add ARM-only entry point for secondary startup (for machines that
           can only call into a Thumb kernel in ARM mode).  Same thing is also
           done for the resume entry point.
         - Provide arch_irqs_disabled via asm-generic
         - Enlarge ARMv7M vector table
         - Always use BFD linker for VDSO, as gold doesn't accept some of the
           options we need.
         - Fix an incorrect BSYM (for Thumb symbols) usage, and convert all
           BSYM compiler macros to a "badr" (for branch address).
         - Shut up compiler warnings provoked by our cmpxchg() implementation.
         - Ensure bad xchg sizes fail to link"
      
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (75 commits)
        ARM: Fix build if CLKDEV_LOOKUP is not configured
        ARM: fix new BSYM() usage introduced via for-arm-soc branch
        ARM: 8383/1: nommu: avoid deprecated source register on mov
        ARM: 8391/1: l2c: add options to overwrite prefetching behavior
        ARM: 8390/1: irqflags: Get arch_irqs_disabled from asm-generic
        ARM: 8387/1: arm/mm/dma-mapping.c: Add arm_coherent_dma_mmap
        ARM: 8388/1: tcm: Don't crash when TCM banks are protected by TrustZone
        ARM: 8384/1: VDSO: force use of BFD linker
        ARM: 8385/1: VDSO: group link options
        ARM: cmpxchg: avoid warnings from macro-ized cmpxchg() implementations
        ARM: remove __bad_xchg definition
        ARM: 8369/1: ARMv7M: define size of vector table for Vybrid
        ARM: 8382/1: clocksource: make ARM_TIMER_SP804 depend on GENERIC_SCHED_CLOCK
        ARM: 8366/1: move Dual-Timer SP804 driver to drivers/clocksource
        ARM: 8365/1: introduce sp804_timer_disable and remove arm_timer.h inclusion
        ARM: 8364/1: fix BE32 module loading
        ARM: 8360/1: add secondary_startup_arm prototype in header file
        ARM: 8359/1: correct secondary_startup_arm mode
        ARM: proc-v7: sanitise and document registers around errata
        ARM: proc-v7: clean up MIDR access
        ...
      e8a0b37d
    • Linus Torvalds's avatar
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · abea9629
      Linus Torvalds authored
      Pull ARM SoC defconfig updates from Kevin Hilman:
       "We keep collecting defconfig updates in a separate branch mostly to
        encourage people to handle them separately and avoid conflicts between
        different topics.
      
        Most of these are enablement of new SoCs, boards or drivers that have
        come in, or minor config refreshes due to reorderings in Kconfig
        files, etc.  I.e. mostly minor churn of various kinds"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits)
        ARM: multi_v7_defconfig: remove duplicate CONFIG_COMMON_CLK_QCOM=y
        ARM: multi_v7_defconfig: Enable display on Trats2 board
        ARM64: add GPIO keys to the defconfig
        ARM: keystone: defconfig: enable netcp driver by default
        ARM: exynos_defconfig: Enable CONFIG_SENSORS_INA2XX for Odroid-XU3
        ARM: exynos_defconfig: Enable CONFIG_SENSORS_PWM_FAN for Odroid-XU3
        ARM: omap2plus_defconfig: Enable TOUCHSCREEN_PIXCIR
        ARM: omap2plus_defconfig: Add dm816x USB PHY as a loadable module
        ARM: omap2plus_defconifg: Enable DM9000 in omap2plus_defconfig
        ARM: lpc18xx: remove DEBUG_LL_UART_8250 from defconfig
        ARM: multi_v7_defconfig: Make media support modular
        ARM: multi_v7_defconfig: Make sound support modular
        ARM: multi_v7_defconfig: Enable shmobile r8a7778/bockw platform
        ARM: exynos_defconfig: savedefconfig
        ARM: exynos_defconfig: Enable display on Trats2 board
        ARM: multi_v7_defconfig: Enable OHCI on exynos SoCs
        ARM: multi_v7_defconfig: Enable TMU for exynos SoCs
        ARM: multi_v7_defconfig: Enable PMIC and MUIC drivers for exynos
        ARM: multi_v7_defconfig: Enable CPU idle for exynos SoCs
        ARM: multi_v7_defconfig: Enable Cypress APA I2C Trackpad support
        ...
      abea9629
    • Greg Kroah-Hartman's avatar
      staging: wilc1000: disable driver due to build warnings · 53a20e9e
      Greg Kroah-Hartman authored
      The wilc1000 has just too many build warnings to be able to enable it
      for the 4.2 release.  Given that there have not been any patches
      submitted to properly fix these obvious errors, I'm going to disable it
      for now.  I will enable it back when the build warning fixes are
      submitted, or, if that never happens, I will remove it from the tree.
      
      Cc: Johnny Kim <johnny.kim@atmel.com>
      Cc: Rachel Kim <rachel.kim@atmel.com>
      Cc: Dean Lee <dean.lee@atmel.com>
      Cc: Chris Park <chris.park@atmel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      53a20e9e
    • Linus Torvalds's avatar
      Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f5dcb680
      Linus Torvalds authored
      Pull ARM SoC driver updates from Kevin Hilman:
       "Some of these are for drivers/soc, where we're now putting
        SoC-specific drivers these days.  Some are for other driver subsystems
        where we have received acks from the appropriate maintainers.
      
        Some highlights:
      
         - simple-mfd: document DT bindings and misc updates
         - migrate mach-berlin to simple-mfd for clock, pinctrl and reset
         - memory: support for Tegra132 SoC
         - memory: introduce tegra EMC driver for scaling memory frequency
         - misc. updates for ARM CCI and CCN busses"
      
      * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
        drivers: soc: sunxi: Introduce SoC driver to map SRAMs
        arm-cci: Add aliases for PMU events
        arm-cci: Add CCI-500 PMU support
        arm-cci: Sanitise CCI400 PMU driver specific code
        arm-cci: Abstract handling for CCI events
        arm-cci: Abstract out the PMU counter details
        arm-cci: Cleanup PMU driver code
        arm-cci: Do not enable CCI-400 PMU by default
        firmware: qcom: scm: Add HDCP Support
        ARM: berlin: add an ADC node for the BG2Q
        ARM: berlin: remove useless chip and system ctrl compatibles
        clk: berlin: drop direct of_iomap of nodes reg property
        ARM: berlin: move BG2Q clock node
        ARM: berlin: move BG2CD clock node
        ARM: berlin: move BG2 clock node
        clk: berlin: prepare simple-mfd conversion
        pinctrl: berlin: drop SoC stub provided regmap
        ARM: berlin: move pinctrl to simple-mfd nodes
        pinctrl: berlin: prepare to use regmap provided by syscon
        reset: berlin: drop arch_initcall initialization
        ...
      f5dcb680
    • Linus Torvalds's avatar
      Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 3d9f96d8
      Linus Torvalds authored
      Pull ARM SoC DT updates from Kevin Hilman:
       "As usual, quite a few device-tree updates in ARM land.  There was one
        minor churn in DTs due to relicensing under a dual-license, and lots
        of little additions of new peripherals, features etc, but nothing
        really exciting to call to your attention.  Some higlights, focsuing
        on support for new SoCs and boards:
      
         - AT91: new boards: Overkiz,  Acme Systems' Arietta G25
         - tegra: HDA support
         - bcm: new platforms: Buffalo WXR-1900DHP, SmartRG SR400ac, ASUS
           RT-AC87U
         - mvebu: new platforms: Compulab CM-A510, Armada 385-based Linksys
           boards, DLink DNS-327L
         - OMAP: new platforms: Baltos IR5221, LogicPD Torpedo, Toby-Churchill
           SL50
         - ARM: added support for Juno r1 board
         - sunxi: A33 SoC support; new boards: A23 EVB, SinA33, GA10H-A33,
           Mele A1000G
         - imx: i.MX7D SoC support; new boards: Armadeus Systems APF6,
           Gateworks GW5510, and aristainetos2 boards
         - hisilicon: hi6220 SoC support; new boards: 96boards hikey"
      
      * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (462 commits)
        ARM: hisi: revert changes from hisi/hip04-dt branch
        ARM: nomadik: set proper compatible for accelerometer
        ARM64: juno: add GPIO keys
        ARM: at91/dt: sama5d4: fix dma conf for aes, sha and tdes nodes
        ARM: dts: Introduce STM32F429 MCU
        ARM: socfpga: dts: enable ethernet for Arria10 devkit
        ARM: dts: k2l: fix the netcp range size
        ARM: dts: k2e: fix the netcp range size
        ARM: dts: k2hk: fix the netcp range size
        ARM: dts: k2l-evm: Add device bindings for netcp driver
        ARM: dts: k2e-evm: Add device bindings for netcp driver
        ARM: dts: k2hk-evm: Add device bindings for netcp driver
        ARM: BCM5301X: Add DT for Asus RT-AC87U
        ARM: BCM5301X: add IRQ numbers for PCIe controller
        ARM: BCM5301X: add NAND flash chip description
        arm64: dts: Add dts files for Hisilicon Hi6220 SoC
        clk: hi6220: Document devicetree bindings for hi6220 clock
        arm64: hi6220: Document devicetree bindings for Hisilicon hi6220 SoC
        ARM: at91/dt: sama5d4ek: mci0 uses slot 0
        ARM: at91/dt: kizbox: fix mismatch LED PWM device
        ...
      3d9f96d8
    • Linus Torvalds's avatar
      Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4aa705b1
      Linus Torvalds authored
      Pull ARM SoC platform support updates from Kevin Hilman:
       "Our SoC branch usually contains expanded support for new SoCs and
        other core platform code.  Some highlights from this round:
      
         - sunxi: SMP support for A23 SoC
         - socpga: big-endian support
         - pxa: conversion to common clock framework
         - bcm: SMP support for BCM63138
         - imx: support new I.MX7D SoC
         - zte: basic support for ZX296702 SoC"
      
      * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (134 commits)
        ARM: zx: Add basic defconfig support for ZX296702
        ARM: dts: zx: add an initial zx296702 dts and doc
        clk: zx: add clock support to zx296702
        dt-bindings: Add #defines for ZTE ZX296702 clocks
        ARM: socfpga: fix build error due to secondary_startup
        MAINTAINERS: ARM64: EXYNOS: Extend entry for ARM64 DTS
        ARM: ep93xx: simone: support for SPI-based MMC/SD cards
        MAINTAINERS: update Shawn's email to use kernel.org one
        ARM: socfpga: support suspend to ram
        ARM: socfpga: add CPU_METHOD_OF_DECLARE for Arria 10
        ARM: socfpga: use CPU_METHOD_OF_DECLARE for socfpga_cyclone5
        ARM: EXYNOS: register power domain driver from core_initcall
        ARM: EXYNOS: use PS_HOLD based poweroff for all supported SoCs
        ARM: SAMSUNG: Constify platform_device_id
        ARM: EXYNOS: Constify irq_domain_ops
        ARM: EXYNOS: add coupled cpuidle support for Exynos3250
        ARM: EXYNOS: add exynos_get_boot_addr() helper
        ARM: EXYNOS: add exynos_set_boot_addr() helper
        ARM: EXYNOS: make exynos_core_restart() less verbose
        ARM: EXYNOS: fix exynos_boot_secondary() return value on timeout
        ...
      4aa705b1
    • Linus Torvalds's avatar
      Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · c11d7162
      Linus Torvalds authored
      Pull ARM SoC cleanups from Kevin Hilman:
       "A relatively small setup of cleanups this time around, and similar to
        last time the bulk of it is removal of legacy board support:
      
         - OMAP: removal of legacy (non-DT) booting for several platforms
      
         - i.MX: remove some legacy board files"
      
      * tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (36 commits)
        ARM: fix EFM32 build breakage caused by cpu_resume_arm
        ARM: 8389/1: Add cpu_resume_arm() for firmwares that resume in ARM state
        ARM: v7 setup function should invalidate L1 cache
        mach-omap2: Remove use of deprecated marco, PTR_RET in devices.c
        ARM: OMAP2+: Remove calls to deprecacted marco,PTR_RET in the files,fb.c and pmu.c
        ARM: OMAP2+: Constify irq_domain_ops
        ARM: OMAP2+: use symbolic defines for console loglevels instead of numbers
        ARM: at91: remove useless Makefile.boot
        ARM: at91: remove at91rm9200_sdramc.h
        ARM: at91: remove mach/at91_ramc.h and mach/at91rm9200_mc.h
        ARM: at91/pm: use the atmel-mc syscon defines
        pcmcia: at91_cf: Use syscon to configure the MC/smc
        ARM: at91: declare the at91rm9200 memory controller as a syscon
        mfd: syscon: Add Atmel MC (Memory Controller) registers definition
        ARM: at91: drop sam9_smc.c
        ata: at91: use syscon to configure the smc
        ARM: ux500: delete static resource defines
        ARM: ux500: rename ux500_map_io
        ARM: ux500: look up PRCMU resource from DT
        ARM: ux500: kill off L2CC static map
        ...
      c11d7162
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 47a46942
      Linus Torvalds authored
      Merge second patchbomb from Andrew Morton:
      
       - most of the rest of MM
      
       - lots of misc things
      
       - procfs updates
      
       - printk feature work
      
       - updates to get_maintainer, MAINTAINERS, checkpatch
      
       - lib/ updates
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (96 commits)
        exit,stats: /* obey this comment */
        coredump: add __printf attribute to cn_*printf functions
        coredump: use from_kuid/kgid when formatting corename
        fs/reiserfs: remove unneeded cast
        NILFS2: support NFSv2 export
        fs/befs/btree.c: remove unneeded initializations
        fs/minix: remove unneeded cast
        init/do_mounts.c: add create_dev() failure log
        kasan: remove duplicate definition of the macro KASAN_FREE_PAGE
        fs/efs: femove unneeded cast
        checkpatch: emit "NOTE: <types>" message only once after multiple files
        checkpatch: emit an error when there's a diff in a changelog
        checkpatch: validate MODULE_LICENSE content
        checkpatch: add multi-line handling for PREFER_ETHER_ADDR_COPY
        checkpatch: suggest using eth_zero_addr() and eth_broadcast_addr()
        checkpatch: fix processing of MEMSET issues
        checkpatch: suggest using ether_addr_equal*()
        checkpatch: avoid NOT_UNIFIED_DIFF errors on cover-letter.patch files
        checkpatch: remove local from codespell path
        checkpatch: add --showfile to allow input via pipe to show filenames
        ...
      47a46942
    • Mike Snitzer's avatar
      dm cache policy smq: fix "default" version to be 1.4.0 · b5451e45
      Mike Snitzer authored
      Commit bccab6a0 ("dm cache: switch the "default" cache replacement
      policy from mq to smq") should've incremented the "default" policy's
      version number to 1.4.0 rather than reverting to version 1.0.0.
      Reported-by: default avatarAlasdair G Kergon <agk@redhat.com>
      Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
      b5451e45
    • Mike Snitzer's avatar
      dm: bump the ioctl version to 4.32.0 · 5532fba2
      Mike Snitzer authored
      This fix enables userspace to detect that the dm-stats changes from the
      4.2 merge are in place.
      Reported-by: default avatarAlasdair G Kergon <agk@redhat.com>
      Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
      5532fba2
    • Mike Snitzer's avatar
      Revert "block, dm: don't copy bios for request clones" · 78d8e58a
      Mike Snitzer authored
      This reverts commit 5f1b670d.
      
      Justification for revert as reported in this dm-devel post:
      https://www.redhat.com/archives/dm-devel/2015-June/msg00160.html
      
      this change should not be pushed to mainline yet.
      
      Firstly, Christoph has a newer version of the patch that fixes silent
      data corruption problem:
        https://www.redhat.com/archives/dm-devel/2015-May/msg00229.html
      
      And the new version still depends on LLDDs to always complete requests
      to the end when error happens, while block API doesn't enforce such a
      requirement. If the assumption is ever broken, the inconsistency between
      request and bio (e.g. rq->__sector and rq->bio) will cause silent data
      corruption:
        https://www.redhat.com/archives/dm-devel/2015-June/msg00022.htmlReported-by: default avatarJunichi Nomura <j-nomura@ce.jp.nec.com>
      Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
      78d8e58a
    • Mike Snitzer's avatar
      4e6e36c3
    • Linus Torvalds's avatar
      Merge tag 'rtc-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · c13c8100
      Linus Torvalds authored
      Pull RTC updates from Alexandre Belloni:
       "Core:
         - Coding style and whitespace fixes (interface, Makefile and Kconfig)
         - New rtc_tm_sub() helper
         - New CONFIG_RTC_SYSTOHC_DEVICE option
         - Removed rtc_set_mmss()
      
        New drivers:
         - Mediatek MT6397
         - Cortina Gemini
      
        Drivers:
         - Year 2106 fixes for isl1208, pcf8563 and sunxi
         - update author email for at32ap700x and efi
         - ds1307: alarm fix
         - efi: use correct EFI 'epoch'
         - hym8563: make irq optional
         - imxdi: cleanups and better handling of the security/tamper monitoring
         - snvs: fix wakealarm
         - Compilation fixes or warning removal for gemini, mt6397, palmas, pfc8563
         - Trivial cleanups for ab8500, ds1216, ds1286, ds1672, ep93xx,
           hid-sensor-time, max6900, max8998, max77686, max77802, mc13xxx, mv,
           mxc, s3c, spear, v3020
         - Kconfig fixes for stmp3xxx and xgene"
      
      * tag 'rtc-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (48 commits)
        rtc: remove useless I2C dependencies
        rtc: whitespace fixes
        rtc: Properly sort Makefile
        MAINTAINERS: Add RTC subsystem repository
        rtc: pfc8563: fix uninitialized variable warning
        rtc: ds1307: Enable the mcp794xx alarm after programming time
        rtc: hym8563: make the irq optional
        rtc: gemini: fix cocci warnings
        rtc: mv: correct 24 hour error message
        rtc: mv: use BIT()
        rtc: efi: use correct EFI 'epoch'
        rtc: interface: Remove rtc_set_mmss()
        sparc: time: Replace update_persistent_clock() with CONFIG_RTC_SYSTOHC
        rtc: NTP: Add CONFIG_RTC_SYSTOHC_DEVICE for NTP synchronization
        rtc: sunxi: Replace deprecated rtc_tm_to_time()
        rtc: isl1208: Replace deprecated rtc_tm_to_time()
        rtc: Introduce rtc_tm_sub() helper function
        rtc: pcf8563: Replace deprecated rtc_time_to_tm() and rtc_tm_to_time()
        rtc: palmas: Initialise bb_charging flag before using it
        rtc: simplify use of devm_ioremap_resource
        ...
      c13c8100
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 24867481
      Linus Torvalds authored
      Pull i2c updates from Wolfram Sang:
       "Highlights:
      
         - new drivers for Mediatek I2C, APM X-Gene, Broadcom Settop
         - major updates to at91, davinci
         - bugfixes to the mux infrastructure when dealing with the new quirk
           mechanism
         - more users for the bus recovery feature
         - further improvements to the slave framework
      
        Plus the usual bunch of smaller driver and core improvements and
        fixes.
      
        There is one patch removing old code from an ARM platform.  This has
        been acked by the sh_mobile maintainer Simon Horman"
      
      * 'i2c/for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (48 commits)
        i2c: busses: i2c-bcm2835: limits cdiv to allowed values
        i2c: sh_mobile: use proper type for timeout
        i2c: sh_mobile: use adapter default for timeout
        i2c: rcar: use proper type for timeout
        i2c: rcar: use adapter default for timeout
        i2c: designware: Make sure the device is suspended before disabling runtime PM
        i2c: tegra: apply size limit quirk
        i2c: tegra: don't advertise SMBUS_QUICK
        i2c: octeon: remove unused signal handling
        i2c: davinci: Optimize SCL generation
        i2c: mux: pca954x: Use __i2c_transfer because of quirks
        i2c: mux: Use __i2c_transfer() instead of calling parent's master_xfer()
        i2c: use parent adapter quirks in mux
        i2c: bcm2835: clear reserved bits in S-Register
        ARM: shmobile: r8a7740: remove I2C errata handling
        i2c: sh_mobile: add errata workaround
        i2c: at91: fix code checker warnings
        i2c: busses: xgene-slimpro: fix incorrect __init declation for probe
        i2c: davinci: Avoid sending to own address
        i2c: davinci: Refactor i2c_davinci_wait_bus_not_busy()
        ...
      24867481
    • Linus Torvalds's avatar
      Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration · 9390bd0d
      Linus Torvalds authored
      Pull mailbox updates from Jassi Brar.
      
      * 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        mailbox/bcm2835: Fix mailbox full detection.
        dt: mailbox: Remove 'mbox-names property is discouraged' message from binding
        mailbox: Add ability for clients to request channels by name
        mailbox: Enable BCM2835 mailbox support
        dt/bindings: Add binding for the BCM2835 mailbox driver
        mailbox: Fix up error handling in mbox_request_channel()
        mailbox: Make mbox_chan_ops const
        mailbox: altera: Add dependency on HAS_IOMEM
      9390bd0d
    • Linus Torvalds's avatar
      Merge tag 'edac/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac · da996f73
      Linus Torvalds authored
      Pull edac updates from Mauro Carvalho Chehab:
       "Some fixes and additions to the EDAC driver used on modern Intel x86
        CPUs.  It includes support for Broadwell EP/EX platforms and fixes for
        motherboards with more than 2 CPU sockets"
      
      * tag 'edac/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
        sb_edac: support for Broadwell -EP and -EX
        sb_edac: Fix support for systems with two home agents per socket
        sb_edac: Fix a typo and a thinko in address handling for Haswell
        EDAC: Remove arbitrary limit on number of channels
      da996f73