1. 15 10月, 2016 30 次提交
    • L
      Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs · 1a892b48
      Linus Torvalds 提交于
      Pull overlayfs updates from Miklos Szeredi:
       "This update contains fixes to the "use mounter's permission to access
        underlying layers" area, and miscellaneous other fixes and cleanups.
      
        No new features this time"
      
      * 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
        ovl: use vfs_get_link()
        vfs: add vfs_get_link() helper
        ovl: use generic_readlink
        ovl: explain error values when removing acl from workdir
        ovl: Fix info leak in ovl_lookup_temp()
        ovl: during copy up, switch to mounter's creds early
        ovl: lookup: do getxattr with mounter's permission
        ovl: copy_up_xattr(): use strnlen
      1a892b48
    • L
      Merge tag 'linux-kselftest-4.9-rc1-update' of... · 5d89d9f5
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-4.9-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest updates from Shuah Khan:
       "This update consists of:
      
         - Fixes and improvements to existing tests
      
         - Moving code from Documentation to selftests, samples, and tools:
      
           * Moves dnotify_test, prctl, ptp, vDSO, ia64, watchdog, and
             networking tests from Documentation to selftests.
      
           * Moves mic/mpssd, misc-devices/mei, timers, watchdog, auxdisplay,
             and blackfin examples from Documentation to samples.
      
           * Moves accounting, laptops/dslm, and pcmcia/crc32hash tools from
             Documentation to tools.
      
           * Deletes BUILD_DOCSRC and its dependencies"
      
      * tag 'linux-kselftest-4.9-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (21 commits)
        selftests/futex: Check ANSI terminal color support
        Doc: update 00-INDEX files to reflect the runnable code move
        samples: move blackfin gptimers-example from Documentation
        tools: move pcmcia crc32hash tool from Documentation
        tools: move laptops dslm tool from Documentation
        tools: move accounting tool from Documentation
        samples: move auxdisplay example code from Documentation
        samples: move watchdog example code from Documentation
        samples: move timers example code from Documentation
        samples: move misc-devices/mei example code from Documentation
        samples: move mic/mpssd example code from Documentation
        selftests: Move networking/timestamping from Documentation
        selftests: move watchdog tests from Documentation/watchdog
        selftests: move ia64 tests from Documentation/ia64
        selftests: move vDSO tests from Documentation/vDSO
        selftests: move ptp tests from Documentation/ptp
        selftests: move prctl tests from Documentation/prctl
        selftests: move dnotify_test from Documentation/filesystems
        selftests/timers: Add missing error code assignment before test
        selftests/zram: replace ZRAM_LZ4_COMPRESS
        ...
      5d89d9f5
    • L
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 50cff898
      Linus Torvalds 提交于
      Pull misc kbuild changes from Michal Marek:
       "Just a few patches on the kbuild.git#misc branch this time:
      
         - New Coccinelle patch by Nicholas Mc Guire
         - Existing patch fixes by Julia Lawall
         - Minor comment fix by Markus Elfring"
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        Coccinelle: flag conditions with no effect
        scripts/coccicheck: Update reference for the corresponding documentation
        Coccinelle: pm_runtime: ensure relevance of pm_runtime reports
        Coccinelle: limit memdup_user transformation to GFP_KERNEL case
      50cff898
    • L
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 84d69848
      Linus Torvalds 提交于
      Pull kbuild updates from Michal Marek:
      
       - EXPORT_SYMBOL for asm source by Al Viro.
      
         This does bring a regression, because genksyms no longer generates
         checksums for these symbols (CONFIG_MODVERSIONS). Nick Piggin is
         working on a patch to fix this.
      
         Plus, we are talking about functions like strcpy(), which rarely
         change prototypes.
      
       - Fixes for PPC fallout of the above by Stephen Rothwell and Nick
         Piggin
      
       - fixdep speedup by Alexey Dobriyan.
      
       - preparatory work by Nick Piggin to allow architectures to build with
         -ffunction-sections, -fdata-sections and --gc-sections
      
       - CONFIG_THIN_ARCHIVES support by Stephen Rothwell
      
       - fix for filenames with colons in the initramfs source by me.
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: (22 commits)
        initramfs: Escape colons in depfile
        ppc: there is no clear_pages to export
        powerpc/64: whitelist unresolved modversions CRCs
        kbuild: -ffunction-sections fix for archs with conflicting sections
        kbuild: add arch specific post-link Makefile
        kbuild: allow archs to select link dead code/data elimination
        kbuild: allow architectures to use thin archives instead of ld -r
        kbuild: Regenerate genksyms lexer
        kbuild: genksyms fix for typeof handling
        fixdep: faster CONFIG_ search
        ia64: move exports to definitions
        sparc32: debride memcpy.S a bit
        [sparc] unify 32bit and 64bit string.h
        sparc: move exports to definitions
        ppc: move exports to definitions
        arm: move exports to definitions
        s390: move exports to definitions
        m68k: move exports to definitions
        alpha: move exports to actual definitions
        x86: move exports to actual definitions
        ...
      84d69848
    • L
      Merge tag 'docs-4.9-2' of git://git.lwn.net/linux · d4d24d2d
      Linus Torvalds 提交于
      Pull one more documentation update from Jonathan Corbet:
       "A single commit converting the mac80211 DocBook template over to
        Sphinx.  Only 32 more to go..."
      
      * tag 'docs-4.9-2' of git://git.lwn.net/linux:
        docs-rst: sphinxify 802.11 documentation
      d4d24d2d
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · ac9ef8cd
      Linus Torvalds 提交于
      Pull rdma qedr RoCE driver from Doug Ledford:
       "Early on in the merge window I mentioned I had a backlog of new
        drivers waiting to be reviewed and that, in addition to the hns-roce
        driver, I wanted to get possible a couple more reviewed. I ended up
        only having the time to complete one of the additional drivers.
      
        During Dave Miller's pull request this go around, there were a series
        of 9 patches to the QLogic qed net driver that add basic support for a
        paired RoCE driver. That support is currently not functional because
        it is missing the matching RoCE driver in the RDMA subsystem. I
        managed to finish that review. However, because it goes against part
        of Dave's net pull, and a part that was accepted a day or two after
        the merge window opened, to apply cleanly it has to be applied to
        either the tip of Dave's net branch, or as I did in this case, I just
        applied it to your master after you had taken Dave's pull request."
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
        qedr: Add events support and register IB device
        qedr: Add GSI support
        qedr: Add LL2 RoCE interface
        qedr: Add support for data path
        qedr: Add support for memory registeration verbs
        qedr: Add support for QP verbs
        qedr: Add support for PD,PKEY and CQ verbs
        qedr: Add support for user context verbs
        qedr: Add support for RoCE HW init
        qedr: Add RoCE driver framework
      ac9ef8cd
    • L
      Merge tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · b292fb80
      Linus Torvalds 提交于
      Pull more rdma updates from Doug Ledford:
       "This merge window was the first where Huawei had to try and coordinate
        their patches between their net driver and their new roce driver
        (similar to mlx4 and mlx5).
      
        They didn't do horribly, but there were some issues (and we knew that
        because they simply didn't know what to do in the beginning). As a
        result, I had a set of patches that depended on some patches that
        normally would have come to you via Dave's tree. Those patches have
        been on netdev@ for a while, so I got Dave to give me his approval to
        send them to you. As such, the other 29 patches I had behind them are
        also now ready to go.
      
        This catches the hns and hns-roce drivers up to current, and for
        future patches we are working with them to get them up to speed on how
        to do joint driver development so that they don't have these sorts of
        cross tree dependency issues again. BTW, Dave gave me permission to
        add his Acked-by: to the patches against the net tree, but I've had
        this branch through 0day (but not linux-next since it was off by
        itself) and I didn't want to rebase the series just to add Dave's ack
        for the 8 patches in the net area.
      
        Updates to the hns drivers:
      
         - Small patch set for hns net driver that the roce patches depend on
      
         - Various fixes to the hns-roce driver
      
         - Add connection manager support to the hns-roce driver"
      
      * tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (36 commits)
        IB/hns: Fix for removal of redundant code
        IB/hns: Delete the redundant lines in hns_roce_v1_m_qp()
        IB/hns: Fix the bug when platform_get_resource() exec fail
        IB/hns: Update the rq head when modify qp state
        IB/hns: Cq has not been freed
        IB/hns: Validate mtu when modified qp
        IB/hns: Some items of qpc need to take user param
        IB/hns: The Ack timeout need a lower limit value
        IB/hns: Return bad wr while post send failed
        IB/hns: Fix bug of memory leakage for registering user mr
        IB/hns: Modify the init of iboe lock
        IB/hns: Optimize code of aeq and ceq interrupt handle and fix the bug of qpn
        IB/hns: Delete the sqp_start from the structure hns_roce_caps
        IB/hns: Fix bug of clear hem
        IB/hns: Remove unused parameter named qp_type
        IB/hns: Simplify function of pd alloc and qp alloc
        IB/hns: Fix bug of using uninit refcount and free
        IB/hns: Remove parameters of resize cq
        IB/hns: Remove unused parameters in some functions
        IB/hns: Add node_guid definition to the bindings document
        ...
      b292fb80
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 689f891c
      Linus Torvalds 提交于
      Pull some more input subsystem updates from Dmitry Torokhov:
       "An update to the ALPS driver to support the V8 protocol with
        touchstick, a change for i8042 to skip selftest on many Asus laptops
        which helps to keep their touchpads working after resume, and a couple
        other driver fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: i8042 - skip selftest on ASUS laptops
        Input: melfas_mip4 - add ic_name sysfs attribute
        Input: melfas_mip4 - add maintainer information
        Input: melfas_mip4 - add devicetree binding documentations
        Input: elantech - add Fujitsu Lifebook E556 to force crc_enabled
        Input: synaptics-rmi4 - fix error handling in I2C transport driver
        Input: synaptics-rmi4 - fix error handling in SPI transport driver
        Input: ALPS - add V8 protocol documentation
        Input: ALPS - set DualPoint flag for 74 03 28 devices
        Input: ALPS - allow touchsticks to report pressure
        Input: ALPS - handle 0-pressure 1F events
        Input: ALPS - add touchstick support for SS5 hardware
        Input: elantech - force needed quirks on Fujitsu H760
        Input: elantech - fix Lenovo version typo
      689f891c
    • L
      Merge tag 'rtc-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 8b70f716
      Linus Torvalds 提交于
      Pull RTC updates from Alexandre Belloni:
       "RTC for 4.9
      
        Subsystem:
         - delete owner assignment in multiple drivers
         - constify rtc_class_ops structures
      
        Drivers:
         - ac100: support clock-output-names
         - cmos: properly handle ACPI alarms and quirky BIOSes and other fixes
         - ds1307: fix century bit support while staying comaptible with
           previous behaviour by default
         - ds1347: switch to regmap
         - isl12057 is now handled by ds1307
         - omap: support external wakeup
         - rv8803: allow to disable voltage drop detection"
      
      * tag 'rtc-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (25 commits)
        rtc: rv8803: set VDETOFF and SWOFF via device tree
        dt/bindings: Add bindings for Micro Crystal rv8803
        devicetree: Add Micro Crystal AG vendor id
        rtc: cmos: avoid unused function warning
        rtc: ac100: Add NULL checking for devm_kzalloc call
        rtc: ds1347: changed raw spi calls to register map calls
        rtc: cmos: Restore alarm after resume
        rtc: cmos: Clear ACPI-driven alarms upon resume
        rtc: omap: Support ext_wakeup configuration
        rtc: cmos: Initialize hpet timer before irq is registered
        rtc: asm9260: rework locking
        rtc: asm9260: allow COMPILE_TEST
        rtc: constify rtc_class_ops structures
        rtc: ac100: support clock-output-names in device tree binding
        rtc: rx6110: remove owner assignment
        rtc: pic32: Delete owner assignment
        rtc: bq32k: Fix handling of oscillator failure flag
        rtc: bq32k: Use correct mask name for 'minutes' register.
        rtc: sysfs: fix a cast removing the const attribute
        Documentation: dt: Intersil isl12057 is not a trivial device
        ...
      8b70f716
    • L
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · e5050143
      Linus Torvalds 提交于
      Pull more i2c updates from Wolfram Sang:
       "A small update pull request from I2C.
      
        This adds one comment to a change we did in this merge window to
        handle lockdep better, and pulls in a branch which should have been in
        4.8 already improving DT support for I2C"
      
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        gpio: pca953x: add a comment explaining the need for a lockdep subclass
        i2c: core: Add support for 'i2c-bus' subnode
        dt-bindings: i2c: Add support for 'i2c-bus' subnode
      e5050143
    • L
      Merge tag 'acpi-extra-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · b41d037a
      Linus Torvalds 提交于
      Pull more ACPI updates from Rafael Wysocki:
       "This includes a couple of fixes needed after recent changes, two ACPI
        driver fixes (fan and "Processor Aggregator"), an update of the ACPI
        device properties handling code and a new MAINTAINERS entry for ACPI
        on ARM64.
      
        Specifics:
      
         - Fix an unused function warning that started to appear after recent
           changes in the ACPI EC driver (Eric Biggers).
      
         - Fix the KERN_CONT usage in acpi_os_vprintf() that has become
           (particularly) annoying recently (Joe Perches).
      
         - Fix the fan status checking in the ACPI fan driver to avoid
           returning incorrect error codes sometimes (Srinivas Pandruvada).
      
         - Fix the ACPI Processor Aggregator driver (PAD) to always let the
           special processor_aggregator driver from Xen take over when running
           as Xen dom0 (Juergen Gross).
      
         - Update the handling of reference device properties in ACPI by
           allowing empty rows ("holes") to appear in reference property lists
           (Mika Westerberg).
      
         - Add a new MAINTAINERS entry for ACPI on ARM64 (Lorenzo Pieralisi)"
      
      * tag 'acpi-extra-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        acpi_os_vprintf: Use printk_get_level() to avoid unnecessary KERN_CONT
        ACPI / PAD: don't register acpi_pad driver if running as Xen dom0
        ACPI / property: Allow holes in reference properties
        MAINTAINERS: Add ARM64-specific ACPI maintainers entry
        ACPI / EC: Fix unused function warning when CONFIG_PM_SLEEP=n
        ACPI / fan: Fix error reading cur_state
      b41d037a
    • L
      Merge tag 'pm-extra-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · ef98988b
      Linus Torvalds 提交于
      Pull more power management updates from Rafael Wysocki:
       "This includes a couple of fixes for cpufreq regressions introduced in
        4.8, a rework of the intel_pstate algorithm used on Atom processors
        (that took some time to test) plus a fix and a couple of cleanups in
        that driver, a CPPC cpufreq driver fix, and a some devfreq fixes and
        cleanups (core and exynos-nocp).
      
        Specifics:
      
         - Fix two cpufreq regressions causing undesirable changes in behavior
           to appear (one in the core and one in the conservative governor)
           introduced during the 4.8 cycle (Aaro Koskinen, Rafael Wysocki).
      
         - Fix the way the intel_pstate driver accesses MSRs related to the
           hardware-managed P-states (HWP) feature during the initialization
           which currently is unsafe and may cause the processor to generate a
           general protection fault (Srinivas Pandruvada).
      
         - Rework the intel_pstate's P-state selection algorithm used on Atom
           processors to avoid known problems with the current one and to make
           the computation more straightforward, which also happens to improve
           performance in multiple benchmarks a bit (Rafael Wysocki).
      
         - Improve two comments in the intel_pstate driver (Rafael Wysocki).
      
         - Fix the desired performance computation in the CPPC cpufreq driver
           (Hoan Tran).
      
         - Fix the devfreq core to avoid printing misleading error messages in
           some cases (Tobias Jakobi).
      
         - Fix the error code path in devfreq_add_device() to use proper
           locking around list modifications (Axel Lin).
      
         - Fix a build failure and remove a couple of redundant updates of
           variables in the exynos-nocp devfreq driver (Axel Lin)"
      
      * tag 'pm-extra-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: CPPC: Correct desired_perf calculation
        cpufreq: conservative: Fix next frequency selection
        cpufreq: skip invalid entries when searching the frequency
        cpufreq: intel_pstate: Fix struct pstate_adjust_policy kerneldoc
        cpufreq: intel_pstate: Proportional algorithm for Atom
        PM / devfreq: Skip status update on uninitialized previous_freq
        PM / devfreq: Add proper locking around list_del()
        PM / devfreq: exynos-nocp: Remove redundant code
        PM / devfreq: exynos-nocp: Select REGMAP_MMIO
        cpufreq: intel_pstate: Clarify comment in get_target_pstate_use_performance()
        cpufreq: intel_pstate: Fix unsafe HWP MSR access
      ef98988b
    • L
      Merge branch 'for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · f34d3606
      Linus Torvalds 提交于
      Pull cgroup updates from Tejun Heo:
      
       - tracepoints for basic cgroup management operations added
      
       - kernfs and cgroup path formatting functions updated to behave in the
         style of strlcpy()
      
       - non-critical bug fixes
      
      * 'for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        blkcg: Unlock blkcg_pol_mutex only once when cpd == NULL
        cgroup: fix error handling regressions in proc_cgroup_show() and cgroup_release_agent()
        cpuset: fix error handling regression in proc_cpuset_show()
        cgroup: add tracepoints for basic operations
        cgroup: make cgroup_path() and friends behave in the style of strlcpy()
        kernfs: remove kernfs_path_len()
        kernfs: make kernfs_path*() behave in the style of strlcpy()
        kernfs: add dummy implementation of kernfs_path_from_node()
      f34d3606
    • R
      qedr: Add events support and register IB device · 993d1b52
      Ram Amrani 提交于
      Add error handling support.
      Register ib device with ib stack.
      Signed-off-by: NRajesh Borundia <rajesh.borundia@cavium.com>
      Signed-off-by: NRam Amrani <Ram.Amrani@cavium.com>
      Signed-off-by: NDoug Ledford <dledford@redhat.com>
      993d1b52
    • R
      qedr: Add GSI support · 04886779
      Ram Amrani 提交于
      Add support for GSI over light L2.
      Signed-off-by: NRajesh Borundia <rajesh.borundia@cavium.com>
      Signed-off-by: NRam Amrani <Ram.Amrani@cavium.com>
      Signed-off-by: NDoug Ledford <dledford@redhat.com>
      04886779
    • R
      qedr: Add LL2 RoCE interface · 1d1424c8
      Ram Amrani 提交于
      Add light L2 interface for RoCE.
      Signed-off-by: NRajesh Borundia <rajesh.borundia@cavium.com>
      Signed-off-by: NRam Amrani <Ram.Amrani@cavium.com>
      Signed-off-by: NDoug Ledford <dledford@redhat.com>
      1d1424c8
    • R
      qedr: Add support for data path · afa0e13b
      Ram Amrani 提交于
      Implement fastpath verbs like ib_send_post, ib_post_recv and ib_poll_cq.
      Signed-off-by: NRajesh Borundia <rajesh.borundia@cavium.com>
      Signed-off-by: NRam Amrani <Ram.Amrani@cavium.com>
      Signed-off-by: NDoug Ledford <dledford@redhat.com>
      afa0e13b
    • R
      qedr: Add support for memory registeration verbs · e0290cce
      Ram Amrani 提交于
      Add support for user, dma and memory regions registration.
      Signed-off-by: NRajesh Borundia <rajesh.borundia@cavium.com>
      Signed-off-by: NRam Amrani <Ram.Amrani@cavium.com>
      Signed-off-by: NDoug Ledford <dledford@redhat.com>
      e0290cce
    • R
      qedr: Add support for QP verbs · cecbcddf
      Ram Amrani 提交于
      Add support for Queue Pair verbs which adds, deletes,
      modifies and queries Queue Pairs.
      Signed-off-by: NRajesh Borundia <rajesh.borundia@cavium.com>
      Signed-off-by: NRam Amrani <Ram.Amrani@cavium.com>
      Signed-off-by: NDoug Ledford <dledford@redhat.com>
      cecbcddf
    • R
      qedr: Add support for PD,PKEY and CQ verbs · a7efd777
      Ram Amrani 提交于
      Add support for protection domain and completion queue verbs.
      Signed-off-by: NRajesh Borundia <rajesh.borundia@cavium.com>
      Signed-off-by: NRam Amrani <Ram.Amrani@cavium.com>
      Signed-off-by: NDoug Ledford <dledford@redhat.com>
      a7efd777
    • R
      qedr: Add support for user context verbs · ac1b36e5
      Ram Amrani 提交于
      Add support for ucontext, query port, add and del gid verbs.
      Signed-off-by: NRajesh Borundia <rajesh.borundia@cavium.com>
      Signed-off-by: NRam Amrani <Ram.Amrani@cavium.com>
      Signed-off-by: NDoug Ledford <dledford@redhat.com>
      ac1b36e5
    • R
      qedr: Add support for RoCE HW init · ec72fce4
      Ram Amrani 提交于
      Allocate and setup RoCE resources, interrupts and completion queues.
      Adds device attributes.
      Signed-off-by: NRajesh Borundia <rajesh.borundia@cavium.com>
      Signed-off-by: NRam Amrani <Ram.Amrani@cavium.com>
      Signed-off-by: NDoug Ledford <dledford@redhat.com>
      ec72fce4
    • R
      qedr: Add RoCE driver framework · 2e0cbc4d
      Ram Amrani 提交于
      Adds a skeletal implementation of the qed* RoCE driver -
      basically the ability to communicate with the qede driver and
      receive notifications from it regarding various init/exit events.
      Signed-off-by: NRajesh Borundia <rajesh.borundia@cavium.com>
      Signed-off-by: NRam Amrani <Ram.Amrani@cavium.com>
      Signed-off-by: NDoug Ledford <dledford@redhat.com>
      2e0cbc4d
    • L
      Merge branch 'for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · b6daa51b
      Linus Torvalds 提交于
      Pull percpu updates from Tejun Heo:
      
       - Nick improved generic implementations of percpu operations which
         modify the variable and return so that they calculate the physical
         address only once.
      
       - percpu_ref percpu <-> atomic mode switching improvements. The
         patchset was originally posted about a year ago but fell through the
         crack.
      
       - misc non-critical fixes.
      
      * 'for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        mm/percpu.c: fix potential memory leakage for pcpu_embed_first_chunk()
        mm/percpu.c: correct max_distance calculation for pcpu_embed_first_chunk()
        percpu: eliminate two sparse warnings
        percpu: improve generic percpu modify-return implementation
        percpu-refcount: init ->confirm_switch member properly
        percpu_ref: allow operation mode switching operations to be called concurrently
        percpu_ref: restructure operation mode switching
        percpu_ref: unify staggered atomic switching wait behavior
        percpu_ref: reorganize __percpu_ref_switch_to_atomic() and relocate percpu_ref_switch_to_atomic()
        percpu_ref: remove unnecessary RCU grace period for staggered atomic switching confirmation
      b6daa51b
    • L
      Merge branch 'for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · f96ed261
      Linus Torvalds 提交于
      Pull libata updates from Tejun Heo:
       - Write same support added
       - Minor ahci MSIX irq handling updates
       - Non-critical SCSI command translation fixes
       - Controller specific changes
      
      * 'for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        ahci: qoriq: Revert "ahci: qoriq: Disable NCQ on ls2080a SoC"
        libata: remove <asm-generic/libata-portmap.h>
        libata: remove unused definitions from <asm/libata-portmap.h>
        pata_at91: Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR
        ata: Replace BUG() with BUG_ON().
        ata: sata_mv: Replacing dma_pool_alloc and memset with a single call dma_pool_zalloc.
        libata: Some drives failing on SCT Write Same
        ahci: use pci_alloc_irq_vectors
        libata: SCT Write Same handle ATA_DFLAG_PIO
        libata: SCT Write Same / DSM Trim
        libata: Add support for SCT Write Same
        libata: Safely overwrite attached page in WRITE SAME xlat
        ahci: also use a per-port lock for the multi-MSIX case
        ARM: dts: STiH407-family: Add ports-implemented property in sata nodes
        ahci: st: Add ports-implemented property in support
        ahci: qoriq: enable snoopable sata read and write
        ahci: qoriq: adjust sata parameter
        libata-scsi: fix MODE SELECT translation for Control mode page
        libata-scsi: use u8 array to store mode page copy
      f96ed261
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · b56061b0
      Linus Torvalds 提交于
      Pull more SCSI updates from James Bottomley:
       "This is just a set of minor updates and fixes which weren't quite
        ready in time for the first pull request.
      
        The only real thing of note is Mike Christie is stepping down as
        Maintainer of iscsi to be replaced by Lee Duncan and Chris Leech"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: ufs: Kconfig fix
        scsi: g_NCR5380: Stop using scsi_module.c
        scsi: g_NCR5380: Reduce overrides[] from array to struct
        scsi: g_NCR5380: Remove deprecated __setup
        scsi: ufs: Fix error return code in ufshcd_init()
        scsi: ufs: Data Segment only needed for WRITE DESCRIPTOR
        scsi: cxgb4i: Set completion bit in work request
        MAINTAINERS: Update open-iscsi maintainers
        scsi: ufs: Enable no vccq quirk for skhynix device
        scsi: be2iscsi: mark symbols static where possible
      b56061b0
    • D
      pkeys: Remove easily triggered WARN · 49606342
      Dave Jones 提交于
      This easy-to-trigger warning shows up instantly when running
      Trinity on a kernel with CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS disabled.
      
      At most this should have been a printk, but the -EINVAL alone should be more
      than adequate indicator that something isn't available.
      Signed-off-by: NDave Jones <davej@codemonkey.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      49606342
    • L
      Merge tag 'metag-for-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag · e9f8f48b
      Linus Torvalds 提交于
      Pull metag architecture fix from James Hogan:
       "A simple build fix for irqsoff atomics which has started hitting
        meta1_defconfig during the 4.9 merge window"
      
      * tag 'metag-for-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
        metag: Only define atomic_dec_if_positive conditionally
      e9f8f48b
    • L
      Merge tag 'powerpc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · d8bfb96a
      Linus Torvalds 提交于
      Pull more powerpc updates from Michael Ellerman:
       "Some more powerpc updates for 4.9:
      
        Freescale updates from Scott Wood:
         - qbman support (a prerequisite for datapath drivers such as ethernet)
         - a PCI DMA fix+improvement
         - reset handler changes
         - more 8xx optimizations
         - some cleanups and fixes.'
      
        Fixes:
         - selftests/powerpc: Add missing binaries to .gitignores (Michael Ellerman)
         - selftests/powerpc: Fix build break caused by EXPORT_SYMBOL changes (Michael Ellerman)
         - powerpc/pseries: Fix stack corruption in htpe code (Laurent Dufour)
         - powerpc/64s: Fix power4_fixup_nap placement (Nicholas Piggin)
         - powerpc/64: Fix incorrect return value from __copy_tofrom_user (Paul Mackerras)
         - powerpc/mm/hash64: Fix might_have_hea() check (Michael Ellerman)
      
        Other:
         - MAINTAINERS: Remove myself from PA Semi entries (Olof Johansson)
         - MAINTAINERS: Drop separate pseries entry (Michael Ellerman)
         - MAINTAINERS: Update powerpc website & add selftests (Michael Ellerman):
      
      * tag 'powerpc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (35 commits)
        powerpc/mm/hash64: Fix might_have_hea() check
        powerpc/64: Fix incorrect return value from __copy_tofrom_user
        powerpc/64s: Fix power4_fixup_nap placement
        powerpc/pseries: Fix stack corruption in htpe code
        selftests/powerpc: Fix build break caused by EXPORT_SYMBOL changes
        MAINTAINERS: Update powerpc website & add selftests
        MAINTAINERS: Drop separate pseries entry
        MAINTAINERS: Remove myself from PA Semi entries
        selftests/powerpc: Add missing binaries to .gitignores
        arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig
        soc/qman: Add self-test for QMan driver
        soc/bman: Add self-test for BMan driver
        soc/fsl: Introduce DPAA 1.x QMan device driver
        soc/fsl: Introduce DPAA 1.x BMan device driver
        powerpc/8xx: make user addr DTLB miss the short path
        powerpc/8xx: Move additional DTLBMiss handlers out of exception area
        powerpc/8xx: use r3 to scratch CR in ITLBmiss
        soc/fsl/qe: fix gpio save_regs functions
        powerpc/8xx: add dedicated machine check handler
        powerpc/8xx: add system_reset_exception
        ...
      d8bfb96a
    • R
  2. 14 10月, 2016 10 次提交
    • R
      Merge branches 'acpi-fan', 'acpi-ec', 'acpi-drivers' and 'acpi-osl' · 522533f3
      Rafael J. Wysocki 提交于
      * acpi-fan:
        ACPI / fan: Fix error reading cur_state
      
      * acpi-ec:
        ACPI / EC: Fix unused function warning when CONFIG_PM_SLEEP=n
      
      * acpi-drivers:
        ACPI / PAD: don't register acpi_pad driver if running as Xen dom0
      
      * acpi-osl:
        acpi_os_vprintf: Use printk_get_level() to avoid unnecessary KERN_CONT
      522533f3
    • R
      Merge branches 'device-properties' and 'acpi-misc' · 3f62d526
      Rafael J. Wysocki 提交于
      * device-properties:
        ACPI / property: Allow holes in reference properties
      
      * acpi-misc:
        MAINTAINERS: Add ARM64-specific ACPI maintainers entry
      3f62d526
    • R
      Merge branches 'pm-cpufreq' and 'pm-devfreq' · 383731d9
      Rafael J. Wysocki 提交于
      * pm-cpufreq:
        cpufreq: CPPC: Correct desired_perf calculation
        cpufreq: conservative: Fix next frequency selection
        cpufreq: skip invalid entries when searching the frequency
        cpufreq: intel_pstate: Fix struct pstate_adjust_policy kerneldoc
        cpufreq: intel_pstate: Proportional algorithm for Atom
        cpufreq: intel_pstate: Clarify comment in get_target_pstate_use_performance()
        cpufreq: intel_pstate: Fix unsafe HWP MSR access
      
      * pm-devfreq:
        PM / devfreq: Skip status update on uninitialized previous_freq
        PM / devfreq: Add proper locking around list_del()
        PM / devfreq: exynos-nocp: Remove redundant code
        PM / devfreq: exynos-nocp: Select REGMAP_MMIO
      383731d9
    • M
      ovl: use vfs_get_link() · 7764235b
      Miklos Szeredi 提交于
      Resulting in a complete removal of a function basically implementing the
      inverse of vfs_readlink().
      
      As a bonus, now the proper security hook is also called.
      Signed-off-by: NMiklos Szeredi <mszeredi@redhat.com>
      7764235b
    • M
      vfs: add vfs_get_link() helper · d60874cd
      Miklos Szeredi 提交于
      This helper is for filesystems that want to read the symlink and are better
      off with the get_link() interface (returning a char *) rather than the
      readlink() interface (copy into a userspace buffer).
      
      Also call the LSM hook for readlink (not get_link) since this is for
      symlink reading not following.
      Signed-off-by: NMiklos Szeredi <mszeredi@redhat.com>
      d60874cd
    • M
      ovl: use generic_readlink · 78a3fa4f
      Miklos Szeredi 提交于
      All filesystems that are backers for overlayfs would also use
      generic_readlink().  Move this logic to the overlay itself, which is a nice
      cleanup.
      Signed-off-by: NMiklos Szeredi <mszeredi@redhat.com>
      78a3fa4f
    • M
      ovl: explain error values when removing acl from workdir · cb348edb
      Miklos Szeredi 提交于
      Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> 
      Signed-off-by: NMiklos Szeredi <mszeredi@redhat.com>
      cb348edb
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 29fbff86
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Fix various build warnings in tlan/qed/xen-netback drivers, from
          Arnd Bergmann.
      
       2) Propagate proper error code in strparser's strp_recv(), from Geert
          Uytterhoeven.
      
       3) Fix accidental broadcast of RTM_GETTFILTER responses, from Eric
          Dumazret.
      
       4) Need to use list_for_each_entry_safe() in qed driver, from Wei
          Yongjun.
      
       5) Openvswitch 802.1AD bug fixes from Jiri Benc.
      
       6) Cure BUILD_BUG_ON() in mlx5 driver, from Tom Herbert.
      
       7) Fix UDP ipv6 checksumming in netvsc driver, from Stephen Hemminger.
      
       8) stmmac driver fixes from Giuseppe CAVALLARO.
      
       9) Fix access to mangled IP6CB in tcp, from Eric Dumazet.
      
      10) Fix info leaks in tipc and rtnetlink, from Dan Carpenter.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (27 commits)
        net: bridge: add the multicast_flood flag attribute to brport_attrs
        net: axienet: Remove unused parameter from __axienet_device_reset
        liquidio: CN23XX: fix a loop timeout
        net: rtnl: info leak in rtnl_fill_vfinfo()
        tipc: info leak in __tipc_nl_add_udp_addr()
        net: ipv4: Do not drop to make_route if oif is l3mdev
        net: phy: Trigger state machine on state change and not polling.
        ipv6: tcp: restore IP6CB for pktoptions skbs
        netvsc: Remove mistaken udp.h inclusion.
        xen-netback: fix type mismatch warning
        stmmac: fix error check when init ptp
        stmmac: fix ptp init for gmac4
        qed: fix old-style function definition
        netvsc: fix checksum on UDP IPV6
        net_sched: reorder pernet ops and act ops registrations
        xen-netback: fix guest Rx stall detection (after guest Rx refactor)
        drivers/ptp: Fix kernel memory disclosure
        net/mlx5: Add MLX5_ARRAY_SET64 to fix BUILD_BUG_ON
        qmi_wwan: add support for Quectel EC21 and EC25
        openvswitch: add NETIF_F_HW_VLAN_STAG_TX to internal dev
        ...
      29fbff86
    • L
      Merge tag 'nfs-for-4.9-1' of git://git.linux-nfs.org/projects/anna/linux-nfs · c4a86165
      Linus Torvalds 提交于
      Pull NFS client updates from Anna Schumaker:
       "Highlights include:
      
        Stable bugfixes:
         - sunrpc: fix writ espace race causing stalls
         - NFS: Fix inode corruption in nfs_prime_dcache()
         - NFSv4: Don't report revoked delegations as valid in nfs_have_delegation()
         - NFSv4: nfs4_copy_delegation_stateid() must fail if the delegation is invalid
         - NFSv4: Open state recovery must account for file permission changes
         - NFSv4.2: Fix a reference leak in nfs42_proc_layoutstats_generic
      
        Features:
         - Add support for tracking multiple layout types with an ordered list
         - Add support for using multiple backchannel threads on the client
         - Add support for pNFS file layout session trunking
         - Delay xprtrdma use of DMA API (for device driver removal)
         - Add support for xprtrdma remote invalidation
         - Add support for larger xprtrdma inline thresholds
         - Use a scatter/gather list for sending xprtrdma RPC calls
         - Add support for the CB_NOTIFY_LOCK callback
         - Improve hashing sunrpc auth_creds by using both uid and gid
      
        Bugfixes:
         - Fix xprtrdma use of DMA API
         - Validate filenames before adding to the dcache
         - Fix corruption of xdr->nwords in xdr_copy_to_scratch
         - Fix setting buffer length in xdr_set_next_buffer()
         - Don't deadlock the state manager on the SEQUENCE status flags
         - Various delegation and stateid related fixes
         - Retry operations if an interrupted slot receives EREMOTEIO
         - Make nfs boot time y2038 safe"
      
      * tag 'nfs-for-4.9-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (100 commits)
        NFSv4.2: Fix a reference leak in nfs42_proc_layoutstats_generic
        fs: nfs: Make nfs boot time y2038 safe
        sunrpc: replace generic auth_cred hash with auth-specific function
        sunrpc: add RPCSEC_GSS hash_cred() function
        sunrpc: add auth_unix hash_cred() function
        sunrpc: add generic_auth hash_cred() function
        sunrpc: add hash_cred() function to rpc_authops struct
        Retry operation on EREMOTEIO on an interrupted slot
        pNFS: Fix atime updates on pNFS clients
        sunrpc: queue work on system_power_efficient_wq
        NFSv4.1: Even if the stateid is OK, we may need to recover the open modes
        NFSv4: If recovery failed for a specific open stateid, then don't retry
        NFSv4: Fix retry issues with nfs41_test/free_stateid
        NFSv4: Open state recovery must account for file permission changes
        NFSv4: Mark the lock and open stateids as invalid after freeing them
        NFSv4: Don't test open_stateid unless it is set
        NFSv4: nfs4_do_handle_exception() handle revoke/expiry of a single stateid
        NFS: Always call nfs_inode_find_state_and_recover() when revoking a delegation
        NFSv4: Fix a race when updating an open_stateid
        NFSv4: Fix a race in nfs_inode_reclaim_delegation()
        ...
      c4a86165
    • L
      Merge tag 'nfsd-4.9' of git://linux-nfs.org/~bfields/linux · 27785564
      Linus Torvalds 提交于
      Pull nfsd updates from Bruce Fields:
       "Some RDMA work and some good bugfixes, and two new features that could
        benefit from user testing:
      
         - Anna Schumacker contributed a simple NFSv4.2 COPY implementation.
           COPY is already supported on the client side, so a call to
           copy_file_range() on a recent client should now result in a
           server-side copy that doesn't require all the data to make a round
           trip to the client and back.
      
         - Jeff Layton implemented callbacks to notify clients when contended
           locks become available, which should reduce latency on workloads
           with contended locks"
      
      * tag 'nfsd-4.9' of git://linux-nfs.org/~bfields/linux:
        NFSD: Implement the COPY call
        nfsd: handle EUCLEAN
        nfsd: only WARN once on unmapped errors
        exportfs: be careful to only return expected errors.
        nfsd4: setclientid_confirm with unmatched verifier should fail
        nfsd: randomize SETCLIENTID reply to help distinguish servers
        nfsd: set the MAY_NOTIFY_LOCK flag in OPEN replies
        nfs: add a new NFS4_OPEN_RESULT_MAY_NOTIFY_LOCK constant
        nfsd: add a LRU list for blocked locks
        nfsd: have nfsd4_lock use blocking locks for v4.1+ locks
        nfsd: plumb in a CB_NOTIFY_LOCK operation
        NFSD: fix corruption in notifier registration
        svcrdma: support Remote Invalidation
        svcrdma: Server-side support for rpcrdma_connect_private
        rpcrdma: RDMA/CM private message data structure
        svcrdma: Skip put_page() when send_reply() fails
        svcrdma: Tail iovec leaves an orphaned DMA mapping
        nfsd: fix dprintk in nfsd4_encode_getdeviceinfo
        nfsd: eliminate cb_minorversion field
        nfsd: don't set a FL_LAYOUT lease for flexfiles layouts
      27785564