1. 24 May, 2017 16 commits
  2. 16 May, 2017 1 commit
  3. 08 May, 2017 6 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 2d3e4866
      Linus Torvalds authored
      Pull KVM updates from Paolo Bonzini:
       "ARM:
         - HYP mode stub supports kexec/kdump on 32-bit
         - improved PMU support
         - virtual interrupt controller performance improvements
         - support for userspace virtual interrupt controller (slower, but
           necessary for KVM on the weird Broadcom SoCs used by the Raspberry
           Pi 3)
      
        MIPS:
         - basic support for hardware virtualization (ImgTec P5600/P6600/I6400
           and Cavium Octeon III)
      
        PPC:
         - in-kernel acceleration for VFIO
      
        s390:
         - support for guests without storage keys
         - adapter interruption suppression
      
        x86:
         - usual range of nVMX improvements, notably nested EPT support for
           accessed and dirty bits
         - emulation of CPL3 CPUID faulting
      
        generic:
         - first part of VCPU thread request API
         - kvm_stat improvements"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (227 commits)
        kvm: nVMX: Don't validate disabled secondary controls
        KVM: put back #ifndef CONFIG_S390 around kvm_vcpu_kick
        Revert "KVM: Support vCPU-based gfn->hva cache"
        tools/kvm: fix top level makefile
        KVM: x86: don't hold kvm->lock in KVM_SET_GSI_ROUTING
        KVM: Documentation: remove VM mmap documentation
        kvm: nVMX: Remove superfluous VMX instruction fault checks
        KVM: x86: fix emulation of RSM and IRET instructions
        KVM: mark requests that need synchronization
        KVM: return if kvm_vcpu_wake_up() did wake up the VCPU
        KVM: add explicit barrier to kvm_vcpu_kick
        KVM: perform a wake_up in kvm_make_all_cpus_request
        KVM: mark requests that do not need a wakeup
        KVM: remove #ifndef CONFIG_S390 around kvm_vcpu_wake_up
        KVM: x86: always use kvm_make_request instead of set_bit
        KVM: add kvm_{test,clear}_request to replace {test,clear}_bit
        s390: kvm: Cpu model support for msa6, msa7 and msa8
        KVM: x86: remove irq disablement around KVM_SET_CLOCK/KVM_GET_CLOCK
        kvm: better MWAIT emulation for guests
        KVM: x86: virtualize cpuid faulting
        ...
      2d3e4866
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm · 9c6ee01e
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "Lots of little things this time:
      
         - allow modules to be autoloaded according to the HWCAP feature bits
           (used primarily for crypto modules)
      
         - split module core and init PLT sections, since the core code and
           init code could be placed far apart, and the PLT sections need to
           be local to the code block.
      
         - three patches from Chris Brandt to allow Cortex-A9 L2 cache
           optimisations to be disabled where a SoC didn't wire up the out of
           band signals.
      
         - NoMMU compliance fixes, avoiding corruption of vector table which
           is not being used at this point, and avoiding possible register
           state corruption when switching mode.
      
         - fixmap memory attribute compliance update.
      
         - remove unnecessary locking from update_sections_early()
      
         - ftrace fix for DEBUG_RODATA with !FRAME_POINTER"
      
      * 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
        ARM: 8672/1: mm: remove tasklist locking from update_sections_early()
        ARM: 8671/1: V7M: Preserve registers across switch from Thread to Handler mode
        ARM: 8670/1: V7M: Do not corrupt vector table around v7m_invalidate_l1 call
        ARM: 8668/1: ftrace: Fix dynamic ftrace with DEBUG_RODATA and !FRAME_POINTER
        ARM: 8667/3: Fix memory attribute inconsistencies when using fixmap
        ARM: 8663/1: wire up HWCAP/HWCAP2 feature bits to the CPU modalias
        ARM: 8666/1: mm: dump: Add domain to output
        ARM: 8662/1: module: split core and init PLT sections
        ARM: 8661/1: dts: r7s72100: add l2 cache
        ARM: 8660/1: shmobile: r7s72100: Enable L2 cache
        ARM: 8659/1: l2c: allow CA9 optimizations to be disabled
      9c6ee01e
    • Linus Torvalds's avatar
      Merge tag 'xtensa-20170507' of git://github.com/jcmvbkbc/linux-xtensa · d9dc0895
      Linus Torvalds authored
      Pull Xtensa updates from Max Filippov:
      
       - clearly mark references to spilled register locations with SPILL_SLOT
         macros
      
       - clean up xtensa ptrace: use generic tracehooks, move internal kernel
         definitions from uapi/asm to asm, make locally-used functions static,
         fix code style and alignment
      
       - use command line parameters passed to ISS as kernel command line.
      
      * tag 'xtensa-20170507' of git://github.com/jcmvbkbc/linux-xtensa:
        xtensa: clean up access to spilled registers locations
        xtensa: use generic tracehooks
        xtensa: move internal ptrace definitions from uapi/asm to asm
        xtensa: clean up xtensa/kernel/ptrace.c
        xtensa: drop unused fast_io_protect function
        xtensa: use ITLB_HIT_BIT instead of hardcoded number
        xtensa: ISS: update kernel command line in platform_setup
        xtensa: ISS: add argc/argv simcall definitions
        xtensa: ISS: cleanup setup.c
      d9dc0895
    • Linus Torvalds's avatar
      Merge tag 'for-f2fs-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · 70ef8f0d
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "In this round, we've focused on enhancing performance with regards to
        block allocation, GC, and discard/in-place-update IO controls. There
        are a bunch of clean-ups as well as minor bug fixes.
      
        Enhancements:
         - disable heap-based allocation by default
         - issue small-sized discard commands by default
         - change the policy of data hotness for logging
         - distinguish IOs in terms of size and wbc type
         - start SSR earlier to avoid foreground GC
         - enhance data structures managing discard commands
         - enhance in-place update flow
         - add some more fault injection routines
         - secure one more xattr entry
      
        Bug fixes:
         - calculate victim cost for GC correctly
         - remain correct victim segment number for GC
         - race condition in nid allocator and initializer
         - stale pointer produced by atomic_writes
         - fix missing REQ_SYNC for flush commands
         - handle missing errors in more corner cases"
      
      * tag 'for-f2fs-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (111 commits)
        f2fs: fix a mount fail for wrong next_scan_nid
        f2fs: enhance scalability of trace macro
        f2fs: relocate inode_{,un}lock in F2FS_IOC_SETFLAGS
        f2fs: Make flush bios explicitely sync
        f2fs: show available_nids in f2fs/status
        f2fs: flush dirty nats periodically
        f2fs: introduce CP_TRIMMED_FLAG to avoid unneeded discard
        f2fs: allow cpc->reason to indicate more than one reason
        f2fs: release cp and dnode lock before IPU
        f2fs: shrink size of struct discard_cmd
        f2fs: don't hold cmd_lock during waiting discard command
        f2fs: nullify fio->encrypted_page for each writes
        f2fs: sanity check segment count
        f2fs: introduce valid_ipu_blkaddr to clean up
        f2fs: lookup extent cache first under IPU scenario
        f2fs: reconstruct code to write a data page
        f2fs: introduce __wait_discard_cmd
        f2fs: introduce __issue_discard_cmd
        f2fs: enable small discard by default
        f2fs: delay awaking discard thread
        ...
      70ef8f0d
    • Linus Torvalds's avatar
      Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt · 677375ce
      Linus Torvalds authored
      Pull fscrypt updates from Ted Ts'o:
       "Only bug fixes and cleanups for this merge window"
      
      * tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
        fscrypt: correct collision claim for digested names
        MAINTAINERS: fscrypt: update mailing list, patchwork, and git
        ext4: clean up ext4_match() and callers
        f2fs: switch to using fscrypt_match_name()
        ext4: switch to using fscrypt_match_name()
        fscrypt: introduce helper function for filename matching
        fscrypt: avoid collisions when presenting long encrypted filenames
        f2fs: check entire encrypted bigname when finding a dentry
        ubifs: check for consistent encryption contexts in ubifs_lookup()
        f2fs: sync f2fs_lookup() with ext4_lookup()
        ext4: remove "nokey" check from ext4_lookup()
        fscrypt: fix context consistency check when key(s) unavailable
        fscrypt: Remove __packed from fscrypt_policy
        fscrypt: Move key structure and constants to uapi
        fscrypt: remove fscrypt_symlink_data_len()
        fscrypt: remove unnecessary checks for NULL operations
      677375ce
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · dd727dad
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
      
       - add GETFSMAP support
      
       - some performance improvements for very large file systems and for
         random write workloads into a preallocated file
      
       - bug fixes and cleanups.
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        jbd2: cleanup write flags handling from jbd2_write_superblock()
        ext4: mark superblock writes synchronous for nobarrier mounts
        ext4: inherit encryption xattr before other xattrs
        ext4: replace BUG_ON with WARN_ONCE in ext4_end_bio()
        ext4: avoid unnecessary transaction stalls during writeback
        ext4: preload block group descriptors
        ext4: make ext4_shutdown() static
        ext4: support GETFSMAP ioctls
        vfs: add common GETFSMAP ioctl definitions
        ext4: evict inline data when writing to memory map
        ext4: remove ext4_xattr_check_entry()
        ext4: rename ext4_xattr_check_names() to ext4_xattr_check_entries()
        ext4: merge ext4_xattr_list() into ext4_listxattr()
        ext4: constify static data that is never modified
        ext4: trim return value and 'dir' argument from ext4_insert_dentry()
        jbd2: fix dbench4 performance regression for 'nobarrier' mounts
        jbd2: Fix lockdep splat with generic/270 test
        mm: retry writepages() on ENOMEM when doing an data integrity writeback
      dd727dad
  4. 07 May, 2017 2 commits
  5. 06 May, 2017 13 commits
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · fe7a719b
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
       "Various fixes for stable for CIFS/SMB3 especially for better
        interoperability for SMB3 to Macs.
      
        It also includes Pavel's improvements to SMB3 async i/o support
        (which is much faster now)"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        CIFS: add misssing SFM mapping for doublequote
        SMB3: Work around mount failure when using SMB3 dialect to Macs
        cifs: fix CIFS_IOC_GET_MNT_INFO oops
        CIFS: fix mapping of SFM_SPACE and SFM_PERIOD
        CIFS: fix oplock break deadlocks
        cifs: fix CIFS_ENUMERATE_SNAPSHOTS oops
        cifs: fix leak in FSCTL_ENUM_SNAPS response handling
        Set unicode flag on cifs echo request to avoid Mac error
        CIFS: Add asynchronous write support through kernel AIO
        CIFS: Add asynchronous read support through kernel AIO
        CIFS: Add asynchronous context to support kernel AIO
        cifs: fix IPv6 link local, with scope id, address parsing
        cifs: small underflow in cnvrtDosUnixTm()
      fe7a719b
    • Linus Torvalds's avatar
      Merge tag 'xfs-4.12-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · d484467c
      Linus Torvalds authored
      Pull xfs updates from Darrick Wong:
       "Here are the XFS changes for 4.12. The big new feature for this
        release is the new space mapping ioctl that we've been discussing
        since LSF2016, but other than that most of the patches are larger bug
        fixes, memory corruption prevention, and other cleanups.
      
        Summary:
         - various code cleanups
         - introduce GETFSMAP ioctl
         - various refactoring
         - avoid dio reads past eof
         - fix memory corruption and other errors with fragmented directory blocks
         - fix accidental userspace memory corruptions
         - publish fs uuid in superblock
         - make fstrim terminatable
         - fix race between quotaoff and in-core inode creation
         - avoid use-after-free when finishing up w/ buffer heads
         - reserve enough space to handle bmap tree resizing during cow remap"
      
      * tag 'xfs-4.12-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (53 commits)
        xfs: fix use-after-free in xfs_finish_page_writeback
        xfs: reserve enough blocks to handle btree splits when remapping
        xfs: wait on new inodes during quotaoff dquot release
        xfs: update ag iterator to support wait on new inodes
        xfs: support ability to wait on new inodes
        xfs: publish UUID in struct super_block
        xfs: Allow user to kill fstrim process
        xfs: better log intent item refcount checking
        xfs: fix up quotacheck buffer list error handling
        xfs: remove xfs_trans_ail_delete_bulk
        xfs: don't use bool values in trace buffers
        xfs: fix getfsmap userspace memory corruption while setting OF_LAST
        xfs: fix __user annotations for xfs_ioc_getfsmap
        xfs: corruption needs to respect endianess too!
        xfs: use NULL instead of 0 to initialize a pointer in xfs_ioc_getfsmap
        xfs: use NULL instead of 0 to initialize a pointer in xfs_getfsmap
        xfs: simplify validation of the unwritten extent bit
        xfs: remove unused values from xfs_exntst_t
        xfs: remove the unused XFS_MAXLINK_1 define
        xfs: more do_div cleanups
        ...
      d484467c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 044f1daa
      Linus Torvalds authored
      Pull block fixes and updates from Jens Axboe:
       "Some fixes and followup features/changes that should go in, in this
        merge window. This contains:
      
         - Two fixes for lightnvm from Javier, fixing problems in the new code
           merge previously in this merge window.
      
         - A fix from Jan for the backing device changes, fixing an issue in
           NFS that causes a failure to mount on certain setups.
      
         - A change from Christoph, cleaning up the blk-mq init and exit
           request paths.
      
         - Remove elevator_change(), which is now unused. From Bart.
      
         - A fix for queue operation invocation on a dead queue, from Bart.
      
         - A series fixing up mtip32xx for blk-mq scheduling, removing a
           bandaid we previously had in place for this. From me.
      
         - A regression fix for this series, fixing a case where we wait on
           workqueue flushing from an invalid (non-blocking) context. From me.
      
         - A fix/optimization from Ming, ensuring that we don't both quiesce
           and freeze a queue at the same time.
      
         - A fix from Peter on lock ordering for CPU hotplug. Not a real
           problem right now, but will be once the CPU hotplug rework goes in.
      
         - A series from Omar, cleaning up out blk-mq debugfs support, and
           adding support for exporting info from schedulers in debugfs as
           well. This is really useful in debugging stalls or livelocks. From
           Omar"
      
      * 'for-linus' of git://git.kernel.dk/linux-block: (28 commits)
        mq-deadline: add debugfs attributes
        kyber: add debugfs attributes
        blk-mq-debugfs: allow schedulers to register debugfs attributes
        blk-mq: untangle debugfs and sysfs
        blk-mq: move debugfs declarations to a separate header file
        blk-mq: Do not invoke queue operations on a dead queue
        blk-mq-debugfs: get rid of a bunch of boilerplate
        blk-mq-debugfs: rename hw queue directories from <n> to hctx<n>
        blk-mq-debugfs: don't open code strstrip()
        blk-mq-debugfs: error on long write to queue "state" file
        blk-mq-debugfs: clean up flag definitions
        blk-mq-debugfs: separate flags with |
        nfs: Fix bdi handling for cloned superblocks
        block/mq: Cure cpu hotplug lock inversion
        lightnvm: fix bad back free on error path
        lightnvm: create cmd before allocating request
        blk-mq: don't use sync workqueue flushing from drivers
        mtip32xx: convert internal commands to regular block infrastructure
        mtip32xx: cleanup internal tag assumptions
        block: don't call blk_mq_quiesce_queue() after queue is frozen
        ...
      044f1daa
    • Greg Kroah-Hartman's avatar
      refcount: change EXPORT_SYMBOL markings · d557d1b5
      Greg Kroah-Hartman authored
      Now that kref is using the refcount apis, the _GPL markings are getting
      exported to places that it previously wasn't.  Now kref.h is GPLv2
      licensed, so any non-GPL code using it better be talking to some
      lawyers, but changing api markings isn't considered "nice", so let's fix
      this up.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d557d1b5
    • Masahiro Yamada's avatar
      docs: bump minimal GNU Make version to 3.81 · 37d69ee3
      Masahiro Yamada authored
      Since 2014, you can't successfully build kernels with GNU Make version
      3.80. Example errors:
      
        $ git describe
        v4.11
        $ make --version | head -1
        GNU Make 3.80
        $ make defconfig
          HOSTCC  scripts/basic/fixdep
        scripts/Makefile.host:135: *** missing separator.  Stop.
        make: *** [defconfig] Error 2
        $ make ARCH=arm64 help
        arch/arm64/Makefile:43: *** unterminated call to function `warning': missing `)'.  Stop.
        $ make help >/dev/null
        ./Documentation/Makefile.sphinx:25: Extraneous text after `else' directive
        ./Documentation/Makefile.sphinx:31: *** only one `else' per conditional.  Stop.
        make: *** [help] Error 2
      
      The first breakage was introduced by commit c8589d1e ("kbuild:
      handle multi-objs dependency appropriately").  Since then (i.e. v3.18),
      GNU Make 3.80 has not been able to compile the kernel, but nobody has
      ever complained aboutt (or noticed) it.
      
      Even GNU Make 3.81 is more than 10 years old.  It would not hurt to
      match the documentation with reality instead of fixing makefiles.
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      37d69ee3
    • Linus Torvalds's avatar
      initramfs: avoid "label at end of compound statement" error · 394e4f5d
      Linus Torvalds authored
      Commit 17a9be31 ("initramfs: Always do fput() and load modules after
      rootfs populate") introduced an error for the
      
          CONFIG_BLK_DEV_RAM=y
      
      case, because even though the code looks fine, the compiler really wants
      a statement after a label, or you'll get complaints:
      
        init/initramfs.c: In function 'populate_rootfs':
        init/initramfs.c:644:2: error: label at end of compound statement
      
      That commit moved the subsequent statements to outside the compound
      statement, leaving the label without any associated statements.
      Reported-by: default avatarJörg Otte <jrg.otte@gmail.com>
      Fixes: 17a9be31 ("initramfs: Always do fput() and load modules after rootfs populate")
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Stafford Horne <shorne@gmail.com>
      Cc: stable@vger.kernel.org  # if 17a9be31 gets backported
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      394e4f5d
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 3ef2bc09
      Linus Torvalds authored
      Pull DeviceTree updates from Rob Herring:
      
       - fix sparse warnings in drivers/of/
      
       - add more overlay unittests
      
       - update dtc to v1.4.4-8-g756ffc4f52f6. This adds more checks on dts
         files such as unit-address formatting and stricter character sets for
         node and property names
      
       - add a common DT modalias function
      
       - move trivial-devices.txt up and out of i2c dir
      
       - ARM NVIC interrupt controller binding
      
       - vendor prefixes for Sensirion, Dioo, Nordic, ROHM
      
       - correct some binding file locations
      
      * tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (24 commits)
        of: fix sparse warnings in fdt, irq, reserved mem, and resolver code
        of: fix sparse warning in of_pci_range_parser_one
        of: fix sparse warnings in of_find_next_cache_node
        of/unittest: Missing unlocks on error
        of: fix uninitialized variable warning for overlay test
        of: fix unittest build without CONFIG_OF_OVERLAY
        of: Add unit tests for applying overlays
        of: per-file dtc compiler flags
        fpga: region: add missing DT documentation for config complete timeout
        of: Add vendor prefix for ROHM Semiconductor
        of: fix "/cpus" reference leak in of_numa_parse_cpu_nodes()
        of: Add vendor prefix for Nordic Semiconductor
        dt-bindings: arm,nvic: Binding for ARM NVIC interrupt controller on Cortex-M
        dtc: update warning settings for new bus and node/property name checks
        scripts/dtc: Update to upstream version v1.4.4-8-g756ffc4f52f6
        scripts/dtc: automate getting dtc version and log in update script
        of: Add function for generating a DT modalias with a newline
        of: fix of_device_get_modalias returned length when truncating buffers
        Documentation: devicetree: move trivial-devices out of I2C realm
        dt-bindings: add vendor prefix for Dioo
        ..
      3ef2bc09
    • Linus Torvalds's avatar
      Merge tag 'for-4.12/dm-fixes' of... · 2eecf3a4
      Linus Torvalds authored
      Merge tag 'for-4.12/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
      
      Pull device mapper fixes from Mike Snitzer:
      
       - DM cache metadata fixes to short-circuit operations that require the
         metadata not be in 'fail_io' mode. Otherwise crashes are possible.
      
       - a DM cache fix to address the inability to adapt to continuous IO
         that happened to also reflect a changing working set (which required
         old blocks be demoted before the new working set could be promoted)
      
       - a DM cache smq policy cleanup that fell out from reviewing the above
      
       - fix the Kconfig help text for CONFIG_DM_INTEGRITY
      
      * tag 'for-4.12/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm cache metadata: fail operations if fail_io mode has been established
        dm integrity: improve the Kconfig help text for DM_INTEGRITY
        dm cache policy smq: cleanup free_target_met() and clean_target_met()
        dm cache policy smq: allow demotions to happen even during continuous IO
      2eecf3a4
    • Linus Torvalds's avatar
      Merge tag 'libnvdimm-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 53ef7d0e
      Linus Torvalds authored
      Pull libnvdimm updates from Dan Williams:
       "The bulk of this has been in multiple -next releases. There were a few
        late breaking fixes and small features that got added in the last
        couple days, but the whole set has received a build success
        notification from the kbuild robot.
      
        Change summary:
      
         - Region media error reporting: A libnvdimm region device is the
           parent to one or more namespaces. To date, media errors have been
           reported via the "badblocks" attribute attached to pmem block
           devices for namespaces in "raw" or "memory" mode. Given that
           namespaces can be in "device-dax" or "btt-sector" mode this new
           interface reports media errors generically, i.e. independent of
           namespace modes or state.
      
           This subsequently allows userspace tooling to craft "ACPI 6.1
           Section 9.20.7.6 Function Index 4 - Clear Uncorrectable Error"
           requests and submit them via the ioctl path for NVDIMM root bus
           devices.
      
         - Introduce 'struct dax_device' and 'struct dax_operations': Prompted
           by a request from Linus and feedback from Christoph this allows for
           dax capable drivers to publish their own custom dax operations.
           This fixes the broken assumption that all dax operations are
           related to a persistent memory device, and makes it easier for
           other architectures and platforms to add customized persistent
           memory support.
      
         - 'libnvdimm' core updates: A new "deep_flush" sysfs attribute is
           available for storage appliance applications to manually trigger
           memory controllers to drain write-pending buffers that would
           otherwise be flushed automatically by the platform ADR
           (asynchronous-DRAM-refresh) mechanism at a power loss event.
           Support for "locked" DIMMs is included to prevent namespaces from
           surfacing when the namespace label data area is locked. Finally,
           fixes for various reported deadlocks and crashes, also tagged for
           -stable.
      
         - ACPI / nfit driver updates: General updates of the nfit driver to
           add DSM command overrides, ACPI 6.1 health state flags support, DSM
           payload debug available by default, and various fixes.
      
        Acknowledgements that came after the branch was pushed:
      
         - commmit 565851c9 "device-dax: fix sysfs attribute deadlock":
      Tested-by: default avatarYi Zhang <yizhan@redhat.com>
      
         - commit 23f49844 "libnvdimm: rework region badblocks clearing"
           Tested-by: Toshi Kani <toshi.kani@hpe.com>"
      
      * tag 'libnvdimm-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (52 commits)
        libnvdimm, pfn: fix 'npfns' vs section alignment
        libnvdimm: handle locked label storage areas
        libnvdimm: convert NDD_ flags to use bitops, introduce NDD_LOCKED
        brd: fix uninitialized use of brd->dax_dev
        block, dax: use correct format string in bdev_dax_supported
        device-dax: fix sysfs attribute deadlock
        libnvdimm: restore "libnvdimm: band aid btt vs clear poison locking"
        libnvdimm: fix nvdimm_bus_lock() vs device_lock() ordering
        libnvdimm: rework region badblocks clearing
        acpi, nfit: kill ACPI_NFIT_DEBUG
        libnvdimm: fix clear length of nvdimm_forget_poison()
        libnvdimm, pmem: fix a NULL pointer BUG in nd_pmem_notify
        libnvdimm, region: sysfs trigger for nvdimm_flush()
        libnvdimm: fix phys_addr for nvdimm_clear_poison
        x86, dax, pmem: remove indirection around memcpy_from_pmem()
        block: remove block_device_operations ->direct_access()
        block, dax: convert bdev_dax_supported() to dax_direct_access()
        filesystem-dax: convert to dax_direct_access()
        Revert "block: use DAX for partition table reads"
        ext2, ext4, xfs: retrieve dax_device for iomap operations
        ...
      53ef7d0e
    • Linus Torvalds's avatar
      Merge tag 'staging-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · c6a677c6
      Linus Torvalds authored
      Pull staging/IIO updates from Greg KH:
       "Here is the big staging tree update for 4.12-rc1.
      
        It's a big one, adding about 350k new lines of crap^Wcode, mostly all
        in a big dump of media drivers from Intel. But there's other new
        drivers in here as well, yet-another-wifi driver, new IIO drivers, and
        a new crypto accelerator.
      
        We also deleted a bunch of stuff, mostly in patch cleanups, but also
        the Android ION code has shrunk a lot, and the Android low memory
        killer driver was finally deleted, much to the celebration of the -mm
        developers.
      
        All of these have been in linux-next with a few build issues that will
        show up when you merge to your tree"
      
      Merge conflicts in the new rtl8723bs driver (due to the wifi changes
      this merge window) handled as per linux-next, courtesy of Stephen
      Rothwell.
      
      * tag 'staging-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1182 commits)
        staging: fsl-mc/dpio: add cpu <--> LE conversion for dpaa2_fd
        staging: ks7010: remove line continuations in quoted strings
        staging: vt6656: use tabs instead of spaces
        staging: android: ion: Fix unnecessary initialization of static variable
        staging: media: atomisp: fix range checking on clk_num
        staging: media: atomisp: fix misspelled word in comment
        staging: media: atomisp: kmap() can't fail
        staging: atomisp: remove #ifdef for runtime PM functions
        staging: atomisp: satm include directory is gone
        atomisp: remove some more unused files
        atomisp: remove hmm_load/store/clear indirections
        atomisp: kill off mmgr_free
        atomisp: clean up the hmm init/cleanup indirections
        atomisp: handle allocation calls before init in the hmm layer
        staging: fsl-dpaa2/eth: Add maintainer for Ethernet driver
        staging: fsl-dpaa2/eth: Add TODO file
        staging: fsl-dpaa2/eth: Add trace points
        staging: fsl-dpaa2/eth: Add driver specific stats
        staging: fsl-dpaa2/eth: Add ethtool support
        staging: fsl-dpaa2/eth: Add Freescale DPAA2 Ethernet driver
        ...
      c6a677c6
    • Linus Torvalds's avatar
      Merge tag 'media/v4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · e87d51ac
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
       "Media updates for v4.12-rc1:
      
         - new driver to support mediatek jpeg in hardware codec
      
         - rc-lirc, s5p-cec and st-cec staging drivers got promoted
      
         - hardware histogram support for vsp1 driver
      
         - added Virtual Media Controller driver, to make easier to test the
           media controller
      
         - added a new CEC driver (rainshadow-cec)
      
         - removed two staging LIRC drivers for obscure hardware that are too
           obsolete
      
         - added support for Intel SR300 Depth camera
      
         - some improvements at CEC and RC core
      
         - lots of driver cleanups, improvements all over the tree
      
        With this series, we're finally getting rid of the LIRC staging
        driver. There's just one left (lirc_zilog), with require more care,
        as part of its functionality (IR RX) is already provided by another
        driver. Work in progress to convert it on the proper way"
      
      * tag 'media/v4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (304 commits)
        [media] ov2640: print error if devm_*_optional*() fails
        [media] atmel-isc: Fix the static checker warning
        [media] ov2640: add support for MEDIA_BUS_FMT_YVYU8_2X8 and MEDIA_BUS_FMT_VYUY8_2X8
        [media] ov2640: fix vflip control
        [media] ov2640: fix duplicate width+height returning from ov2640_select_win()
        [media] ov2640: add missing write to size change preamble
        [media] ov2640: add information about DSP register 0xc7
        [media] ov2640: improve banding filter register definitions/documentation
        [media] ov2640: fix init sequence alignment
        [media] ov2640: make GPIOLIB an optional dependency
        [media] xc5000: fix spelling mistake: "calibration"
        [media] vidioc-queryctrl.rst: fix menu/int menu references
        [media] media-entity: only call dev_dbg_obj if mdev is not NULL
        [media] pixfmt-meta-vsp1-hgo.rst: remove spurious '-'
        [media] mtk-vcodec: avoid warnings because of empty macros
        [media] coda: bump maximum number of internal framebuffers to 17
        [media] media: mtk-vcodec: remove informative log
        [media] subdev-formats.rst: remove spurious '-'
        [media] dw2102: limit messages to buffer size
        [media] ttusb2: limit messages to buffer size
        ...
      e87d51ac
    • Linus Torvalds's avatar
      Merge tag 'drm-coc-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux · bdc713bf
      Linus Torvalds authored
      Pull drm CoC pointer from Dave Airlie:
       "Small supplementary pull request. I didn't want anyone saying we snuck
        this in in a the middle of a big pile of changes, so here is a clearly
        separate pull request documenting the code of conduct introduced for
        freedesktop.org and how it relates to dri-devel community"
      
      * tag 'drm-coc-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux:
        drm: Document code of conduct
      bdc713bf
    • Linus Torvalds's avatar
      Merge tag 'drm-forgot-about-tegra-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux · 1062ae49
      Linus Torvalds authored
      Pull drm tegra updates from Dave Airlie:
       "I missed a pull request from Thierry, this stuff has been in
        linux-next for a while anyways.
      
        It does contain a branch from the iommu tree, but Thierry said it
        should be fine"
      
      * tag 'drm-forgot-about-tegra-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux:
        gpu: host1x: Fix host1x driver shutdown
        gpu: host1x: Support module reset
        gpu: host1x: Sort includes alphabetically
        drm/tegra: Add VIC support
        dt-bindings: Add bindings for the Tegra VIC
        drm/tegra: Add falcon helper library
        drm/tegra: Add Tegra DRM allocation API
        drm/tegra: Add tiling FB modifiers
        drm/tegra: Don't leak kernel pointer to userspace
        drm/tegra: Protect IOMMU operations by mutex
        drm/tegra: Enable IOVA API when IOMMU support is enabled
        gpu: host1x: Add IOMMU support
        gpu: host1x: Fix potential out-of-bounds access
        iommu/iova: Fix compile error with CONFIG_IOMMU_IOVA=m
        iommu: Add dummy implementations for !IOMMU_IOVA
        MAINTAINERS: Add related headers to IOMMU section
        iommu/iova: Consolidate code for adding new node to iovad domain rbtree
      1062ae49
  6. 05 May, 2017 2 commits
    • Linus Torvalds's avatar
      Merge tag 'gfs2-4.12.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · 1a5fb64f
      Linus Torvalds authored
      Pull GFS2 updates from Bob Peterson:
       "We've got ten GFS2 patches for this merge window.
      
         - Andreas Gruenbacher wrote a patch to replace the deprecated call to
           rhashtable_walk_init with rhashtable_walk_enter.
      
         - Andreas also wrote a patch to eliminate redundant code in two of
           our debugfs sequence files.
      
         - Andreas also cleaned up the rhashtable key ugliness Linus pointed
           out during this cycle, following Linus's suggestions.
      
         - Andreas also wrote a patch to take advantage of his new function
           rhashtable_lookup_get_insert_fast. This makes glock lookup faster
           and more bullet-proof.
      
         - Andreas also wrote a patch to revert a patch in the evict path that
           caused occasional deadlocks, and is no longer needed.
      
         - Andrew Price wrote a patch to re-enable fallocate for the rindex
           system file to enable gfs2_grow to grow properly on secondary file
           system grow operations.
      
         - I wrote a patch to initialize an inode number field to make certain
           kernel trace points more understandable.
      
         - I also wrote a patch that makes GFS2 file system "withdraw" work
           more like it should by ignoring operations after a withdraw that
           would formerly cause a BUG() and kernel panic.
      
         - I also reworked the entire truncate/delete algorithm, scrapping the
           old recursive algorithm in favor of a new non-recursive algorithm.
           This was done for performance: This way, GFS2 no longer needs to
           lock multiple resource groups while doing truncates and deletes of
           files that cross multiple resource group boundaries, allowing for
           better parallelism. It also solves a problem whereby deleting large
           files would request a large chunk of kernel memory, which resulted
           in a get_page_from_freelist warning.
      
         - Due to a regression found during testing, I added a new patch to
           correct 'GFS2: Prevent BUG from occurring when normal Withdraws
           occur'."
      
      * tag 'gfs2-4.12.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        GFS2: Allow glocks to be unlocked after withdraw
        GFS2: Non-recursive delete
        gfs2: Re-enable fallocate for the rindex
        Revert "GFS2: Wait for iopen glock dequeues"
        gfs2: Switch to rhashtable_lookup_get_insert_fast
        GFS2: Temporarily zero i_no_addr when creating a dinode
        gfs2: Don't pack struct lm_lockname
        gfs2: Deduplicate gfs2_{glocks,glstats}_open
        gfs2: Replace rhashtable_walk_init with rhashtable_walk_enter
        GFS2: Prevent BUG from occurring when normal Withdraws occur
      1a5fb64f
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.12-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux · aeced661
      Linus Torvalds authored
      Pull orangefs updates from Mike Marshall:
       "Orangefs cleanups, fixes and statx support.
      
        Some cleanups:
      
         - remove unused get_fsid_from_ino
         - fix bounds check for listxattr
         - clean up oversize xattr validation
         - do not set getattr_time on orangefs_lookup
         - return from orangefs_devreq_read quickly if possible
         - do not wait for timeout if umounting
         - handle zero size write in debugfs
      
        Bug fixes:
      
         - do not check possibly stale size on truncate
         - ensure the userspace component is unmounted if mount fails
         - total reimplementation of dir.c
      
        New feature:
      
         - implement statx
      
        The new implementation of dir.c is kind of a big deal, all new code.
        It has been posted to fs-devel during the previous rc period, we
        didn't get much review or feedback from there, but it has been
        reviewed very heavily here, so much so that we have two entire
        versions of the reimplementation.
      
        Not only does the new implementation fix some xfstests, but it passes
        all the new tests we made here that involve seeking and rewinding and
        giant directories and long file names. The new dir code has three
        patches itself:
      
         - skip forward to the next directory entry if seek is short
         - invalidate stored directory on seek
         - count directory pieces correctly"
      
      * tag 'for-linus-4.12-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
        orangefs: count directory pieces correctly
        orangefs: invalidate stored directory on seek
        orangefs: skip forward to the next directory entry if seek is short
        orangefs: handle zero size write in debugfs
        orangefs: do not wait for timeout if umounting
        orangefs: return from orangefs_devreq_read quickly if possible
        orangefs: ensure the userspace component is unmounted if mount fails
        orangefs: do not check possibly stale size on truncate
        orangefs: implement statx
        orangefs: remove ORANGEFS_READDIR macros
        orangefs: support very large directories
        orangefs: support llseek on directories
        orangefs: rewrite readdir to fix several bugs
        orangefs: do not set getattr_time on orangefs_lookup
        orangefs: clean up oversize xattr validation
        orangefs: fix bounds check for listxattr
        orangefs: remove unused get_fsid_from_ino
      aeced661