1. 27 May, 2016 17 commits
  2. 26 May, 2016 23 commits
    • Linus Torvalds's avatar
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · dc03c0f9
      Linus Torvalds authored
      Pull misc kbuild updates from Michal Marek:
       "This is the non-critical part of kbuild:
      
         - Coccinelle fixes, one semantic patch less in this round [Vaishali
           Thakkar, Wolfram Sang, Kees Cook]
      
         - rpm-pkg support for (open)SUSE's update-bootloader [Jiří Kosian]
      
         - rpm-pkg restored support for $RPMOPTS [Srinivas Pandruvada]
      
         - deb-pkg fixes for the linux-headers package [Bjørn Mork, Azriel
           Samson]"
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        coccicheck: Fix missing 0 index in kill loop
        scripts/package/Makefile: rpmbuild add support of RPMOPTS
        builddeb: fix missing headers in linux-headers package
        builddeb: include objtool binary in headers package
        kbuild/mkspec: support 'update-bootloader'-based systems
        scripts: coccinelle: remove check to move constants to right
        Coccinelle: setup_timer: Add space in front of parentheses
      dc03c0f9
    • Linus Torvalds's avatar
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · f429d355
      Linus Torvalds authored
      Pull kconfig update from Michal Marek:
      
       - fix for behavior of tristate choice items and fix for documentation
         of existing kconfig behavior [Dirk Gouders]
      
       - more helpful "unexpected data" kconfig warning [Paul Bolle]
      
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kconfig/symbol.c: handle choice_values that depend on 'm' symbols
        kconfig-language: elaborate on the type of a choice
        kconfig-language: fix comment on dependency-generated menu structures.
        kconfig: add unexpected data itself to warning
      f429d355
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 5b26fc88
      Linus Torvalds authored
      Pull kbuild updates from Michal Marek:
      
       - new option CONFIG_TRIM_UNUSED_KSYMS which does a two-pass build and
         unexports symbols which are not used in the current config [Nicolas
         Pitre]
      
       - several kbuild rule cleanups [Masahiro Yamada]
      
       - warning option adjustments for gcov etc [Arnd Bergmann]
      
       - a few more small fixes
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: (31 commits)
        kbuild: move -Wunused-const-variable to W=1 warning level
        kbuild: fix if_change and friends to consider argument order
        kbuild: fix adjust_autoksyms.sh for modules that need only one symbol
        kbuild: fix ksym_dep_filter when multiple EXPORT_SYMBOL() on the same line
        gcov: disable -Wmaybe-uninitialized warning
        gcov: disable tree-loop-im to reduce stack usage
        gcov: disable for COMPILE_TEST
        Kbuild: disable 'maybe-uninitialized' warning for CONFIG_PROFILE_ALL_BRANCHES
        Kbuild: change CC_OPTIMIZE_FOR_SIZE definition
        kbuild: forbid kernel directory to contain spaces and colons
        kbuild: adjust ksym_dep_filter for some cmd_* renames
        kbuild: Fix dependencies for final vmlinux link
        kbuild: better abstract vmlinux sequential prerequisites
        kbuild: fix call to adjust_autoksyms.sh when output directory specified
        kbuild: Get rid of KBUILD_STR
        kbuild: rename cmd_as_s_S to cmd_cpp_s_S
        kbuild: rename cmd_cc_i_c to cmd_cpp_i_c
        kbuild: drop redundant "PHONY += FORCE"
        kbuild: delete unnecessary "@:"
        kbuild: mark help target as PHONY
        ...
      5b26fc88
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · e12fab28
      Linus Torvalds authored
      Merge fixes from Andrew Morton:
       "10 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        drivers/pinctrl/intel/pinctrl-baytrail.c: fix build with gcc-4.4
        update "mm/zsmalloc: don't fail if can't create debugfs info"
        dma-debug: avoid spinlock recursion when disabling dma-debug
        mm: oom_reaper: remove some bloat
        memcg: fix mem_cgroup_out_of_memory() return value.
        ocfs2: fix improper handling of return errno
        mm: slub: remove unused virt_to_obj()
        mm: kasan: remove unused 'reserved' field from struct kasan_alloc_meta
        mm: make CONFIG_DEFERRED_STRUCT_PAGE_INIT depends on !FLATMEM explicitly
        seqlock: fix raw_read_seqcount_latch()
      e12fab28
    • Linus Torvalds's avatar
      Merge tag 'dax-locking-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 478a1469
      Linus Torvalds authored
      Pull DAX locking updates from Ross Zwisler:
       "Filesystem DAX locking for 4.7
      
         - We use a bit in an exceptional radix tree entry as a lock bit and
           use it similarly to how page lock is used for normal faults.  This
           fixes races between hole instantiation and read faults of the same
           index.
      
         - Filesystem DAX PMD faults are disabled, and will be re-enabled when
           PMD locking is implemented"
      
      * tag 'dax-locking-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
        dax: Remove i_mmap_lock protection
        dax: Use radix tree entry lock to protect cow faults
        dax: New fault locking
        dax: Allow DAX code to replace exceptional entries
        dax: Define DAX lock bit for radix tree exceptional entry
        dax: Make huge page handling depend of CONFIG_BROKEN
        dax: Fix condition for filling of PMD holes
      478a1469
    • Linus Torvalds's avatar
      Merge tag 'dax-misc-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 315227f6
      Linus Torvalds authored
      Pull misc DAX updates from Vishal Verma:
       "DAX error handling for 4.7
      
         - Until now, dax has been disabled if media errors were found on any
           device.  This enables the use of DAX in the presence of these
           errors by making all sector-aligned zeroing go through the driver.
      
         - The driver (already) has the ability to clear errors on writes that
           are sent through the block layer using 'DSMs' defined in ACPI 6.1.
      
        Other misc changes:
      
         - When mounting DAX filesystems, check to make sure the partition is
           page aligned.  This is a requirement for DAX, and previously, we
           allowed such unaligned mounts to succeed, but subsequent
           reads/writes would fail.
      
         - Misc/cleanup fixes from Jan that remove unused code from DAX
           related to zeroing, writeback, and some size checks"
      
      * tag 'dax-misc-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
        dax: fix a comment in dax_zero_page_range and dax_truncate_page
        dax: for truncate/hole-punch, do zeroing through the driver if possible
        dax: export a low-level __dax_zero_page_range helper
        dax: use sb_issue_zerout instead of calling dax_clear_sectors
        dax: enable dax in the presence of known media errors (badblocks)
        dax: fallback from pmd to pte on error
        block: Update blkdev_dax_capable() for consistency
        xfs: Add alignment check for DAX mount
        ext2: Add alignment check for DAX mount
        ext4: Add alignment check for DAX mount
        block: Add bdev_dax_supported() for dax mount checks
        block: Add vfs_msg() interface
        dax: Remove redundant inode size checks
        dax: Remove pointless writeback from dax_do_io()
        dax: Remove zeroing from dax_io()
        dax: Remove dead zeroing code from fault handlers
        ext2: Avoid DAX zeroing to corrupt data
        ext2: Fix block zeroing in ext2_get_blocks() for DAX
        dax: Remove complete_unwritten argument
        DAX: move RADIX_DAX_ definitions to dax.c
      315227f6
    • Andrew Morton's avatar
      drivers/pinctrl/intel/pinctrl-baytrail.c: fix build with gcc-4.4 · bbccb9c7
      Andrew Morton authored
      gcc-4.4 and thereabouts has issues with initializers of anonymous
      unions, and it generates the following warnings:
      
        drivers/pinctrl/intel/pinctrl-baytrail.c:413: error: unknown field 'simple_funcs' specified in initializer
        drivers/pinctrl/intel/pinctrl-baytrail.c:413: warning: missing braces around initializer
        drivers/pinctrl/intel/pinctrl-baytrail.c:413: warning: (near initialization for 'byt_score_groups[0].<anonymous>')
        drivers/pinctrl/intel/pinctrl-baytrail.c:415: error: unknown field 'simple_funcs' specified in initializer
        drivers/pinctrl/intel/pinctrl-baytrail.c:417: error: unknown field 'simple_funcs' specified in initializer
        ...
      
      Work around this.
      Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
      Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bbccb9c7
    • Dan Streetman's avatar
      update "mm/zsmalloc: don't fail if can't create debugfs info" · 4abaac9b
      Dan Streetman authored
      Some updates to commit d34f6157 ("mm/zsmalloc: don't fail if can't
      create debugfs info"):
      
       - add pr_warn to all stat failure cases
       - do not prevent module loading on stat failure
      
      Link: http://lkml.kernel.org/r/1463671123-5479-1-git-send-email-ddstreet@ieee.orgSigned-off-by: default avatarDan Streetman <ddstreet@ieee.org>
      Reviewed-by: default avatarGanesh Mahendran <opensource.ganesh@gmail.com>
      Acked-by: default avatarMinchan Kim <minchan@kernel.org>
      Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
      Cc: Dan Streetman <dan.streetman@canonical.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4abaac9b
    • Ville Syrjälä's avatar
      dma-debug: avoid spinlock recursion when disabling dma-debug · 3017cd63
      Ville Syrjälä authored
      With netconsole (at least) the pr_err("...  disablingn") call can
      recurse back into the dma-debug code, where it'll try to grab
      free_entries_lock again.  Avoid the problem by doing the printk after
      dropping the lock.
      
      Link: http://lkml.kernel.org/r/1463678421-18683-1-git-send-email-ville.syrjala@linux.intel.comSigned-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3017cd63
    • Michal Hocko's avatar
      mm: oom_reaper: remove some bloat · 7ef949d7
      Michal Hocko authored
      mmput_async is currently used only from the oom_reaper which is defined
      only for CONFIG_MMU.  We can save work_struct in mm_struct for
      !CONFIG_MMU.
      
      [akpm@linux-foundation.org: fix typo, per Minchan]
      Link: http://lkml.kernel.org/r/20160520061658.GB19172@dhcp22.suse.czReported-by: default avatarMinchan Kim <minchan@kernel.org>
      Signed-off-by: default avatarMichal Hocko <mhocko@suse.com>
      Acked-by: default avatarMinchan Kim <minchan@kernel.org>
      Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7ef949d7
    • Tetsuo Handa's avatar
      memcg: fix mem_cgroup_out_of_memory() return value. · 1ebab2db
      Tetsuo Handa authored
      mem_cgroup_out_of_memory() is returning "true" if it finds a TIF_MEMDIE
      task after an eligible task was found, "false" if it found a TIF_MEMDIE
      task before an eligible task is found.
      
      This difference confuses memory_max_write() which checks the return
      value of mem_cgroup_out_of_memory().  Since memory_max_write() wants to
      continue looping, mem_cgroup_out_of_memory() should return "true" in
      this case.
      
      This patch sets a dummy pointer in order to return "true".
      
      Link: http://lkml.kernel.org/r/1463753327-5170-1-git-send-email-penguin-kernel@I-love.SAKURA.ne.jpSigned-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
      Acked-by: default avatarMichal Hocko <mhocko@suse.com>
      Acked-by: default avatarVladimir Davydov <vdavydov@virtuozzo.com>
      Cc: Johannes Weiner <hannes@cmpxchg.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1ebab2db
    • Eric Ren's avatar
      ocfs2: fix improper handling of return errno · 1f3a437f
      Eric Ren authored
      Previously, if a bad inode was found in ocfs2_iget(), -ESTALE was
      returned back to the caller anyway.  Since commit d2b9d71a2da7 ("ocfs2:
      check/fix inode block for online file check") can handle with return
      value from ocfs2_read_locked_inode() now, we know the exact errno
      returned for us.
      
      Link: http://lkml.kernel.org/r/1463970656-18413-1-git-send-email-zren@suse.comSigned-off-by: default avatarEric Ren <zren@suse.com>
      Reviewed-by: default avatarJoseph Qi <joseph.qi@huawei.com>
      Cc: Mark Fasheh <mfasheh@suse.de>
      Cc: Joel Becker <jlbec@evilplan.org>
      Cc: Junxiao Bi <junxiao.bi@oracle.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1f3a437f
    • Andrey Ryabinin's avatar
      mm: slub: remove unused virt_to_obj() · d96c84f8
      Andrey Ryabinin authored
      It's unused since commit 7ed2f9e6 ("mm, kasan: SLAB support")
      
      Link: http://lkml.kernel.org/r/1464020961-2242-1-git-send-email-aryabinin@virtuozzo.comSigned-off-by: default avatarAndrey Ryabinin <aryabinin@virtuozzo.com>
      Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
      Cc: David Rientjes <rientjes@google.com>
      Cc: Pekka Enberg <penberg@kernel.org>
      Cc: Christoph Lameter <cl@linux.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d96c84f8
    • Andrey Ryabinin's avatar
      mm: kasan: remove unused 'reserved' field from struct kasan_alloc_meta · 9725759a
      Andrey Ryabinin authored
      Commit cd11016e ("mm, kasan: stackdepot implementation.  Enable
      stackdepot for SLAB") added 'reserved' field, but never used it.
      
      Link: http://lkml.kernel.org/r/1464021054-2307-1-git-send-email-aryabinin@virtuozzo.comSigned-off-by: default avatarAndrey Ryabinin <aryabinin@virtuozzo.com>
      Cc: Alexander Potapenko <glider@google.com>
      Cc: Dmitry Vyukov <dvyukov@google.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9725759a
    • Yang Shi's avatar
      mm: make CONFIG_DEFERRED_STRUCT_PAGE_INIT depends on !FLATMEM explicitly · 95794924
      Yang Shi authored
      Per the suggestion from Michal Hocko [1], DEFERRED_STRUCT_PAGE_INIT
      requires some ordering wrt other initialization operations, e.g.
      page_ext_init has to happen after the whole memmap is initialized
      properly.
      
      For SPARSEMEM this requires to wait for page_alloc_init_late.  Other
      memory models (e.g.  flatmem) might have different initialization
      layouts (page_ext_init_flatmem).  Currently DEFERRED_STRUCT_PAGE_INIT
      depends on MEMORY_HOTPLUG which in turn
      
      	depends on SPARSEMEM || X86_64_ACPI_NUMA
      	depends on ARCH_ENABLE_MEMORY_HOTPLUG
      
      and X86_64_ACPI_NUMA depends on NUMA which in turn disable FLATMEM
      memory model:
      
      config ARCH_FLATMEM_ENABLE
      	def_bool y
      	depends on X86_32 && !NUMA
      
      so FLATMEM is ruled out via dependency maze.  Be explicit and disable
      FLATMEM for DEFERRED_STRUCT_PAGE_INIT so that we do not reintroduce
      subtle initialization bugs
      
      [1] http://lkml.kernel.org/r/20160523073157.GD2278@dhcp22.suse.cz
      
      Link: http://lkml.kernel.org/r/1464027356-32282-1-git-send-email-yang.shi@linaro.orgSigned-off-by: default avatarYang Shi <yang.shi@linaro.org>
      Cc: Michal Hocko <mhocko@kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      95794924
    • Alexey Dobriyan's avatar
      seqlock: fix raw_read_seqcount_latch() · 50755bc1
      Alexey Dobriyan authored
      lockless_dereference() is supposed to take pointer not integer.
      
      Link: http://lkml.kernel.org/r/20160521201448.GA7429@p183.telecom.bySigned-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      50755bc1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · a10c38a4
      Linus Torvalds authored
      Pull Ceph updates from Sage Weil:
       "This changeset has a few main parts:
      
         - Ilya has finished a huge refactoring effort to sync up the
           client-side logic in libceph with the user-space client code, which
           has evolved significantly over the last couple years, with lots of
           additional behaviors (e.g., how requests are handled when cluster
           is full and transitions from full to non-full).
      
           This structure of the code is more closely aligned with userspace
           now such that it will be much easier to maintain going forward when
           behavior changes take place.  There are some locking improvements
           bundled in as well.
      
         - Zheng adds multi-filesystem support (multiple namespaces within the
           same Ceph cluster)
      
         - Zheng has changed the readdir offsets and directory enumeration so
           that dentry offsets are hash-based and therefore stable across
           directory fragmentation events on the MDS.
      
         - Zheng has a smorgasbord of bug fixes across fs/ceph"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (71 commits)
        ceph: fix wake_up_session_cb()
        ceph: don't use truncate_pagecache() to invalidate read cache
        ceph: SetPageError() for writeback pages if writepages fails
        ceph: handle interrupted ceph_writepage()
        ceph: make ceph_update_writeable_page() uninterruptible
        libceph: make ceph_osdc_wait_request() uninterruptible
        ceph: handle -EAGAIN returned by ceph_update_writeable_page()
        ceph: make fault/page_mkwrite return VM_FAULT_OOM for -ENOMEM
        ceph: block non-fatal signals for fault/page_mkwrite
        ceph: make logical calculation functions return bool
        ceph: tolerate bad i_size for symlink inode
        ceph: improve fragtree change detection
        ceph: keep leaf frag when updating fragtree
        ceph: fix dir_auth check in ceph_fill_dirfrag()
        ceph: don't assume frag tree splits in mds reply are sorted
        ceph: fix inode reference leak
        ceph: using hash value to compose dentry offset
        ceph: don't forbid marking directory complete after forward seek
        ceph: record 'offset' for each entry of readdir result
        ceph: define 'end/complete' in readdir reply as bit flags
        ...
      a10c38a4
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-4.7-1' of git://git.linux-nfs.org/projects/anna/linux-nfs · ea8ea737
      Linus Torvalds authored
      Pull NFS client updates from Anna Schumaker:
       "Highlights include:
      
        Features:
         - Add support for the NFS v4.2 COPY operation
         - Add support for NFS/RDMA over IPv6
      
        Bugfixes and cleanups:
         - Avoid race that crashes nfs_init_commit()
         - Fix oops in callback path
         - Fix LOCK/OPEN race when unlinking an open file
         - Choose correct stateids when using delegations in setattr, read and
           write
         - Don't send empty SETATTR after OPEN_CREATE
         - xprtrdma: Prevent server from writing a reply into memory client
           has released
         - xprtrdma: Support using Read list and Reply chunk in one RPC call"
      
      * tag 'nfs-for-4.7-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (61 commits)
        pnfs: pnfs_update_layout needs to consider if strict iomode checking is on
        nfs/flexfiles: Use the layout segment for reading unless it a IOMODE_RW and reading is disabled
        nfs/flexfiles: Helper function to detect FF_FLAGS_NO_READ_IO
        nfs: avoid race that crashes nfs_init_commit
        NFS: checking for NULL instead of IS_ERR() in nfs_commit_file()
        pnfs: make pnfs_layout_process more robust
        pnfs: rework LAYOUTGET retry handling
        pnfs: lift retry logic from send_layoutget to pnfs_update_layout
        pnfs: fix bad error handling in send_layoutget
        flexfiles: add kerneldoc header to nfs4_ff_layout_prepare_ds
        flexfiles: remove pointless setting of NFS_LAYOUT_RETURN_REQUESTED
        pnfs: only tear down lsegs that precede seqid in LAYOUTRETURN args
        pnfs: keep track of the return sequence number in pnfs_layout_hdr
        pnfs: record sequence in pnfs_layout_segment when it's created
        pnfs: don't merge new ff lsegs with ones that have LAYOUTRETURN bit set
        pNFS/flexfiles: When initing reads or writes, we might have to retry connecting to DSes
        pNFS/flexfiles: When checking for available DSes, conditionally check for MDS io
        pNFS/flexfile: Fix erroneous fall back to read/write through the MDS
        NFS: Reclaim writes via writepage are opportunistic
        NFSv4: Use the right stateid for delegations in setattr, read and write
        ...
      ea8ea737
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs · 0b9210c9
      Linus Torvalds authored
      Pull xfs updates from Dave Chinner:
       "A pretty average collection of fixes, cleanups and improvements in
        this request.
      
        Summary:
         - fixes for mount line parsing, sparse warnings, read-only compat
           feature remount behaviour
         - allow fast path symlink lookups for inline symlinks.
         - attribute listing cleanups
         - writeback goes direct to bios rather than indirecting through
           bufferheads
         - transaction allocation cleanup
         - optimised kmem_realloc
         - added configurable error handling for metadata write errors,
           changed default error handling behaviour from "retry forever" to
           "retry until unmount then fail"
         - fixed several inode cluster writeback lookup vs reclaim race
           conditions
         - fixed inode cluster writeback checking wrong inode after lookup
         - fixed bugs where struct xfs_inode freeing wasn't actually RCU safe
         - cleaned up inode reclaim tagging"
      
      * tag 'xfs-for-linus-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (39 commits)
        xfs: fix warning in xfs_finish_page_writeback for non-debug builds
        xfs: move reclaim tagging functions
        xfs: simplify inode reclaim tagging interfaces
        xfs: rename variables in xfs_iflush_cluster for clarity
        xfs: xfs_iflush_cluster has range issues
        xfs: mark reclaimed inodes invalid earlier
        xfs: xfs_inode_free() isn't RCU safe
        xfs: optimise xfs_iext_destroy
        xfs: skip stale inodes in xfs_iflush_cluster
        xfs: fix inode validity check in xfs_iflush_cluster
        xfs: xfs_iflush_cluster fails to abort on error
        xfs: remove xfs_fs_evict_inode()
        xfs: add "fail at unmount" error handling configuration
        xfs: add configuration handlers for specific errors
        xfs: add configuration of error failure speed
        xfs: introduce table-based init for error behaviors
        xfs: add configurable error support to metadata buffers
        xfs: introduce metadata IO error class
        xfs: configurable error behavior via sysfs
        xfs: buffer ->bi_end_io function requires irq-safe lock
        ...
      0b9210c9
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · c5436731
      Linus Torvalds authored
      Pull hwmon fixlets from Jean Delvare.
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        Documentation/hwmon: Update links in max34440
        hwmon: (emc2103) Fix typo in MODULE_PARM_DESC
      c5436731
    • Linus Torvalds's avatar
      Merge tag 'mmc-v4.7-rc1' of git://git.linaro.org/people/ulf.hansson/mmc · 0e77816e
      Linus Torvalds authored
      Pull MMC fixes from Ulf Hansson:
       "Here are some mmc fixes intended for v4.7 rc1.  They are based on a
        commit earlier in the merge window and have been tested in linux-next
        for a while.
      
        MMC core:
         - Prevent re-tuning while serving requests for RPMB partitions
         - Extend timeout for long read time quirk to support more eMMCs
      
        MMC host:
         - sdhci-acpi: Ensure connected devices are powered when probing
         - sdhci-pci|acpi: Remove unreliable MMC_CAP_BUS_WIDTH_TEST for Intel HWs
         - dw_mmc: Correct the assigning of max_blk_size
         - dw_mmc-rockchip: Allow RPMB partitions to be created
         - dw_mmc-rockchip: Set the drive phase properly"
      
      * tag 'mmc-v4.7-rc1' of git://git.linaro.org/people/ulf.hansson/mmc:
        mmc: sdhci-acpi: Remove MMC_CAP_BUS_WIDTH_TEST for Intel controllers
        mmc: sdhci-pci: Remove MMC_CAP_BUS_WIDTH_TEST for Intel controllers
        mmc: longer timeout for long read time quirk
        mmc: dw_mmc: rockchip: Set the drive phase properly
        mmc: dw_mmc: fix the wrong max_blk_size
        mmc: dw_mmc-rockchip: add MMC_CAP_CMD23 capabilities
        mmc: sdhci-acpi: Ensure connected devices are powered when probing
        ACPI / PM: Export acpi_device_fix_up_power()
        mmc: block: Pause re-tuning while switched to the RPMB partition
        mmc: block: Always switch back to main area after RPMB access
        mmc: core: Add a facility to "pause" re-tuning
      0e77816e
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · bfb76444
      Linus Torvalds authored
      Pull thermal management updates from Zhang Rui:
      
       - Introduce generic ADC thermal driver, based on OF thermal (Laxman
         Dewangan)
      
       - Introduce new thermal driver for Tango chips (Marc Gonzalez)
      
       - Rockchip driver support for RK3399, RK3366, and some fixes (Caesar
         Wang, Elaine Zhang and Shawn Lin)
      
       - Add CPU power cooling model to Mediatek thermal driver (Dawei Chien)
      
       - Wider usage of dev_thermal_zone_of_sensor_register (Eduardo Valentin)
      
       - TI thermal driver gained a new maintainer (Keerthy).
      
       - Enabled powerclamp driver by checking CPU feature and package cstate
         counter instead of CPU whitelist (Jacob Pan)
      
       - Various fixes on thermal governor, OF thermal, Tegra, and RCAR
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (50 commits)
        thermal: tango: initialize TEMPSI_CFG
        thermal: rockchip: use the usleep_range instead of udelay
        thermal: rockchip: add the notes for better reading
        thermal: rockchip: Support RK3366 SoCs in the thermal driver
        thermal: rockchip: handle the power sequence for tsadc controller
        thermal: rockchip: update the tsadc table for rk3399
        thermal: rockchip: fixes the code_to_temp for tsadc driver
        thermal: rockchip: disable thermal->clk in err case
        thermal: tegra: add Tegra132 specific SOC_THERM driver
        thermal: fix ptr_ret.cocci warnings
        thermal: mediatek: Add cpu dynamic power cooling model.
        thermal: generic-adc: Add ADC based thermal sensor driver
        thermal: generic-adc: Add DT binding for ADC based thermal sensor
        thermal: tegra: fix static checker warning
        thermal: tegra: mark PM functions __maybe_unused
        thermal: add temperature sensor support for tango SoC
        thermal: hisilicon: fix IRQ imbalance enabling
        thermal: hisilicon: support to use any sensor
        thermal: rcar: Remove binding docs for r8a7794
        thermal: tegra: add PM support
        ...
      bfb76444
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 159d08f4
      Linus Torvalds authored
      Pull Yama locking fix from James Morris:
       "Fix for the Yama LSM"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        Yama: fix double-spinlock and user access in atomic context
      159d08f4