1. 14 9月, 2017 3 次提交
  2. 13 9月, 2017 6 次提交
  3. 09 9月, 2017 6 次提交
    • L
      Merge tag 'kvm-4.14-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 0756b7fb
      Linus Torvalds 提交于
      Pull KVM updates from Radim Krčmář:
       "First batch of KVM changes for 4.14
      
        Common:
         - improve heuristic for boosting preempted spinlocks by ignoring
           VCPUs in user mode
      
        ARM:
         - fix for decoding external abort types from guests
      
         - added support for migrating the active priority of interrupts when
           running a GICv2 guest on a GICv3 host
      
         - minor cleanup
      
        PPC:
         - expose storage keys to userspace
      
         - merge kvm-ppc-fixes with a fix that missed 4.13 because of
           vacations
      
         - fixes
      
        s390:
         - merge of kvm/master to avoid conflicts with additional sthyi fixes
      
         - wire up the no-dat enhancements in KVM
      
         - multiple epoch facility (z14 feature)
      
         - Configuration z/Architecture Mode
      
         - more sthyi fixes
      
         - gdb server range checking fix
      
         - small code cleanups
      
        x86:
         - emulate Hyper-V TSC frequency MSRs
      
         - add nested INVPCID
      
         - emulate EPTP switching VMFUNC
      
         - support Virtual GIF
      
         - support 5 level page tables
      
         - speedup nested VM exits by packing byte operations
      
         - speedup MMIO by using hardware provided physical address
      
         - a lot of fixes and cleanups, especially nested"
      
      * tag 'kvm-4.14-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (67 commits)
        KVM: arm/arm64: Support uaccess of GICC_APRn
        KVM: arm/arm64: Extract GICv3 max APRn index calculation
        KVM: arm/arm64: vITS: Drop its_ite->lpi field
        KVM: arm/arm64: vgic: constify seq_operations and file_operations
        KVM: arm/arm64: Fix guest external abort matching
        KVM: PPC: Book3S HV: Fix memory leak in kvm_vm_ioctl_get_htab_fd
        KVM: s390: vsie: cleanup mcck reinjection
        KVM: s390: use WARN_ON_ONCE only for checking
        KVM: s390: guestdbg: fix range check
        KVM: PPC: Book3S HV: Report storage key support to userspace
        KVM: PPC: Book3S HV: Fix case where HDEC is treated as 32-bit on POWER9
        KVM: PPC: Book3S HV: Fix invalid use of register expression
        KVM: PPC: Book3S HV: Fix H_REGISTER_VPA VPA size validation
        KVM: PPC: Book3S HV: Fix setting of storage key in H_ENTER
        KVM: PPC: e500mc: Fix a NULL dereference
        KVM: PPC: e500: Fix some NULL dereferences on error
        KVM: PPC: Book3S HV: Protect updates to spapr_tce_tables list
        KVM: s390: we are always in czam mode
        KVM: s390: expose no-DAT to guest and migration support
        KVM: s390: sthyi: remove invalid guest write access
        ...
      0756b7fb
    • L
      Merge tag 'linux-kselftest-4.14-rc1-update' of... · 6d621897
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-4.14-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest updates from Shuah Khan:
      
       - TAP13 framework API and converting tests to TAP13 continues. A few
         more tests are converted and kselftest common RUN_TESTS in lib.mk is
         enhanced to print TAP13 to cover test shell scripts that won't be
         able to use kselftest API.
      
       - Several fixes to existing tests to not fail in unsupported cases.
         This has been an ongoing work based on the feedback from stable
         release kselftest users.
      
       - A new watchdog test and much needed cleanups to the existing tests
         from Eugeniu Rosca.
      
       - Changes to kselftest common lib.mk framework to make RUN_TESTS a
         function to be called from individual test make files to run stress
         and destructive sub-tests.
      
      * tag 'linux-kselftest-4.14-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (41 commits)
        selftests: Enhance kselftest_harness.h to print which assert failed
        selftests: lib.mk: change RUN_TESTS to print messages in TAP13 format
        selftests: change lib.mk RUN_TESTS to take test list as an argument
        selftests: lib.mk: suppress "cd" output from run_tests target
        selftests: kselftest framework: change skip exit code to 0
        selftests/timers: make loop consistent with array size
        selftests: timers: remove rtctest_setdate from run_destructive_tests
        selftests: timers: Fix run_destructive_tests target to handle skipped tests
        kselftests: timers: leap-a-day: Change default arguments to help test runs
        selftests: timers: drop support for !KTEST case
        rtc: rtctest: Improve support detection
        selftests/cpu-hotplug: Skip test when there is only one online cpu
        selftests/cpu-hotplug: exit with failure when test occured unexpected behaviors
        selftests: futex: convert test to use ksft TAP13 framework
        selftests: capabilities: convert error output to TAP13 ksft framework
        selftests: memfd: Align STACK_SIZE for ARM AArch64 system
        selftests: warn if failure is due to lack of executable bit
        selftests: kselftest framework: add error counter
        selftests: capabilities: convert the test to use TAP13 ksft framework
        selftests: capabilities: fix to run Non-root +ia, sgidroot => i test
        ...
      6d621897
    • L
      Merge tag 'trace-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 42c8e86c
      Linus Torvalds 提交于
      Pull tracing updates from Steven Rostedt:
       "Nothing new in development for this release. These are mostly fixes
        that were found during development of changes for the next merge
        window and fixes that were sent to me late in the last cycle"
      
      * tag 'trace-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Apply trace_clock changes to instance max buffer
        tracing: Fix clear of RECORDED_TGID flag when disabling trace event
        tracing: Add barrier to trace_printk() buffer nesting modification
        ftrace: Fix memleak when unregistering dynamic ops when tracing disabled
        ftrace: Fix selftest goto location on error
        ftrace: Zero out ftrace hashes when a module is removed
        tracing: Only have rmmod clear buffers that its events were active in
        ftrace: Fix debug preempt config name in stack_tracer_{en,dis}able
      42c8e86c
    • L
      genksyms: fix gperf removal conversion · 3aea311c
      Linus Torvalds 提交于
      I had stupidly missed one special use of 'is_reserved_word()' when I
      converted the code to avoid gperf.
      
      I had changed that function to return the token ID directly rather than
      a pointer to the token descriptor structure, but that meant that the
      test for "is this a reserved word" changed from checking the return
      value against NULL, to checking that it wasn't negative.
      
      And while I had converted the main token parser over, I missed the
      special case of the typeof phrase handling.  And since our dependency
      chain for genksyms does not include the genksyms program itself
      changing, my kernel rebuild didn't show the problem.
      
      Fixes: bb3290d9 ("Remove gperf usage from toolchain")
      Reported-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3aea311c
    • L
      RDMA/netlink: clean up message validity array initializer · 015a9e66
      Linus Torvalds 提交于
      The fix in the parent made me look at that function, and react to how
      illogical and illegible the array initializer was.
      
      Use named array indexes to make it clearer what is going on, and make
      the initializer not depend silently on the exact index numbers.
      
      [ The initializer now also shows an odd inconsistency in the naming:
        note the IWCM vs IWPM..   - Linus ]
      
      Cc: Leon Romanovsky <leonro@mellanox.com>
      Cc: Doug Ledford <dledford@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      015a9e66
    • L
      RDAM/netlink: Fix out-of-bound access while checking message validity · 8b2c7e7a
      Leon Romanovsky 提交于
      The netlink message sent with type == 0, which doesn't have any client
      behind it, caused to the overflow in max_num_ops array.
      
      Fix it by declaring zero number of ops for the first client.
      
      Fixes: c9901724 ("RDMA/netlink: Remove netlink clients infrastructure")
      Signed-off-by: NLeon Romanovsky <leon@kernel.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8b2c7e7a
  4. 08 9月, 2017 25 次提交
    • R
      Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 5f54c8b2
      Radim Krčmář 提交于
      This fix was intended for 4.13, but didn't get in because both
      maintainers were on vacation.
      
      Paul Mackerras:
       "It adds mutual exclusion between list_add_rcu and list_del_rcu calls
        on the kvm->arch.spapr_tce_tables list.  Without this, userspace could
        potentially trigger corruption of the list and cause a host crash or
        worse."
      5f54c8b2
    • L
      Merge branch 'gperf-removal' · 5969d1bb
      Linus Torvalds 提交于
      Remove our use of 'gperf' for generating perfect hashes from some of our
      build tools.
      
      This removal was prompted by Masahiro Yamada sending out a patch that
      removes all our pre-generated files, and when I tested it, I noticed
      that the gperf version I have (3.1) apparently generates code that no
      longer works with out code-base because the function interfaces
      generated by gperf have changed.
      
      We really don't care that much, and the gperf people changed their
      interfaces in ways that makes it annoying to work with them.  Tools that
      make it hard to use them should not be used, and the kernel is not at
      all interested in some autoconf mess.  So remove the gperf dependency
      entirely.
      
      It turns out that if you ignore the pre-generated files, the use of
      gperf apparently saved us a whopping fifteen lines of code.  It
      obviously wasn't worth it, considering that the pre-generated files are
      about 500 lines.
      
      I sent this out as a patch about three weeks ago, and got absolutely
      zero responses.  So let's see if anybody notices now that I merge it.
      Because there might be serious bugs here, but it WorksForMe(tm).
      
      * gperf-removal:
        Remove gperf usage from toolchain
      5969d1bb
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 572c01ba
      Linus Torvalds 提交于
      Pull SCSI updates from James Bottomley:
       "This is mostly updates of the usual suspects: lpfc, qla2xxx, hisi_sas,
        megaraid_sas, zfcp and a host of minor updates.
      
        The major driver change here is the elimination of the block based
        cciss driver in favour of the SCSI based hpsa driver (which now drives
        all the legacy cases cciss used to be required for). Plus a reset
        handler clean up and the redo of the SAS SMP handler to use bsg lib"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (279 commits)
        scsi: scsi-mq: Always unprepare before requeuing a request
        scsi: Show .retries and .jiffies_at_alloc in debugfs
        scsi: Improve requeuing behavior
        scsi: Call scsi_initialize_rq() for filesystem requests
        scsi: qla2xxx: Reset the logo flag, after target re-login.
        scsi: qla2xxx: Fix slow mem alloc behind lock
        scsi: qla2xxx: Clear fc4f_nvme flag
        scsi: qla2xxx: add missing includes for qla_isr
        scsi: qla2xxx: Fix an integer overflow in sysfs code
        scsi: aacraid: report -ENOMEM to upper layer from aac_convert_sgraw2()
        scsi: aacraid: get rid of one level of indentation
        scsi: aacraid: fix indentation errors
        scsi: storvsc: fix memory leak on ring buffer busy
        scsi: scsi_transport_sas: switch to bsg-lib for SMP passthrough
        scsi: smartpqi: remove the smp_handler stub
        scsi: hpsa: remove the smp_handler stub
        scsi: bsg-lib: pass the release callback through bsg_setup_queue
        scsi: Rework handling of scsi_device.vpd_pg8[03]
        scsi: Rework the code for caching Vital Product Data (VPD)
        scsi: rcu: Introduce rcu_swap_protected()
        ...
      572c01ba
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk · cef5d0f9
      Linus Torvalds 提交于
      Pull printk updates from Petr Mladek:
      
       - Do not allow use of freed init data and code even when boot consoles
         are forced to stay. Also check for the init memory more precisely.
      
       - Some code clean up by starting contributors.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
        printk: Clean up do_syslog() error handling
        printk/console: Enhance the check for consoles using init memory
        printk/console: Always disable boot consoles that use init memory before it is freed
        printk: Modify operators of printed_len and text_len
      cef5d0f9
    • L
      Merge tag 'audit-pr-20170907' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit · 0fb02e71
      Linus Torvalds 提交于
      Pull audit updates from Paul Moore:
       "A small pull request for audit this time, only four patches and only
        two with any real code changes.
      
        Those two changes are the removal of a pointless SELinux AVC
        initialization audit event and a fix to improve the audit timestamp
        overhead.
      
        The other two patches are comment cleanup and administrative updates,
        nothing very exciting.
      
        Everything passes our tests"
      
      * tag 'audit-pr-20170907' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
        audit: update the function comments
        selinux: remove AVC init audit log message
        audit: update the audit info in MAINTAINERS
        audit: Reduce overhead using a coarse clock
      0fb02e71
    • L
      Merge tag 'secureexec-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 828f4257
      Linus Torvalds 提交于
      Pull secureexec update from Kees Cook:
       "This series has the ultimate goal of providing a sane stack rlimit
        when running set*id processes.
      
        To do this, the bprm_secureexec LSM hook is collapsed into the
        bprm_set_creds hook so the secureexec-ness of an exec can be
        determined early enough to make decisions about rlimits and the
        resulting memory layouts. Other logic acting on the secureexec-ness of
        an exec is similarly consolidated. Capabilities needed some special
        handling, but the refactoring removed other special handling, so that
        was a wash"
      
      * tag 'secureexec-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        exec: Consolidate pdeath_signal clearing
        exec: Use sane stack rlimit under secureexec
        exec: Consolidate dumpability logic
        smack: Remove redundant pdeath_signal clearing
        exec: Use secureexec for clearing pdeath_signal
        exec: Use secureexec for setting dumpability
        LSM: drop bprm_secureexec hook
        commoncap: Move cap_elevated calculation into bprm_set_creds
        commoncap: Refactor to remove bprm_secureexec hook
        smack: Refactor to remove bprm_secureexec hook
        selinux: Refactor to remove bprm_secureexec hook
        apparmor: Refactor to remove bprm_secureexec hook
        binfmt: Introduce secureexec flag
        exec: Correct comments about "point of no return"
        exec: Rename bprm->cred_prepared to called_set_creds
      828f4257
    • L
      Merge tag 'gcc-plugins-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 44ccba3f
      Linus Torvalds 提交于
      Pull gcc plugins update from Kees Cook:
       "This finishes the porting work on randstruct, and introduces a new
        option to structleak, both noted below:
      
         - For the randstruct plugin, enable automatic randomization of
           structures that are entirely function pointers (along with a couple
           designated initializer fixes).
      
         - For the structleak plugin, provide an option to perform zeroing
           initialization of all otherwise uninitialized stack variables that
           are passed by reference (Ard Biesheuvel)"
      
      * tag 'gcc-plugins-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        gcc-plugins: structleak: add option to init all vars used as byref args
        randstruct: Enable function pointer struct detection
        drivers/net/wan/z85230.c: Use designated initializers
        drm/amd/powerplay: rv: Use designated initializers
      44ccba3f
    • L
      Merge tag 'pstore-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 21d236bf
      Linus Torvalds 提交于
      Pull pstore update from Kees Cook:
       "Make pstore permissions more versatile by removing CAP_SYSLOG
        requirement and defining more restrictive root directory DAC
        permissions default (0750, which can be adjust after boot unlike the
        CAP_SYSLOG check).
      
        Suggested by Nick Kralevich"
      
      * tag 'pstore-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        Revert "pstore: Honor dmesg_restrict sysctl on dmesg dumps"
        pstore: Make default pstorefs root dir perms 0750
      21d236bf
    • L
      Merge tag '4.14-smb3-xattr-enable' of git://git.samba.org/sfrench/cifs-2.6 · 8dc5b3a6
      Linus Torvalds 提交于
      Pull cifs update from Steve French:
       "Enable xattr support for smb3 and also a bugfix"
      
      * tag '4.14-smb3-xattr-enable' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: Check for timeout on Negotiate stage
        cifs: Add support for writing attributes on SMB2+
        cifs: Add support for reading attributes on SMB2+
      8dc5b3a6
    • L
      Merge git://git.kvack.org/~bcrl/aio-next · 2500e287
      Linus Torvalds 提交于
      Pull aio fix from Ben LaHaise:
       "Improve aio-nr counting on large SMP systems.
      
        It has been in linux-next for quite some time"
      
      * git://git.kvack.org/~bcrl/aio-next:
        fs: aio: fix the increment of aio-nr and counting against aio-max-nr
      2500e287
    • L
      Merge branch 'quota_scaling' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · ae8ac6b7
      Linus Torvalds 提交于
      Pull quota scaling updates from Jan Kara:
       "This contains changes to make the quota subsystem more scalable.
      
        Reportedly it improves number of files created per second on ext4
        filesystem on fast storage by about a factor of 2x"
      
      * 'quota_scaling' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: (28 commits)
        quota: Add lock annotations to struct members
        quota: Reduce contention on dq_data_lock
        fs: Provide __inode_get_bytes()
        quota: Inline dquot_[re]claim_reserved_space() into callsite
        quota: Inline inode_{incr,decr}_space() into callsites
        quota: Inline functions into their callsites
        ext4: Disable dirty list tracking of dquots when journalling quotas
        quota: Allow disabling tracking of dirty dquots in a list
        quota: Remove dq_wait_unused from dquot
        quota: Move locking into clear_dquot_dirty()
        quota: Do not dirty bad dquots
        quota: Fix possible corruption of dqi_flags
        quota: Propagate ->quota_read errors from v2_read_file_info()
        quota: Fix error codes in v2_read_file_info()
        quota: Push dqio_sem down to ->read_file_info()
        quota: Push dqio_sem down to ->write_file_info()
        quota: Push dqio_sem down to ->get_next_id()
        quota: Push dqio_sem down to ->release_dqblk()
        quota: Remove locking for writing to the old quota format
        quota: Do not acquire dqio_sem for dquot overwrites in v2 format
        ...
      ae8ac6b7
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 460352c2
      Linus Torvalds 提交于
      Pull UDF, reiserfs, quota, fsnotify cleanups from Jan Kara:
       "Several UDF, reiserfs, quota and fsnotify cleanups.
      
        Note that there is also a patch updating MAINTAINERS entry for
        notification subsystem to point to me as a maintainer since current
        entries are stale"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        fsnotify: make dnotify_fsnotify_ops const
        isofs: Delete an unnecessary variable initialisation in isofs_read_inode()
        isofs: Adjust four checks for null pointers
        isofs: Delete an error message for a failed memory allocation in isofs_read_inode()
        quota_v2: Delete an error message for a failed memory allocation in v2_read_file_info()
        fs-udf: Delete an error message for a failed memory allocation in two functions
        fs-udf: Improve six size determinations
        fs-udf: Adjust two checks for null pointers
        reiserfs: fix spelling mistake: "tranasction" -> "transaction"
        MAINTAINERS: Update entries for notification subsystem
        uapi/linux/quota.h: Do not include linux/errno.h
      460352c2
    • L
      Merge tag 'devicetree-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 74fee4e8
      Linus Torvalds 提交于
      Pull DeviceTree updates from Rob Herring:
       "There's a few orphans in the conversion to %pOF printf specifiers
        included here that no one else picked up.
      
        Summary:
      
         - Convert more DT code to use of_property_read_* API.
      
         - Improve DT overlay support when adding multiple overlays
      
         - Convert printk's to %pOF format specifiers. Most went via subsystem
           trees, but picked up the remaining orphans
      
         - Correct unittests to use preferred "okay" for "status" property
           value
      
         - Add a KASLR seed property
      
         - Vendor prefixes for Mellanox, Theobroma System, Adaptrum, Moxa
      
         - Fix modalias buffer handling
      
         - Clean-up of include paths for building dtbs
      
         - Add bindings for amc6821, isl1208, tsl2x7x, srf02, and srf10
           devices
      
         - Add nvmem bindings for MediaTek MT7623 and MT7622 SoC
      
         - Add compatible string for Allwinner H5 Mali-450 GPU
      
         - Fix links to old OpenFirmware docs with new mirror on
           devicetree.org
      
         - Remove status property from binding doc examples"
      
      * tag 'devicetree-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (45 commits)
        devicetree: Adjust status "ok" -> "okay" under drivers/of/
        dt-bindings: Remove "status" from examples
        dt-bindings: pinctrl: sh-pfc: Use generic node name
        dt-bindings: Add vendor Mellanox
        dt-binding: net/phy: fix interrupts description
        virt: Convert to using %pOF instead of full_name
        macintosh: Convert to using %pOF instead of full_name
        ide: pmac: Convert to using %pOF instead of full_name
        microblaze: Convert to using %pOF instead of full_name
        dt-bindings: usb: musb: Grammar s/the/to/, s/is/are/
        of: Use PLATFORM_DEVID_NONE definition
        of/device: Fix of_device_get_modalias() buffer handling
        of/device: Prevent buffer overflow in of_device_modalias()
        dt-bindings: add amc6821, isl1208 trivial bindings
        dt-bindings: add vendor prefix for Theobroma Systems
        of: search scripts/dtc/include-prefixes path for both CPP and DTC
        of: remove arch/$(SRCARCH)/boot/dts from include search path for CPP
        of: remove drivers/of/testcase-data from include search path for CPP
        of: return of_get_cpu_node from of_cpu_device_node_get if CPUs are not registered
        iio: srf08: add device tree binding for srf02 and srf10
        ...
      74fee4e8
    • L
      Merge tag 'drm-intel-next-fixes-2017-09-07' of git://anongit.freedesktop.org/git/drm-intel · 7d955656
      Linus Torvalds 提交于
      Pull i916 drm fixes from Rodrigo Vivi:
       "Since Dave is on paternity leave we are sending drm/i915 fixes for
        v4.14-rc1 directly to you as he had asked us to do.
      
        The most critical ones are the GPU reset fix for gen2-4 and GVT fix
        for a regression that is blocking gvt init to work on your tree.
      
        The rest is general fixes for patches coming from drm-next"
      Acked-by: NDave Airlie <airlied@redhat.com>
      
      * tag 'drm-intel-next-fixes-2017-09-07' of git://anongit.freedesktop.org/git/drm-intel:
        drm/i915: Re-enable GTT following a device reset
        drm/i915: Annotate user relocs with __user
        drm/i915: Silence sparse by using gfp_t
        drm/i915: Add __rcu to radix tree slot pointer
        drm/i915: Fix the missing PPAT cache attributes on CNL
        drm/i915/gvt: Remove one duplicated MMIO
        drm/i915: Fix enum pipe vs. enum transcoder for the PCH transcoder
        drm/i915: Make i2c lock ops static
        drm/i915: Make i9xx_load_ycbcr_conversion_matrix() static
        drm/i915/edp: Increase T12 panel delay to 900 ms to fix DP AUX CH timeouts
        drm/i915: Ignore duplicate VMA stored within the per-object handle LUT
        drm/i915: Skip fence alignemnt check for the CCS plane
        drm/i915: Treat fb->offsets[] as a raw byte offset instead of a linear offset
        drm/i915: Always wake the device to flush the GTT
        drm/i915: Recreate vmapping even when the object is pinned
        drm/i915: Quietly cancel FBC activation if CRTC is turned off before worker
      7d955656
    • L
      Merge tag 'leds_for_4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds · 5f9cc570
      Linus Torvalds 提交于
      Pull LED updates from Jacek Anaszewski:
       "LED class drivers improvements:
      
        leds-pca955x:
         - add Device Tree support and bindings
         - use devm_led_classdev_register()
         - add GPIO support
         - prevent crippled LED class device name
         - check for I2C errors
      
        leds-gpio:
         - add optional retain-state-shutdown DT property
         - allow LED to retain state at shutdown
      
        leds-tlc591xx:
         - merge conditional tests
         - add missing of_node_put
      
        leds-powernv:
         - delete an error message for a failed memory allocation in
           powernv_led_create()
      
        leds-is31fl32xx.c
         - convert to using custom %pOF printf format specifier
      
        Constify attribute_group structures in:
         - leds-blinkm
         - leds-lm3533
      
        Make several arrays static const in:
         - leds-aat1290
         - leds-lp5521
         - leds-lp5562
         - leds-lp8501"
      
      * tag 'leds_for_4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
        leds: pca955x: check for I2C errors
        leds: gpio: Allow LED to retain state at shutdown
        dt-bindings: leds: gpio: Add optional retain-state-shutdown property
        leds: powernv: Delete an error message for a failed memory allocation in powernv_led_create()
        leds: lp8501: make several arrays static const
        leds: lp5562: make several arrays static const
        leds: lp5521: make several arrays static const
        leds: aat1290: make array max_mm_current_percent static const
        leds: pca955x: Prevent crippled LED device name
        leds: lm3533: constify attribute_group structure
        dt-bindings: leds: add pca955x
        leds: pca955x: add GPIO support
        leds: pca955x: use devm_led_classdev_register
        leds: pca955x: add device tree support
        leds: Convert to using %pOF instead of full_name
        leds: blinkm: constify attribute_group structures.
        leds: tlc591xx: add missing of_node_put
        leds: tlc591xx: merge conditional tests
      5f9cc570
    • L
      Merge tag 'dmaengine-4.14-rc1' of git://git.infradead.org/users/vkoul/slave-dma · cd7b34fe
      Linus Torvalds 提交于
      Pull dmaengine updates from Vinod Koul:
       "This one features the usual updates to the drivers and one good part
        of removing DA_SG from core as it has no users.
      
        Summary:
      
         - Remove DMA_SG support as we have no users for this feature
         - New driver for Altera / Intel mSGDMA IP core
         - Support for memset in dmatest and qcom_hidma driver
         - Update for non cyclic mode in k3dma, bunch of update in bam_dma,
           bcm sba-raid
         - Constify device ids across drivers"
      
      * tag 'dmaengine-4.14-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (52 commits)
        dmaengine: sun6i: support V3s SoC variant
        dmaengine: sun6i: make gate bit in sun8i's DMA engines a common quirk
        dmaengine: rcar-dmac: document R8A77970 bindings
        dmaengine: xilinx_dma: Fix error code format specifier
        dmaengine: altera: Use macros instead of structs to describe the registers
        dmaengine: ti-dma-crossbar: Fix dra7 reserve function
        dmaengine: pl330: constify amba_id
        dmaengine: pl08x: constify amba_id
        dmaengine: bcm-sba-raid: Remove redundant SBA_REQUEST_STATE_COMPLETED
        dmaengine: bcm-sba-raid: Explicitly ACK mailbox message after sending
        dmaengine: bcm-sba-raid: Add debugfs support
        dmaengine: bcm-sba-raid: Remove redundant SBA_REQUEST_STATE_RECEIVED
        dmaengine: bcm-sba-raid: Re-factor sba_process_deferred_requests()
        dmaengine: bcm-sba-raid: Pre-ack async tx descriptor
        dmaengine: bcm-sba-raid: Peek mbox when we have no free requests
        dmaengine: bcm-sba-raid: Alloc resources before registering DMA device
        dmaengine: bcm-sba-raid: Improve sba_issue_pending() run duration
        dmaengine: bcm-sba-raid: Increase number of free sba_request
        dmaengine: bcm-sba-raid: Allow arbitrary number free sba_request
        dmaengine: bcm-sba-raid: Remove reqs_free_count from sba_device
        ...
      cd7b34fe
    • L
      Merge tag 'backlight-next-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · 75c72715
      Linus Torvalds 提交于
      Pull backlight updates from Lee Jones:
       "Fix-ups:
         - Constification; pwm_bl
         - Use new GPIO API; gpio_backlight
         - Remove unused functionality; gpio_backlight
      
        Bug Fixes:
         - Fix artificial MAXREG limit; lm3630a_bl"
      
      * tag 'backlight-next-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        backlight: gpio_backlight: Delete pdata inversion
        backlight: gpio_backlight: Convert to use GPIO descriptor
        backlight: pwm_bl: Make of_device_ids const
        backlight: lm3630a: Bump REG_MAX value to 0x50 instead of 0x1F
      75c72715
    • L
      Merge tag 'mfd-next-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 968c61f7
      Linus Torvalds 提交于
      Pull MFD updates from Lee Jones:
       "New Drivers
         - RK805 Power Management IC (PMIC)
         - ROHM BD9571MWV-M MFD Power Management IC (PMIC)
         - Texas Instruments TPS68470 Power Management IC (PMIC) & LEDs
      
        New Device Support:
         - Add support for HiSilicon Hi6421v530 to hi6421-pmic-core
         - Add support for X-Powers AXP806 to axp20x
         - Add support for X-Powers AXP813 to axp20x
         - Add support for Intel Sunrise Point LPSS to intel-lpss-pci
      
        New Functionality:
         - Amend API to provide register layout; atmel-smc
      
        Fix-ups:
         - DT re-work; omap, nokia
         - Header file location change {I2C => MFD}; dm355evm_msp, tps65010
         - Fix chip ID formatting issue(s); rk808
         - Optionally register touchscreen devices; da9052-core
         - Documentation improvements; twl-core
         - Constification; rtsx_pcr, ab8500-core, da9055-i2c, da9052-spi
         - Drop unnecessary static declaration; max8925-i2c
         - Kconfig changes (missing deps and remove module support)
         - Slim down oversized licence statement; hi6421-pmic-core
         - Use managed resources (devm_*); lp87565
         - Supply proper error checking/handling; t7l66xb
      
        Bug Fixes:
         - Fix counter duplication issue; da9052-core
         - Fix potential NULL deference issue; max8998
         - Leave SPI-NOR write-protection bit alone; lpc_ich
         - Ensure device is put into reset during suspend; intel-lpss
         - Correct register offset variable size; omap-usb-tll"
      
      * tag 'mfd-next-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (61 commits)
        mfd: intel_soc_pmic: Differentiate between Bay and Cherry Trail CRC variants
        mfd: intel_soc_pmic: Export separate mfd-cell configs for BYT and CHT
        dt-bindings: mfd: Add bindings for ZII RAVE devices
        mfd: omap-usb-tll: Fix register offsets
        mfd: da9052: Constify spi_device_id
        mfd: intel-lpss: Put I2C and SPI controllers into reset state on suspend
        mfd: da9055: Constify i2c_device_id
        mfd: intel-lpss: Add missing PCI ID for Intel Sunrise Point LPSS devices
        mfd: t7l66xb: Handle return value of clk_prepare_enable
        mfd: Add ROHM BD9571MWV-M PMIC DT bindings
        mfd: intel_soc_pmic_chtwc: Turn Kconfig option into a bool
        mfd: lp87565: Convert to use devm_mfd_add_devices()
        mfd: Add support for TPS68470 device
        mfd: lpc_ich: Do not touch SPI-NOR write protection bit on Haswell/Broadwell
        mfd: syscon: atmel-smc: Add helper to retrieve register layout
        mfd: axp20x: Use correct platform device ID for many PEK
        dt-bindings: mfd: axp20x: Introduce bindings for AXP813
        mfd: axp20x: Add support for AXP813 PMIC
        dt-bindings: mfd: axp20x: Add AXP806 to supported list of chips
        mfd: Add ROHM BD9571MWV-M MFD PMIC driver
        ...
      968c61f7
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 9d71941d
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
      
       - a new GPIO bit-banging driver implementing PS/2 protocol
      
       - a new power key driver for Rockchip RK805 PMIC
      
       - bunch of patches constifying various device ID structures
      
       - Elan I2C touchpad driver now supports devices with 2 buttons
      
       - other assorted fixes
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (76 commits)
        Input: byd - make array seq static, reduces object code size
        Input: xilinx_ps2 - fix multiline comment style
        Input: pxa27x_keypad - handle return value of clk_prepare_enable
        Input: tegra-kbc - handle return value of clk_prepare_enable
        Input: PS/2 gpio bit banging driver for serio bus
        Input: xen-kbdfront - enable auto repeat for xen keyboard frontend driver
        Input: ambakmi - constify amba_id
        Input: atmel_mxt_ts - add support for reset line
        Input: atmel_mxt_ts - use more managed resources
        Input: wacom_w8001 - constify serio_device_id
        Input: tsc40 - constify serio_device_id
        Input: touchwin - constify serio_device_id
        Input: touchright - constify serio_device_id
        Input: touchit213 - constify serio_device_id
        Input: penmount - constify serio_device_id
        Input: mtouch - constify serio_device_id
        Input: inexio - constify serio_device_id
        Input: hampshire - constify serio_device_id
        Input: gunze - constify serio_device_id
        Input: fujitsu_ts - constify serio_device_id
        ...
      9d71941d
    • L
      Merge tag 'mailbox-v4.14' of git://git.linaro.org/landing-teams/working/fujitsu/integration · dfd9e6d2
      Linus Torvalds 提交于
      Pull mailbox updates from Jassi Brar:
       "Just behavorial changes to a controller driver: the Broadcom's Flexrm
        mailbox driver has been modifified to support debugfs and TX-Done
        mechanism by ACK.
      
        Nothing for the core mailbox stack"
      
      * tag 'mailbox-v4.14' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        mailbox: bcm-flexrm-mailbox: Use txdone_ack instead of txdone_poll
        mailbox: bcm-flexrm-mailbox: Use bitmap instead of IDA
        mailbox: bcm-flexrm-mailbox: Fix mask used in CMPL_START_ADDR_VALUE()
        mailbox: bcm-flexrm-mailbox: Add debugfs support
        mailbox: bcm-flexrm-mailbox: Set IRQ affinity hint for FlexRM ring IRQs
      dfd9e6d2
    • L
      Merge tag 'media/v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · c0da4fa0
      Linus Torvalds 提交于
      Pull media updates from Mauro Carvalho Chehab:
       "Brazil's Independence Day pull request :-)
      
        This is one of the biggest media pull requests, with 625 patches
        affecting almost all parts of media (RC, DVB, V4L2, CEC, docs).
      
        This contains:
      
         - A lot of new drivers:
           * DVB frontends: mxl5xx, stv0910, stv6111;
           * camera flash: as3645a led driver;
           * HDMI receiver: adv748X;
           * camera sensor: Omnivision 6650 5M driver (ov6650);
           * HDMI CEC: ao-cec meson driver;
           * V4L2: Qualcom camss driver;
           * Remote controller: gpio-ir-tx, pwm-ir-tx and zx-irdec drivers.
      
         - The DDbridge DVB driver got a massive update, with makes it in sync
           with modern hardware from that vendor;
      
         - There's an important milestone on this series: the DVB
           documentation was written in 2003, but only started to be updated
           in 2007. It also used to contain several gaps from the time it was
           kept out of tree, mentioning error codes and device nodes that
           never existed upstream. On this series, it received a massive
           update: all non-deprecated digital TV APIs are now in sync with the
           current implementation;
      
         - Some DVB APIs that aren't used by any upstream driver got removed;
      
         - Other parts of the media documentation algo got updated, fixing
           some bugs on its PDF output and making it compatible with Sphinx
           version 1.6.
      
           As the number of hacks required to build PDF output reduced, I hope
           we'll have less troubles as newer versions of our documentation
           toolchain are released (famous last words);
      
         - As usual, lots of driver cleanups and improvements"
      
      * tag 'media/v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (624 commits)
        media: leds: as3645a: add V4L2_FLASH_LED_CLASS dependency
        media: get rid of removed DMX_GET_CAPS and DMX_SET_SOURCE leftovers
        media: Revert "[media] v4l: async: make v4l2 coexist with devicetree nodes in a dt overlay"
        media: staging: atomisp: sh_css_calloc shall return a pointer to the allocated space
        media: Revert "[media] lirc_dev: remove superfluous get/put_device() calls"
        media: add qcom_camss.rst to v4l-drivers rst file
        media: dvb headers: make checkpatch happier
        media: dvb uapi: move frontend legacy API to another part of the book
        media: pixfmt-srggb12p.rst: better format the table for PDF output
        media: docs-rst: media: Don't use \small for V4L2_PIX_FMT_SRGGB10 documentation
        media: index.rst: don't write "Contents:" on PDF output
        media: pixfmt*.rst: replace a two dots by a comma
        media: vidioc-g-fmt.rst: adjust table format
        media: vivid.rst: add a blank line to correct ReST format
        media: v4l2 uapi book: get rid of driver programming's chapter
        media: format.rst: use the right markup for important notes
        media: docs-rst: cardlists: change their format to flat-tables
        media: em28xx-cardlist.rst: update to reflect last changes
        media: v4l2-event.rst: adjust table to fit on PDF output
        media: docs: don't show ToC for each part on PDF output
        ...
      c0da4fa0
    • L
      Merge tag 'sound-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · d9694430
      Linus Torvalds 提交于
      Pull sound updates from Takashi Iwai:
       "We have touched quite a lot of files but with fewer changes at this
        cycle; as you can see, most of changes are trivial fixes, especially
        constification patches.
      
        Among the massive attacks by constification gangs, we had a few core
        changes (mostly for ASoC core), as well the fixes and the updates by
        major vendors.
      
        Some highlights:
      
        ALSA core:
      
         - Fix possible races in control API user-TLV codes
      
         - Small cleanup of PCM core
      
        ASoC:
      
         - Continued work for componentization; still half-baked, but we're
           certainly progressing
      
         - Use of devres for jack detection GPIOs, rather as a cleanup
      
         - Jack detection support for Qualcomm MSM8916
      
         - Support for Allwinner H3, Cirrus Logic CS43130, Intel Kabylake
           systems with RT5663, Realtek RT274, TI TLV320AIC32x6 and Wolfson
           WM8523"
      
      * tag 'sound-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (512 commits)
        ALSA: hda/ca0132 - Fix memory leak at error path
        ALSA: hda: Fix forget to free resource in error handling code path in hda_codec_driver_probe
        ASoC: cs43130: Fix unused compiler warnings for PM runtime
        ASoC: cs43130: Fix possible Oops with invalid dev_id
        ASoC: cs43130: fix spelling mistake: "irq_occurrance" -> "irq_occurrence"
        ALSA: atmel: Remove leftovers of AVR32 removal
        ALSA: atmel: convert AC97c driver to GPIO descriptor API
        ALSA: hda/realtek - Enable jack detection function for Intel ALC700
        ALSA: hda: Fix regression of hdmi eld control created based on invalid pcm
        ASoC: Intel: Skylake: Add IPC to configure the copier secondary pins
        ASoC: add missing compile rule for max98371
        ASoC: add missing compile rule for sirf-audio-codec
        ASoC: add missing compile rule for max98371
        ASoC: cs43130: Add devicetree bindings for CS43130
        ASoC: cs43130: Add support for CS43130 codec
        ASoC: make clock direction configurable in asoc-simple
        ALSA: ctxfi: Remove null check before kfree
        ASoC: max98927: Changed device property read function
        ASoC: max98927: Modified DAPM widget and map to enable/disable VI sense path
        ASoC: max98927: Added PM suspend and resume function
        ...
      d9694430
    • L
      Merge tag 'md/4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md · 3645e6d0
      Linus Torvalds 提交于
      Pull MD updates from Shaohua Li:
       "This update mainly fixes bugs:
      
         - Make raid5 ppl support several ppl from Pawel
      
         - Several raid5-cache bug fixes from Song
      
         - Bitmap fixes from Neil and Me
      
         - One raid1/10 regression fix since 4.12 from Me
      
         - Other small fixes and cleanup"
      
      * tag 'md/4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
        md/bitmap: disable bitmap_resize for file-backed bitmaps.
        raid5-ppl: Recovery support for multiple partial parity logs
        md: Runtime support for multiple ppls
        md/raid0: attach correct cgroup info in bio
        lib/raid6: align AVX512 constants to 512 bits, not bytes
        raid5: remove raid5_build_block
        md/r5cache: call mddev_lock/unlock() in r5c_journal_mode_show
        md: replace seq_release_private with seq_release
        md: notify about new spare disk in the container
        md/raid1/10: reset bio allocated from mempool
        md/raid5: release/flush io in raid5_do_work()
        md/bitmap: copy correct data for bitmap super
      3645e6d0
    • L
      Merge tag 'mmc-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc · 15d8ffc9
      Linus Torvalds 提交于
      Pull MMC updates from Ulf Hansson:
       "MMC core:
         - Continue to refactor the mmc block code to prepare for blkmq
         - Move mmc block debugfs into block module
         - Next step for eMMC CMDQ by adding a new mmc host interface for it
         - Move Kconfig option MMC_DEBUG from core to host
         - Some additional minor improvements
      
        MMC host:
         - Declare structs as const when applicable
         - Explicitly request exclusive reset control when applicable
         - Improve some error paths and other various cleanups
         - sdhci: Preparations to support SDHCI OMAP
         - sdhci: Improve some PM related code
         - sdhci: Re-factoring and modernizations
         - sdhci-xenon: Add runtime PM and system sleep support
         - sdhci-xenon: Add support for eMMC HS400 Enhanced Strobe
         - sdhci-cadence: Add system sleep support
         - sdhci-of-at91: Improve system sleep support
         - dw_mmc: Add support for Hisilicon hi3660
         - sunxi: Add support for A83T eMMC
         - sunxi: Add support for DDR52 mode
         - meson-gx: Add support for UHS-I SD-cards
         - meson-gx: Cleanups and improvements
         - tmio: Fix CMD12 (STOP) handling
         - tmio: Cleanups and improvements
         - renesas_sdhi: Add r8a7743/5 support
         - renesas-sdhi: Add support for R-Car Gen3 SDHI DMAC
         - renesas_sdhi: Cleanups and improvements"
      
      * tag 'mmc-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (145 commits)
        mmc: renesas_sdhi: Add r8a7743/5 support
        mmc: meson-gx: fix __ffsdi2 undefined on arm32
        mmc: sdhci-xenon: add runtime pm support and reimplement standby
        mmc: core: Move mmc_start_areq() declaration
        mmc: mmci: stop building qcom dml as module
        mmc: sunxi: Reset the device at probe time
        clk: sunxi-ng: Provide a default reset hook
        mmc: meson-gx: rework tuning function
        mmc: meson-gx: change default tx phase
        mmc: meson-gx: implement voltage switch callback
        mmc: meson-gx: use CCF to handle the clock phases
        mmc: meson-gx: implement card_busy callback
        mmc: meson-gx: simplify interrupt handler
        mmc: meson-gx: work around clk-stop issue
        mmc: meson-gx: fix dual data rate mode frequencies
        mmc: meson-gx: rework clock init function
        mmc: meson-gx: rework clk_set function
        mmc: meson-gx: rework set_ios function
        mmc: meson-gx: cfg init overwrite values
        mmc: meson-gx: initialize sane clk default before clock register
        ...
      15d8ffc9
    • J
      Merge branch 'fixes' into misc · 2441500a
      James Bottomley 提交于
      2441500a