1. 15 Oct, 2016 1 commit
  2. 11 Oct, 2016 12 commits
    • Linus Torvalds's avatar
      Merge tag 'media/v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · de34f4da
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
      
       - Documentation improvements: conversion of all non-DocBook documents
         to Sphinx and lots of fixes to the uAPI media book
      
       - New PCI driver for Techwell TW5864 media grabber boards
      
       - New SoC driver for ATMEL Image Sensor Controller
      
       - Removal of some obsolete SoC drivers (s5p-tv driver and soc_camera
         drivers)
      
       - Addition of ST CEC driver
      
       - Lots of drivers fixes, improvements and additions
      
      * tag 'media/v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (464 commits)
        [media] ttusb_dec: avoid the risk of go past buffer
        [media] cx23885: Fix some smatch warnings
        [media] si2165: switch to regmap
        [media] si2165: use i2c_client->dev instead of i2c_adapter->dev for logging
        [media] si2165: Remove legacy attach
        [media] cx231xx: attach si2165 driver via i2c_client
        [media] cx231xx: Prepare for attaching new style i2c_client DVB demod drivers
        [media] cx23885: attach si2165 driver via i2c_client
        [media] si2165: support i2c_client attach
        [media] si2165: avoid division by zero
        [media] rcar-vin: add R-Car gen2 fallback compatibility string
        [media] lgdt3306a: remove 20*50 msec unnecessary timeout
        [media] cx25821: Remove deprecated create_singlethread_workqueue
        [media] cx25821: Drop Freeing of Workqueue
        [media] cxd2841er: force 8MHz bandwidth for DVB-C if specified bw not supported
        [media] redrat3: hardware-specific parameters
        [media] redrat3: remove hw_timeout member
        [media] cxd2841er: BER and SNR reading for ISDB-T
        [media] dvb-usb: avoid link error with dib3000m{b,c|
        [media] dvb-usb: split out common parts of dibusb
        ...
      de34f4da
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 56e520c7
      Linus Torvalds authored
      Pull IOMMU updates from Joerg Roedel:
      
       - support for interrupt virtualization in the AMD IOMMU driver. These
         patches were shared with the KVM tree and are already merged through
         that tree.
      
       - generic DT-binding support for the ARM-SMMU driver. With this the
         driver now makes use of the generic DMA-API code. This also required
         some changes outside of the IOMMU code, but these are acked by the
         respective maintainers.
      
       - more cleanups and fixes all over the place.
      
      * tag 'iommu-updates-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (40 commits)
        iommu/amd: No need to wait iommu completion if no dte irq entry change
        iommu/amd: Free domain id when free a domain of struct dma_ops_domain
        iommu/amd: Use standard bitmap operation to set bitmap
        iommu/amd: Clean up the cmpxchg64 invocation
        iommu/io-pgtable-arm: Check for v7s-incapable systems
        iommu/dma: Avoid PCI host bridge windows
        iommu/dma: Add support for mapping MSIs
        iommu/arm-smmu: Set domain geometry
        iommu/arm-smmu: Wire up generic configuration support
        Docs: dt: document ARM SMMU generic binding usage
        iommu/arm-smmu: Convert to iommu_fwspec
        iommu/arm-smmu: Intelligent SMR allocation
        iommu/arm-smmu: Add a stream map entry iterator
        iommu/arm-smmu: Streamline SMMU data lookups
        iommu/arm-smmu: Refactor mmu-masters handling
        iommu/arm-smmu: Keep track of S2CR state
        iommu/arm-smmu: Consolidate stream map entry state
        iommu/arm-smmu: Handle stream IDs more dynamically
        iommu/arm-smmu: Set PRIVCFG in stage 1 STEs
        iommu/arm-smmu: Support non-PCI devices with SMMUv3
        ...
      56e520c7
    • Linus Torvalds's avatar
      Merge tag 'libnvdimm-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · d09ba131
      Linus Torvalds authored
      Pull libnvdimm updates from Dan Williams:
       "Aside from the recently added pmem sub-division support these have
        been in -next for several releases with no reported issues. The sub-
        division support was included in next-20161010 with no reported
        issues. It passes all unit tests including new tests for all the new
        functionality below.
      
        Summary:
      
         - PMEM sub-division support: Allow a single PMEM region to be divided
           into multiple namespaces. Originally, ~2 years ago, it was thought
           that partitions of a /dev/pmemX block device could handle
           sub-allocations of persistent memory for different use cases. With
           the decision to not support DAX mappings of raw block-devices, and
           the genesis of device-dax, the need for having multiple
           pmem-namespace per region has grown.
      
         - Device-DAX unified inode: In support of dynamic-resizing of a
           device-dax instance the kernel arranges for all mappings of a
           device-dax node to share the same inode. This allows unmap /
           truncate / invalidation events to affect all instances of the
           device similar to the behavior of mmap on block devices.
      
         - Hardware error scrubbing reworks: The original address-range-scrub
           and badblocks tracking solution allowed clearing entries at the
           individual namespace level, but it failed to clear the internal
           list of media errors maintained at the bus level. The result was
           that the next scrub or namespace disable/re-enable event would
           restore the cleared badblocks, but now that is fixed. The v4.8
           kernel introduced an auto-scrub-on-machine-check behavior to
           repopulate the badblocks list. Now, in v4.9, the auto-scrub
           behavior can be disabled and simply arrange for the error reported
           in the machine-check to be added to the list.
      
         - DIMM health-event notification support: ACPI 6.1 defines a
           notification event code that can be send to ACPI NVDIMM devices. A
           poll(2) capable file descriptor for these events can be obtained
           from the nmemX/nfit/flags sysfs-attribute of a libnvdimm memory
           device.
      
         - Miscellaneous fixes: NVDIMM-N probe error, device-dax build error,
           and a change to dedup the flush hint list to not flush the memory
           controller more than necessary"
      
      * tag 'libnvdimm-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (39 commits)
        /dev/dax: fix Kconfig dependency build breakage
        dax: use correct dev_t value
        dax: convert devm_create_dax_dev to PTR_ERR
        libnvdimm, namespace: allow creation of multiple pmem-namespaces per region
        libnvdimm, namespace: lift single pmem limit in scan_labels()
        libnvdimm, namespace: filter out of range labels in scan_labels()
        libnvdimm, namespace: enable allocation of multiple pmem namespaces
        libnvdimm, namespace: update label implementation for multi-pmem
        libnvdimm, namespace: expand pmem device naming scheme for multi-pmem
        libnvdimm, region: update nd_region_available_dpa() for multi-pmem support
        libnvdimm, namespace: sort namespaces by dpa at init
        libnvdimm, namespace: allow multiple pmem-namespaces per region at scan time
        tools/testing/nvdimm: support for sub-dividing a pmem region
        libnvdimm, namespace: unify blk and pmem label scanning
        libnvdimm, namespace: refactor uuid_show() into a namespace_to_uuid() helper
        libnvdimm, label: convert label tracking to a linked list
        libnvdimm, region: move region-mapping input-paramters to nd_mapping_desc
        nvdimm: reduce duplicated wpq flushes
        libnvdimm: clear the internal poison_list when clearing badblocks
        pmem: reduce kmap_atomic sections to the memcpys only
        ...
      d09ba131
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · f29135b5
      Linus Torvalds authored
      Pull btrfs updates from Chris Mason:
       "This is a big variety of fixes and cleanups.
      
        Liu Bo continues to fixup fuzzer related problems, and some of Josef's
        cleanups are prep for his bigger extent buffer changes (slated for
        v4.10)"
      
      * 'for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (39 commits)
        Revert "btrfs: let btrfs_delete_unused_bgs() to clean relocated bgs"
        Btrfs: remove unnecessary btrfs_mark_buffer_dirty in split_leaf
        Btrfs: don't BUG() during drop snapshot
        btrfs: fix btrfs_no_printk stub helper
        Btrfs: memset to avoid stale content in btree leaf
        btrfs: parent_start initialization cleanup
        btrfs: Remove already completed TODO comment
        btrfs: Do not reassign count in btrfs_run_delayed_refs
        btrfs: fix a possible umount deadlock
        Btrfs: fix memory leak in do_walk_down
        btrfs: btrfs_debug should consume fs_info when DEBUG is not defined
        btrfs: convert send's verbose_printk to btrfs_debug
        btrfs: convert pr_* to btrfs_* where possible
        btrfs: convert printk(KERN_* to use pr_* calls
        btrfs: unsplit printed strings
        btrfs: clean the old superblocks before freeing the device
        Btrfs: kill BUG_ON in run_delayed_tree_ref
        Btrfs: don't leak reloc root nodes on error
        btrfs: squash lines for simple wrapper functions
        Btrfs: improve check_node to avoid reading corrupted nodes
        ...
      f29135b5
    • Linus Torvalds's avatar
      Merge tag 'upstream-4.9-rc1' of git://git.infradead.org/linux-ubifs · 4c609922
      Linus Torvalds authored
      Pull UBI/UBIFS updates from Richard Weinberger:
       "This pull request contains:
      
         - Fixes for both UBI and UBIFS
         - overlayfs support (O_TMPFILE, RENAME_WHITEOUT/EXCHANGE)
         - Code refactoring for the upcoming MLC support"
      
      [ Ugh, we just got rid of the "rename2()" naming for the extended rename
        functionality. And this re-introduces it in ubifs with the cross-
        renaming and whiteout support.
      
        But rather than do any re-organizations in the merge itself, the
        naming can be cleaned up later ]
      
      * tag 'upstream-4.9-rc1' of git://git.infradead.org/linux-ubifs: (27 commits)
        UBIFS: improve function-level documentation
        ubifs: fix host xattr_len when changing xattr
        ubifs: Use move variable in ubifs_rename()
        ubifs: Implement RENAME_EXCHANGE
        ubifs: Implement RENAME_WHITEOUT
        ubifs: Implement O_TMPFILE
        ubi: Fix Fastmap's update_vol()
        ubi: Fix races around ubi_refill_pools()
        ubi: Deal with interrupted erasures in WL
        UBI: introduce the VID buffer concept
        UBI: hide EBA internals
        UBI: provide an helper to query LEB information
        UBI: provide an helper to check whether a LEB is mapped or not
        UBI: add an helper to check lnum validity
        UBI: simplify LEB write and atomic LEB change code
        UBI: simplify recover_peb() code
        UBI: move the global ech and vidh variables into struct ubi_attach_info
        UBI: provide helpers to allocate and free aeb elements
        UBI: fastmap: use ubi_io_{read, write}_data() instead of ubi_io_{read, write}()
        UBI: fastmap: use ubi_rb_for_each_entry() in unmap_peb()
        ...
      4c609922
    • Al Viro's avatar
      Fix off-by-one in __pipe_get_pages() · 1689c73a
      Al Viro authored
      
      
      it actually worked only when requested area ended on the page boundary...
      
      Reported-by: default avatarMarco Grassi <marco.gra@gmail.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1689c73a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 6b5e09a7
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Netfilter list handling fix, from Linus.
      
       2) RXRPC/AFS bug fixes from David Howells (oops on call to serviceless
          endpoints, build warnings, missing notifications, etc.) From David
          Howells.
      
       3) Kernel log message missing newlines, from Colin Ian King.
      
       4) Don't enter direct reclaim in netlink dumps, the idea is to use a
          high order allocation first and fallback quickly to a 0-order
          allocation if such a high-order one cannot be done cheaply and
          without reclaim. From Eric Dumazet.
      
       5) Fix firmware download errors in btusb bluetooth driver, from Ethan
          Hsieh.
      
       6) Missing Kconfig deps for QCOM_EMAC, from Geert Uytterhoeven.
      
       7) Fix MDIO_XGENE dup Kconfig entry. From Laura Abbott.
      
       8) Constrain ipv6 rtr_solicits sysctl values properly, from Maciej
          Żenczykowski.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (65 commits)
        netfilter: Fix slab corruption.
        be2net: Enable VF link state setting for BE3
        be2net: Fix TX stats for TSO packets
        be2net: Update Copyright string in be_hw.h
        be2net: NCSI FW section should be properly updated with ethtool for BE3
        be2net: Provide an alternate way to read pf_num for BEx chips
        wan/fsl_ucc_hdlc: Fix size used in dma_free_coherent()
        net: macb: NULL out phydev after removing mdio bus
        xen-netback: make sure that hashes are not send to unaware frontends
        Fixing a bug in team driver due to incorrect 'unsigned int' to 'int' conversion
        MAINTAINERS: add myself as a maintainer of xen-netback
        ipv6 addrconf: disallow rtr_solicits < -1
        Bluetooth: btusb: Fix atheros firmware download error
        drivers: net: phy: Correct duplicate MDIO_XGENE entry
        ethernet: qualcomm: QCOM_EMAC should depend on HAS_DMA and HAS_IOMEM
        net: ethernet: mediatek: remove hwlro property in the device tree
        net: ethernet: mediatek: get hw lro capability by the chip id instead of by the dtsi
        net: ethernet: mediatek: get the chip id by ETHDMASYS registers
        net: bgmac: Fix errant feature flag check
        netlink: do not enter direct reclaim from netlink_dump()
        ...
      6b5e09a7
    • Linus Torvalds's avatar
      netfilter: Fix slab corruption. · bd3769bf
      Linus Torvalds authored
      Use the correct pattern for singly linked list insertion and
      deletion.  We can also calculate the list head outside of the
      mutex.
      
      Fixes: e3b37f11
      
       ("netfilter: replace list_head with single linked list")
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Reviewed-by: default avatarAaron Conole <aconole@bytheb.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      
      net/netfilter/core.c | 108 ++++++++++++++++-----------------------------------
       1 file changed, 33 insertions(+), 75 deletions(-)
      bd3769bf
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 101105b1
      Linus Torvalds authored
      Pull more vfs updates from Al Viro:
       ">rename2() work from Miklos + current_time() from Deepa"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        fs: Replace current_fs_time() with current_time()
        fs: Replace CURRENT_TIME_SEC with current_time() for inode timestamps
        fs: Replace CURRENT_TIME with current_time() for inode timestamps
        fs: proc: Delete inode time initializations in proc_alloc_inode()
        vfs: Add current_time() api
        vfs: add note about i_op->rename changes to porting
        fs: rename "rename2" i_op to "rename"
        vfs: remove unused i_op->rename
        fs: make remaining filesystems use .rename2
        libfs: support RENAME_NOREPLACE in simple_rename()
        fs: support RENAME_NOREPLACE for local filesystems
        ncpfs: fix unused variable warning
      101105b1
    • Al Viro's avatar
      3873691e
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20161008' of git://git.infradead.org/linux-mtd · 35ff96df
      Linus Torvalds authored
      Pull MTD updates from Brian Norris:
       "I've not been very active this cycle, so these are mostly from Boris,
        for the NAND flash subsystem.
      
        NAND:
      
         - Add the infrastructure to automate NAND timings configuration
      
         - Provide a generic DT property to maximize ECC strength
      
         - Some refactoring in the core bad block table handling, to help with
           improving some of the logic in error cases.
      
         - Minor cleanups and fixes
      
        MTD:
      
         - Add APIs for handling page pairing; this is necessary for reliably
           supporting MLC and TLC NAND flash, where paired-page disturbance
           affects reliability. Upper layers (e.g., UBI) should make use of
           these in the near future"
      
      * tag 'for-linus-20161008' of git://git.infradead.org/linux-mtd: (35 commits)
        mtd: nand: fix trivial spelling error
        mtdpart: Propagate _get/put_device()
        mtd: nand: Provide nand_cleanup() function to free NAND related resources
        mtd: Kill the OF_MTD Kconfig option
        mtd: nand: mxc: Test CONFIG_OF instead of CONFIG_OF_MTD
        mtd: nand: Fix nand_command_lp() for 8bits opcodes
        mtd: nand: sunxi: Support ECC maximization
        mtd: nand: Support maximizing ECC when using software BCH
        mtd: nand: Add an option to maximize the ECC strength
        mtd: nand: mxc: Add timing setup for v2 controllers
        mtd: nand: mxc: implement onfi get/set features
        mtd: nand: sunxi: switch from manual to automated timing config
        mtd: nand: automate NAND timings selection
        mtd: nand: Expose data interface for ONFI mode 0
        mtd: nand: Add function to convert ONFI mode to data_interface
        mtd: nand: convert ONFI mode into data interface
        mtd: nand: Introduce nand_data_interface
        mtd: nand: Create a NAND reset function
        mtd: nand: remove unnecessary 'extern' from function declarations
        MAINTAINERS: Add maintainer entry for Ingenic JZ4780 NAND driver
        ...
      35ff96df
    • Linus Torvalds's avatar
      Merge branch 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 97d21167
      Linus Torvalds authored
      Pull vfs xattr updates from Al Viro:
       "xattr stuff from Andreas
      
        This completes the switch to xattr_handler ->get()/->set() from
        ->getxattr/->setxattr/->removexattr"
      
      * 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        vfs: Remove {get,set,remove}xattr inode operations
        xattr: Stop calling {get,set,remove}xattr inode operations
        vfs: Check for the IOP_XATTR flag in listxattr
        xattr: Add __vfs_{get,set,remove}xattr helpers
        libfs: Use IOP_XATTR flag for empty directory handling
        vfs: Use IOP_XATTR flag for bad-inode handling
        vfs: Add IOP_XATTR inode operations flag
        vfs: Move xattr_resolve_name to the front of fs/xattr.c
        ecryptfs: Switch to generic xattr handlers
        sockfs: Get rid of getxattr iop
        sockfs: getxattr: Fail with -EOPNOTSUPP for invalid attribute names
        kernfs: Switch to generic xattr handlers
        hfs: Switch to generic xattr handlers
        jffs2: Remove jffs2_{get,set,remove}xattr macros
        xattr: Remove unnecessary NULL attribute name check
      97d21167
  3. 10 Oct, 2016 25 commits
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 30066ce6
      Linus Torvalds authored
      Pull crypto updates from Herbert Xu:
       "Here is the crypto update for 4.9:
      
        API:
         - The crypto engine code now supports hashes.
      
        Algorithms:
         - Allow keys >= 2048 bits in FIPS mode for RSA.
      
        Drivers:
         - Memory overwrite fix for vmx ghash.
         - Add support for building ARM sha1-neon in Thumb2 mode.
         - Reenable ARM ghash-ce code by adding import/export.
         - Reenable img-hash by adding import/export.
         - Add support for multiple cores in omap-aes.
         - Add little-endian support for sha1-powerpc.
         - Add Cavium HWRNG driver for ThunderX SoC"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (137 commits)
        crypto: caam - treat SGT address pointer as u64
        crypto: ccp - Make syslog errors human-readable
        crypto: ccp - clean up data structure
        crypto: vmx - Ensure ghash-generic is enabled
        crypto: testmgr - add guard to dst buffer for ahash_export
        crypto: caam - Unmap region obtained by of_iomap
        crypto: sha1-powerpc - little-endian support
        crypto: gcm - Fix IV buffer size in crypto_gcm_setkey
        crypto: vmx - Fix memory corruption caused by p8_ghash
        crypto: ghash-generic - move common definitions to a new header file
        crypto: caam - fix sg dump
        hwrng: omap - Only fail if pm_runtime_get_sync returns < 0
        crypto: omap-sham - shrink the internal buffer size
        crypto: omap-sham - add support for export/import
        crypto: omap-sham - convert driver logic to use sgs for data xmit
        crypto: omap-sham - change the DMA threshold value to a define
        crypto: omap-sham - add support functions for sg based data handling
        crypto: omap-sham - rename sgl to sgl_tmp for deprecation
        crypto: omap-sham - align algorithms on word offset
        crypto: omap-sham - add context export/import stubs
        ...
      30066ce6
    • Linus Torvalds's avatar
      Merge tag 'dlm-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · 6763afe4
      Linus Torvalds authored
      Pull dlm fix from David Teigland:
       "This includes a bug fix for a bad memory access during workqueue
        cleanup, which can happen while shutting down the dlm networking
        layer"
      
      * tag 'dlm-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: free workqueues after the connections
      6763afe4
    • Linus Torvalds's avatar
      Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client · 8dfb790b
      Linus Torvalds authored
      Pull Ceph updates from Ilya Dryomov:
       "The big ticket item here is support for rbd exclusive-lock feature,
        with maintenance operations offloaded to userspace (Douglas Fuller,
        Mike Christie and myself). Another block device bullet is a series
        fixing up layering error paths (myself).
      
        On the filesystem side, we've got patches that improve our handling of
        buffered vs dio write races (Neil Brown) and a few assorted fixes from
        Zheng. Also included a couple of random cleanups and a minor CRUSH
        update"
      
      * tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client: (39 commits)
        crush: remove redundant local variable
        crush: don't normalize input of crush_ln iteratively
        libceph: ceph_build_auth() doesn't need ceph_auth_build_hello()
        libceph: use CEPH_AUTH_UNKNOWN in ceph_auth_build_hello()
        ceph: fix description for rsize and rasize mount options
        rbd: use kmalloc_array() in rbd_header_from_disk()
        ceph: use list_move instead of list_del/list_add
        ceph: handle CEPH_SESSION_REJECT message
        ceph: avoid accessing / when mounting a subpath
        ceph: fix mandatory flock check
        ceph: remove warning when ceph_releasepage() is called on dirty page
        ceph: ignore error from invalidate_inode_pages2_range() in direct write
        ceph: fix error handling of start_read()
        rbd: add rbd_obj_request_error() helper
        rbd: img_data requests don't own their page array
        rbd: don't call rbd_osd_req_format_read() for !img_data requests
        rbd: rework rbd_img_obj_exists_submit() error paths
        rbd: don't crash or leak on errors in rbd_img_obj_parent_read_full_callback()
        rbd: move bumping img_request refcount into rbd_obj_request_submit()
        rbd: mark the original request as done if stat request fails
        ...
      8dfb790b
    • Chris Mason's avatar
      Revert "btrfs: let btrfs_delete_unused_bgs() to clean relocated bgs" · 19c4d2f9
      Chris Mason authored
      This reverts commit 5d8eb6fe
      
      .
      
      When we remove devices, we free the device structures.  Delaying
      btfs_remove_chunk() ends up hitting a use-after-free on them.
      
      Signed-off-by: default avatarChris Mason <clm@fb.com>
      19c4d2f9
    • Linus Torvalds's avatar
      Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · fed41f7d
      Linus Torvalds authored
      Pull splice fixups from Al Viro:
       "A couple of fixups for interaction of pipe-backed iov_iter with
        O_DIRECT reads + constification of a couple of primitives in uio.h
        missed by previous rounds.
      
        Kudos to davej - his fuzzing has caught those bugs"
      
      * 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        [btrfs] fix check_direct_IO() for non-iovec iterators
        constify iov_iter_count() and iter_is_iovec()
        fix ITER_PIPE interaction with direct_IO
      fed41f7d
    • Linus Torvalds's avatar
      Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · abb5a14f
      Linus Torvalds authored
      Pull misc vfs updates from Al Viro:
       "Assorted misc bits and pieces.
      
        There are several single-topic branches left after this (rename2
        series from Miklos, current_time series from Deepa Dinamani, xattr
        series from Andreas, uaccess stuff from from me) and I'd prefer to
        send those separately"
      
      * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (39 commits)
        proc: switch auxv to use of __mem_open()
        hpfs: support FIEMAP
        cifs: get rid of unused arguments of CIFSSMBWrite()
        posix_acl: uapi header split
        posix_acl: xattr representation cleanups
        fs/aio.c: eliminate redundant loads in put_aio_ring_file
        fs/internal.h: add const to ns_dentry_operations declaration
        compat: remove compat_printk()
        fs/buffer.c: make __getblk_slow() static
        proc: unsigned file descriptors
        fs/file: more unsigned file descriptors
        fs: compat: remove redundant check of nr_segs
        cachefiles: Fix attempt to read i_blocks after deleting file [ver #2]
        cifs: don't use memcpy() to copy struct iov_iter
        get rid of separate multipage fault-in primitives
        fs: Avoid premature clearing of capabilities
        fs: Give dentry to inode_change_ok() instead of inode
        fuse: Propagate dentry down to inode_change_ok()
        ceph: Propagate dentry down to inode_change_ok()
        xfs: Propagate dentry down to inode_change_ok()
        ...
      abb5a14f
    • Linus Torvalds's avatar
      Merge branch 'pcmcia' of git://git.armlinux.org.uk/~rmk/linux-arm · 911f9dab
      Linus Torvalds authored
      Pull ARM pcmcia updates from Russell King:
       "These updates lay the foundations for more generic soc_common PCMCIA
        support, which will result in several of the board specific drivers
        being elimated.
      
        As the dependencies for this are complex, the preliminary work is
        being submitted now, with the remainder scheduled for the next merge
        window"
      
      * 'pcmcia' of git://git.armlinux.org.uk/~rmk/linux-arm:
        pcmcia: soc_common: add driver-data pointer
        pcmcia: soc_common: add support for voltage sense GPIOs
        pcmcia: soc_common: constify pcmcia_low_level ops pointer
        pcmcia: soc_common: switch to a per-socket cpufreq notifier
        pcmcia: soc_common: add support for Vcc and Vpp regulators
        pcmcia: soc_common: add CF socket state helper
        pcmcia: soc_common: restore previous socket state on error
        pcmcia: soc_common: add support for reset and bus enable GPIOs
        pcmcia: soc_common: request legacy detect GPIO with active low
        pcmcia: soc_common: ignore invalid interrupts
        pcmcia: soc_common: switch to using gpio_descs
        pcmcia: soc_common: use devm_gpio_request_one()
      911f9dab
    • Linus Torvalds's avatar
      Merge tag 'nios2-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 · ae50a840
      Linus Torvalds authored
      Pull nios2 update from Ley Foon Tan:
       "Use of_property_read_bool() instead of open-coding it"
      
      * tag 'nios2-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
        nios2: use of_property_read_bool
      ae50a840
    • Linus Torvalds's avatar
      Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris · 057a056c
      Linus Torvalds authored
      Pull CRIS updates from Jesper Nilsson.
      
      * tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
        cris: return of class_create should be considered
        CRIS: defconfig: remove MTDRAM_ABS_POS
        CRIS v32: remove some double unlocks
        Fix typos
        cris: migrate exception table users off module.h and onto extable.h
        cris: v10: axisflashmap: remove unused ifdefs
        cris: use generic io.h
        cris: fix Kconfig mismatch when building with CONFIG_PCI
        cris: cardbus: fix header include path
        cris: add dev88_defconfig
        cris: irq: stop loop from accessing array out of bounds
        cris: fasttimer: fix mixed declarations and code compile warning
        cris: intmem: fix pointer comparison compile warning
        cris: intmem: fix device_initcall compile warning
      057a056c
    • Linus Torvalds's avatar
      Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 93c26d7d
      Linus Torvalds authored
      Pull protection keys syscall interface from Thomas Gleixner:
       "This is the final step of Protection Keys support which adds the
        syscalls so user space can actually allocate keys and protect memory
        areas with them. Details and usage examples can be found in the
        documentation.
      
        The mm side of this has been acked by Mel"
      
      * 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/pkeys: Update documentation
        x86/mm/pkeys: Do not skip PKRU register if debug registers are not used
        x86/pkeys: Fix pkeys build breakage for some non-x86 arches
        x86/pkeys: Add self-tests
        x86/pkeys: Allow configuration of init_pkru
        x86/pkeys: Default to a restrictive init PKRU
        pkeys: Add details of system call use to Documentation/
        generic syscalls: Wire up memory protection keys syscalls
        x86: Wire up protection keys system calls
        x86/pkeys: Allocation/free syscalls
        x86/pkeys: Make mprotect_key() mask off additional vm_flags
        mm: Implement new pkey_mprotect() system call
        x86/pkeys: Add fault handling for PF_PK page fault bit
      93c26d7d
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5fa0eb0b
      Linus Torvalds authored
      Pull x86 updates from Thomas Gleixner:
       "A pile of regression fixes and updates:
      
         - address the fallout of the patches which made the cpuid - nodeid
           relation permanent: Handling of invalid APIC ids and preventing
           pointless warning messages.
      
         - force eager FPU when protection keys are enabled. Protection keys
           are not generating FPU exceptions so they cannot work with the lazy
           FPU mechanism.
      
         - prevent force migration of interrupts which are not part of the CPU
           vector domain.
      
         - handle the fact that APIC ids are not updated in the ACPI/MADT
           tables on physical CPU hotplug
      
         - remove bash-isms from syscall table generator script
      
         - use the hypervisor supplied APIC frequency when running on VMware"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/pkeys: Make protection keys an "eager" feature
        x86/apic: Prevent pointless warning messages
        x86/acpi: Prevent LAPIC id 0xff from being accounted
        arch/x86: Handle non enumerated CPU after physical hotplug
        x86/unwind: Fix oprofile module link error
        x86/vmware: Skip lapic calibration on VMware
        x86/syscalls: Remove bash-isms in syscall table generator
        x86/irq: Prevent force migration of irqs which are not in the vector domain
      5fa0eb0b
    • Al Viro's avatar
      [btrfs] fix check_direct_IO() for non-iovec iterators · cd27e455
      Al Viro authored
      
      
      looking for duplicate ->iov_base makes sense only for
      iovec-backed iterators; for kvec-backed ones it's pointless,
      for bvec-backed ones it's pointless and broken on 32bit (we
      walk through an array of struct bio_vec accessing them as if
      they were struct iovec; works by accident on 64bit, but on
      32bit it'll blow up) and for pipe-backed ones it's pointless
      and ends up oopsing.
      
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      cd27e455
    • Al Viro's avatar
      constify iov_iter_count() and iter_is_iovec() · b57332b4
      Al Viro authored
      
      
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      b57332b4
    • Al Viro's avatar
      fix ITER_PIPE interaction with direct_IO · c3a69024
      Al Viro authored
      
      
      by making sure we call iov_iter_advance() on original
      iov_iter even if direct_IO (done on its copy) has returned 0.
      It's a no-op for old iov_iter flavours and does the right thing
      (== truncation of the stuff we'd allocated, but not filled) in
      ITER_PIPE case.  Failures (e.g. -EIO) get caught and dealt with
      by cleanup in generic_file_read_iter().
      
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      c3a69024
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c48ce9f1
      Linus Torvalds authored
      Pull perf tooling updates from Thomas Gleixner:
      
       - handle uretprobe placement proper on little endian PPC64
      
       - fix buffer handling in libtraceevent
      
       - add a missing pointer derefence in perf probe
      
       - fix the build of host tools in cross builds
      
       - fix Intel PT timestamp handling
      
       - synchronize memcpy, cpufeatures and bpf headers with the kernel headers
      
       - support for vendor supplied JSON files describing PMU events
      
       - a new set of tool tips
      
       - initial work for clang/llvm support
      
       - address some style issues found by cppcheck
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (35 commits)
        tools build: Add feature detection for g++
        tools build: Support compiling C++ source file
        perf top/report: Add tips about a list option
        perf report/top: Add a tip about system-wide collection from all CPUs
        perf report/top: Add a tip about source line numbers with overhead
        tools: Synchronize tools/include/uapi/linux/bpf.h
        tools: Synchronize tools/arch/x86/include/asm/cpufeatures.h
        perf bench mem: Sync memcpy assembly sources with the kernel
        perf jevents: Fix Intel JSON fixed counter conversions
        tools lib traceevent: Fix kbuffer_read_at_offset()
        perf intel-pt: Fix MTC timestamp calculation for large MTC periods
        perf intel-pt: Fix estimated timestamps for cycle-accurate mode
        perf uretprobe ppc64le: Fix probe location
        perf pmu-events: Add Skylake frontend MSR support
        perf pmu-events: Fix fixed counters on Intel
        perf tools: Make alias matching case-insensitive
        perf tools: Allow period= in perf stat CPU event descriptions.
        perf tools: Add README for info on parsing JSON/map files
        perf list jevents: Add support for event list topics
        perf list: Support long jevents descriptions
        ...
      c48ce9f1
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 84ed2da0
      Linus Torvalds authored
      Pull scheduler fix from Thomas Gleixner:
       "A revert of a commit which pointelessly widened a preempt disabled
        section which in turn caused might_sleep() to trigger.
      
        The patch intended to prevent usage of smp_processor_id() in
        preemptible context, but the usage in that case is fine because the
        thread is pinned on a single cpu and therefore cannot be migrated off"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        Revert "sched/core: Do not use smp_processor_id() with preempt enabled in smpboot_thread_fn()"
      84ed2da0
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · daba2b31
      Linus Torvalds authored
      Pull irq fixes from Thomas Gleixner:
       "Two small kerneldoc fixes from Julia Lawall"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip/metag-ext: Improve function-level documentation
        irqchip/vic: Improve function-level documentation
      daba2b31
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 604a830d
      Linus Torvalds authored
      Pull timer fix from Thomas Gleixner:
       "A single fix for a regression introduced in 4.8 which causes the
        trace/perf clock to return random nonsense if CONFIG_DEBUG_TIMEKEEPING
        is set"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        timekeeping: Fix __ktime_get_fast_ns() regression
      604a830d
    • Linus Torvalds's avatar
      Merge branch 'printk-cleanups' · 56387331
      Linus Torvalds authored
      Merge my system logging cleanups, triggered by the broken '\n' patches.
      
      The line continuation handling has been broken basically forever, and
      the code to handle the system log records was both confusing and
      dubious.  And it would do entirely the wrong thing unless you always had
      a terminating newline, partly because it couldn't actually see whether a
      message was marked KERN_CONT or not (but partly because the LOG_CONT
      handling in the recording code was rather confusing too).
      
      This re-introduces a real semantically meaningful KERN_CONT, and fixes
      the few places I noticed where it was missing.  There are probably more
      missing cases, since KERN_CONT hasn't actually had any semantic meaning
      for at least four years (other than the checkpatch meaning of "no log
      level necessary, this is a continuation line").
      
      This also allows the combination of KERN_CONT and a log level.  In that
      case the log level will be ignored if the merging with a previous line
      is successful, but if a new record is needed, that new record will now
      get the right log level.
      
      That also means that you can at least in theory combine KERN_CONT with
      the "pr_info()" style helpers, although any use of pr_fmt() prefixing
      would make that just result in a mess, of course (the prefix would end
      up in the middle of a continuing line).
      
      * printk-cleanups:
        printk: make reading the kernel log flush pending lines
        printk: re-organize log_output() to be more legible
        printk: split out core logging code into helper function
        printk: reinstate KERN_CONT for printing continuation lines
      56387331
    • Marcelo Ricardo Leitner's avatar
      dlm: free workqueues after the connections · 3a8db798
      Marcelo Ricardo Leitner authored
      After backporting commit ee44b4bc ("dlm: use sctp 1-to-1 API")
      series to a kernel with an older workqueue which didn't use RCU yet, it
      was noticed that we are freeing the workqueues in dlm_lowcomms_stop()
      too early as free_conn() will try to access that memory for canceling
      the queued works if any.
      
      This issue was introduced by commit 0d737a8c as before it such
      attempt to cancel the queued works wasn't performed, so the issue was
      not present.
      
      This patch fixes it by simply inverting the free order.
      
      Cc: stable@vger.kernel.org
      Fixes: 0d737a8c
      
       ("dlm: fix race while closing connections")
      Signed-off-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
      Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
      3a8db798
    • Herbert Xu's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · c3afafa4
      Herbert Xu authored
      Merge the crypto tree to pull in vmx ghash fix.
      c3afafa4
    • Linus Torvalds's avatar
      Merge branch 'for-4.9/block-smp' of git://git.kernel.dk/linux-block · 24532f76
      Linus Torvalds authored
      Pull blk-mq CPU hotplug update from Jens Axboe:
       "This is the conversion of blk-mq to the new hotplug state machine"
      
      * 'for-4.9/block-smp' of git://git.kernel.dk/linux-block:
        blk-mq: fixup "Convert to new hotplug state machine"
        blk-mq: Convert to new hotplug state machine
        blk-mq/cpu-notif: Convert to new hotplug state machine
      24532f76
    • Linus Torvalds's avatar
      Merge branch 'for-4.9/block-irq' of git://git.kernel.dk/linux-block · 12e3d3cd
      Linus Torvalds authored
      Pull blk-mq irq/cpu mapping updates from Jens Axboe:
       "This is the block-irq topic branch for 4.9-rc. It's mostly from
        Christoph, and it allows drivers to specify their own mappings, and
        more importantly, to share the blk-mq mappings with the IRQ affinity
        mappings. It's a good step towards making this work better out of the
        box"
      
      * 'for-4.9/block-irq' of git://git.kernel.dk/linux-block:
        blk_mq: linux/blk-mq.h does not include all the headers it depends on
        blk-mq: kill unused blk_mq_create_mq_map()
        blk-mq: get rid of the cpumask in struct blk_mq_tags
        nvme: remove the post_scan callout
        nvme: switch to use pci_alloc_irq_vectors
        blk-mq: provide a default queue mapping for PCI device
        blk-mq: allow the driver to pass in a queue mapping
        blk-mq: remove ->map_queue
        blk-mq: only allocate a single mq_map per tag_set
        blk-mq: don't redistribute hardware queues on a CPU hotplug event
      12e3d3cd
    • Linus Torvalds's avatar
      Merge tag 'dm-4.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 48915c2c
      Linus Torvalds authored
      Pull device mapper updates from Mike Snitzer:
      
       - various fixes and cleanups for request-based DM core
      
       - add support for delaying the requeue of requests; used by DM
         multipath when all paths have failed and 'queue_if_no_path' is
         enabled
      
       - DM cache improvements to speedup the loading metadata and the writing
         of the hint array
      
       - fix potential for a dm-crypt crash on device teardown
      
       - remove dm_bufio_cond_resched() and just using cond_resched()
      
       - change DM multipath to return a reservation conflict error
         immediately; rather than failing the path and retrying (potentially
         indefinitely)
      
      * tag 'dm-4.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (24 commits)
        dm mpath: always return reservation conflict without failing over
        dm bufio: remove dm_bufio_cond_resched()
        dm crypt: fix crash on exit
        dm cache metadata: switch to using the new cursor api for loading metadata
        dm array: introduce cursor api
        dm btree: introduce cursor api
        dm cache policy smq: distribute entries to random levels when switching to smq
        dm cache: speed up writing of the hint array
        dm array: add dm_array_new()
        dm mpath: delay the requeue of blk-mq requests while all paths down
        dm mpath: use dm_mq_kick_requeue_list()
        dm rq: introduce dm_mq_kick_requeue_list()
        dm rq: reduce arguments passed to map_request() and dm_requeue_original_request()
        dm rq: add DM_MAPIO_DELAY_REQUEUE to delay requeue of blk-mq requests
        dm: convert wait loops to use autoremove_wake_function()
        dm: use signal_pending_state() in dm_wait_for_completion()
        dm: rename task state function arguments
        dm: add two lockdep_assert_held() statements
        dm rq: simplify dm_old_stop_queue()
        dm mpath: check if path's request_queue is dying in activate_path()
        ...
      48915c2c
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · b9044ac8
      Linus Torvalds authored
      Pull main rdma updates from Doug Ledford:
       "This is the main pull request for the rdma stack this release.  The
        code has been through 0day and I had it tagged for linux-next testing
        for a couple days.
      
        Summary:
      
         - updates to mlx5
      
         - updates to mlx4 (two conflicts, both minor and easily resolved)
      
         - updates to iw_cxgb4 (one conflict, not so obvious to resolve,
           proper resolution is to keep the code in cxgb4_main.c as it is in
           Linus' tree as attach_uld was refactored and moved into
           cxgb4_uld.c)
      
         - improvements to uAPI (moved vendor specific API elements to uAPI
           area)
      
         - add hns-roce driver and hns and hns-roce ACPI reset support
      
         - conversion of all rdma code away from deprecated
           create_singlethread_workqueue
      
         - security improvement: remove unsafe ib_get_dma_mr (breaks lustre in
           staging)"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (75 commits)
        staging/lustre: Disable InfiniBand support
        iw_cxgb4: add fast-path for small REG_MR operations
        cxgb4: advertise support for FR_NSMR_TPTE_WR
        IB/core: correctly handle rdma_rw_init_mrs() failure
        IB/srp: Fix infinite loop when FMR sg[0].offset != 0
        IB/srp: Remove an unused argument
        IB/core: Improve ib_map_mr_sg() documentation
        IB/mlx4: Fix possible vl/sl field mismatch in LRH header in QP1 packets
        IB/mthca: Move user vendor structures
        IB/nes: Move user vendor structures
        IB/ocrdma: Move user vendor structures
        IB/mlx4: Move user vendor structures
        IB/cxgb4: Move user vendor structures
        IB/cxgb3: Move user vendor structures
        IB/mlx5: Move and decouple user vendor structures
        IB/{core,hw}: Add constant for node_desc
        ipoib: Make ipoib_warn ratelimited
        IB/mlx4/alias_GUID: Remove deprecated create_singlethread_workqueue
        IB/ipoib_verbs: Remove deprecated create_singlethread_workqueue
        IB/ipoib: Remove deprecated create_singlethread_workqueue
        ...
      b9044ac8
  4. 09 Oct, 2016 2 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · 1fde76f1
      Linus Torvalds authored
      Pull more rdma updates from Doug Ledford:
       "Minor updates for rxe driver"
      
      [ Starting to do merge window pulls again - the current -git tree does
        appear to have some netfilter use-after-free issues, but I've sent
        off the report to the proper channels, and I don't want to delay merge
        window activity any more ]
      
      * tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
        IB/rxe: improved debug prints & code cleanup
        rdma_rxe: Ensure rdma_rxe init occurs at correct time
        IB/rxe: Properly honor max IRD value for rd/atomic.
        IB/{rxe,core,rdmavt}: Fix kernel crash for reg MR
        IB/rxe: Fix sending out loopback packet on netdev interface.
        IB/rxe: Avoid scheduling tasklet for userspace QP
      1fde76f1
    • Linus Torvalds's avatar
      printk: make reading the kernel log flush pending lines · bfd8d3f2
      Linus Torvalds authored
      
      
      That will mean that any possible subsequent continuation will now be
      broken up onto a line of its own (since reading the log has finalized
      the beginning og the line), but if user space has activated system
      logging (or if there's a kernel message dump going on) that is the right
      thing to do.
      
      And now that we actually get the continuation flags _right_ for this
      all, the user space logger that is reading the kernel messages can
      actually see the continuation marker.  Not that anybody seems to really
      bother with it (or care), but in theory user space can do its own
      message stitching.
      
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bfd8d3f2