Skip to content
  1. Jun 19, 2016
  2. Jun 18, 2016
  3. Jun 17, 2016
    • Joerg Roedel's avatar
      iommu/vt-d: Enable QI on all IOMMUs before setting root entry · a4c34ff1
      Joerg Roedel authored
      
      
      This seems to be required on some X58 chipsets on systems
      with more than one IOMMU. QI does not work until it is
      enabled on all IOMMUs in the system.
      
      Reported-by: default avatarDheeraj CVR <cvr.dheeraj@gmail.com>
      Tested-by: default avatarDheeraj CVR <cvr.dheeraj@gmail.com>
      Fixes: 5f0a7f76
      
       ('iommu/vt-d: Make root entry visible for hardware right after allocation')
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
      a4c34ff1
    • Linus Torvalds's avatar
      Merge tag 'pwm/for-4.7-rc4' of... · bb967271
      Linus Torvalds authored
      Merge tag 'pwm/for-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm fixes from Thierry Reding:
       "These changes fix a bit of fallout from the introduction of the atomic
        API"
      
      * tag 'pwm/for-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
        pwm: atmel-hlcdc: Fix default PWM polarity
        pwm: sysfs: Get return value from pwm_apply_state()
        pwm: Improve args checking in pwm_apply_state()
      bb967271
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 2668bc77
      Linus Torvalds authored
      Pull KVM fixes from Paolo Bonzini:
      
       - miscellaneous fixes for MIPS and s390
      
       - one new kvm_stat for s390
      
       - correctly disable VT-d posted interrupts with the rest of posted
         interrupts
      
       - "make randconfig" fix for x86 AMD
      
       - off-by-one in irq route check (the "good" kind that errors out a bit
         too early!)
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        kvm: vmx: check apicv is active before using VT-d posted interrupt
        kvm: Fix irq route entries exceeding KVM_MAX_IRQ_ROUTES
        kvm: svm: Do not support AVIC if not CONFIG_X86_LOCAL_APIC
        kvm: svm: Fix implicit declaration for __default_cpu_present_to_apicid()
        MIPS: KVM: Fix CACHE triggered exception emulation
        MIPS: KVM: Don't unwind PC when emulating CACHE
        MIPS: KVM: Include bit 31 in segment matches
        MIPS: KVM: Fix modular KVM under QEMU
        KVM: s390: Add stats for PEI events
        KVM: s390: ignore IBC if zero
      2668bc77
    • Linus Torvalds's avatar
      Merge tag 'nfsd-4.7-1' of git://linux-nfs.org/~bfields/linux · 41ef7218
      Linus Torvalds authored
      Pull nfsd bugfixes from Bruce Fields:
       "Oleg Drokin found and fixed races in the nfsd4 state code that go back
        to the big nfs4_lock_state removal around 3.17 (but that were also
        probably hard to reproduce before client changes in 3.20 allowed the
        client to perform parallel opens).
      
        Also fix a 4.1 backchannel crash due to rpc multipath changes in 4.6.
        Trond acked the client-side rpc fixes going through my tree"
      
      * tag 'nfsd-4.7-1' of git://linux-nfs.org/~bfields/linux:
        nfsd: Make init_open_stateid() a bit more whole
        nfsd: Extend the mutex holding region around in nfsd4_process_open2()
        nfsd: Always lock state exclusively.
        rpc: share one xps between all backchannels
        nfsd4/rpc: move backchannel create logic into rpc code
        SUNRPC: fix xprt leak on xps allocation failure
        nfsd: Fix NFSD_MDS_PR_KEY on 32-bit by adding ULL postfix
      41ef7218
    • Linus Torvalds's avatar
      Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs · 9c514bed
      Linus Torvalds authored
      Pull overlayfs fixes from Miklos Szeredi:
       "This contains two regression fixes: one for the xattr API update and
        one for using the mounter's creds in file creation in overlayfs.
      
        There's also a fix for a bug in handling hard linked AF_UNIX sockets
        that's been there from day one.  This fix is overlayfs only despite
        the fact that it touches code outside the overlay filesystem: d_real()
        is an identity function for all except overlay dentries"
      
      * 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
        ovl: fix uid/gid when creating over whiteout
        ovl: xattr filter fix
        af_unix: fix hard linked sockets on overlay
        vfs: add d_real_inode() helper
      9c514bed
    • Dan Carpenter's avatar
      KEYS: potential uninitialized variable · 38327424
      Dan Carpenter authored
      If __key_link_begin() failed then "edit" would be uninitialized.  I've
      added a check to fix that.
      
      This allows a random user to crash the kernel, though it's quite
      difficult to achieve.  There are three ways it can be done as the user
      would have to cause an error to occur in __key_link():
      
       (1) Cause the kernel to run out of memory.  In practice, this is difficult
           to achieve without ENOMEM cropping up elsewhere and aborting the
           attempt.
      
       (2) Revoke the destination keyring between the keyring ID being looked up
           and it being tested for revocation.  In practice, this is difficult to
           time correctly because the KEYCTL_REJECT function can only be used
           from the request-key upcall process.  Further, users can only make use
           of what's in /sbin/request-key.conf, though this does including a
           rejection debugging test - which means that the destination keyring
           has to be the caller's session keyring in practice.
      
       (3) Have just enough key qu...
      38327424
    • Daniel Thompson's avatar
      arm64: kgdb: Match pstate size with gdbserver protocol · 0d15ef67
      Daniel Thompson authored
      Current versions of gdb do not interoperate cleanly with kgdb on arm64
      systems because gdb and kgdb do not use the same register description.
      This patch modifies kgdb to work with recent releases of gdb (>= 7.8.1).
      
      Compatibility with gdb (after the patch is applied) is as follows:
      
        gdb-7.6 and earlier  Ok
        gdb-7.7 series       Works if user provides custom target description
        gdb-7.8(.0)          Works if user provides custom target description
        gdb-7.8.1 and later  Ok
      
      When commit 44679a4f ("arm64: KGDB: Add step debugging support") was
      introduced it was paired with a gdb patch that made an incompatible
      change to the gdbserver protocol. This patch was eventually merged into
      the gdb sources:
      https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=a4d9ba85ec5597a6a556afe26b712e878374b9dd
      
      The change to the protocol was mostly made to simplify big-endian support
      inside the kernel gdb stub. Unfortunately the gdb project released
      gdb-7.7.x and gdb-7.8.0 before the protocol incompatibility was identified
      and reversed:
      https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=bdc144174bcb11e808b4e73089b850cf9620a7ee
      
      
      
      This leaves us in a position where kgdb still uses the no-longer-used
      protocol; gdb-7.8.1, which restored the original behaviour, was
      released on 2014-10-29.
      
      I don't believe it is possible to detect/correct the protocol
      incompatiblity which means the kernel must take a view about which
      version of the gdb remote protocol is "correct". This patch takes the
      view that the original/current version of the protocol is correct
      and that version found in gdb-7.7.x and gdb-7.8.0 is anomalous.
      
      Signed-off-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      0d15ef67
  4. Jun 16, 2016
    • Viresh Kumar's avatar
      PM / OPP: Add 'UNKNOWN' status for shared_opp in struct opp_table · 79ee2e8f
      Viresh Kumar authored
      dev_pm_opp_get_sharing_cpus() returns 0 even in the case when the OPP
      core doesn't know whether or not the table is shared. It works on the
      majority of platforms, where the OPP table is never created before
      invoking the function and then -ENODEV is returned by it.
      
      But in the case of one platform (Jetson TK1) at least, the situation
      is a bit different. The OPP table has been created (somehow) before
      dev_pm_opp_get_sharing_cpus() is called and it returns 0. Its caller
      treats that as 'the CPUs don't share OPPs' and that leads to degraded
      performance.
      
      Fix this by converting 'shared_opp' in struct opp_table to an enum
      and making dev_pm_opp_get_sharing_cpus() return -EINVAL in case when
      the value of that field is "access unknown", so that the caller can
      handle it accordingly (cpufreq-dt considers that as 'all CPUs share
      the table', for example).
      
      Fixes: 6f707daa
      
       "PM / OPP: Add dev_pm_opp_get_sharing_cpus()"
      Reported-and-tested-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
      Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
      [ rjw : Subject & changelog ]
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      79ee2e8f
    • Yang Zhang's avatar
      kvm: vmx: check apicv is active before using VT-d posted interrupt · a0052191
      Yang Zhang authored
      VT-d posted interrupt is relying on the CPU side's posted interrupt.
      Need to check whether VCPU's APICv is active before enabing VT-d
      posted interrupt.
      
      Fixes: d62caabb
      
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarYang Zhang <yang.zhang.wz@gmail.com>
      Signed-off-by: default avatarShengge Ding <shengge.dsg@alibaba-inc.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      a0052191
    • Xiubo Li's avatar
      kvm: Fix irq route entries exceeding KVM_MAX_IRQ_ROUTES · caf1ff26
      Xiubo Li authored
      These days, we experienced one guest crash with 8 cores and 3 disks,
      with qemu error logs as bellow:
      
      qemu-system-x86_64: /build/qemu-2.0.0/kvm-all.c:984:
      kvm_irqchip_commit_routes: Assertion `ret == 0' failed.
      
      And then we found one patch(bdf026317d) in qemu tree, which said
      could fix this bug.
      
      Execute the following script will reproduce the BUG quickly:
      
      irq_affinity.sh
      ========================================================================
      
      vda_irq_num=25
      vdb_irq_num=27
      while [ 1 ]
      do
          for irq in {1,2,4,8,10,20,40,80}
              do
                  echo $irq > /proc/irq/$vda_irq_num/smp_affinity
                  echo $irq > /proc/irq/$vdb_irq_num/smp_affinity
                  dd if=/dev/vda of=/dev/zero bs=4K count=100 iflag=direct
                  dd if=/dev/vdb of=/dev/zero bs=4K count=100 iflag=direct
              done
      done
      ========================================================================
      
      The following qemu log is added in the qemu code and is displayed when
      ...
      caf1ff26
    • Suzuki K Poulose's avatar
      coresight: Handle build path error · 5014e904
      Suzuki K Poulose authored
      
      
      Enabling a component via sysfs (echo 1 > enable_source), would
      trigger building a path from the enabled sources to the sink.
      If there is an error in the process (e.g, sink not enabled or
      the device (CPU corresponding to ETM) is not online), we never report
      failure, except for leaving a message in the dmesg.
      
      Do proper error checking for the build path and return the error.
      
      Before:
       $ echo 0 > /sys/devices/system/cpu/cpu2/online
       $ echo 1 > /sys/devices/cs_etm/cpu2/enable_source
       $ echo $?
       0
      
      After:
       $ echo 0 > /sys/devices/system/cpu/cpu2/online
       $ echo 1 > /sys/devices/cs_etm/cpu2/enable_source
       -bash: echo: write error: No such device or address
      
      Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
      Acked-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      5014e904
    • Suzuki K Poulose's avatar
      coresight: Fix erroneous memset in tmc_read_unprepare_etr · f3b8172f
      Suzuki K Poulose authored
      At the end of a trace collection, we try to clear the entire buffer
      and enable the ETR back if it was already enabled. But, we would have
      adjusted the drvdata->buf to point to the beginning of the trace data
      in the trace buffer @drvdata->vaddr. So, the following code which
      clears the buffer is dangerous and can cause crashes, like below :
      
      	memset(drvdata->buf, 0, drvdata->size);
      
       Unable to handle kernel paging request at virtual address ffffff800a145000
       pgd = ffffffc974726000
       *pgd=00000009f3e91003, *pud=00000009f3e91003, *pmd=0000000000000000
       PREEMPT SMP
       Modules linked in:
       CPU: 4 PID: 1692 Comm: dd Not tainted 4.7.0-rc2+ #1721
       Hardware name: ARM Juno development board (r0) (DT)
       task: ffffffc9734a0080 ti: ffffffc974460000 task.ti: ffffffc974460000
       PC is at __memset+0x1ac/0x200
       LR is at tmc_read_unprepare_etr+0x144/0x1bc
       pc : [<ffffff80083a05ac>] lr : [<ffffff800859c984>] pstate: 200001c5
       ...
       [<ffffff80083a05ac>] __memset+0x1ac/0x200
       [<ffffff800859b2e4>] tmc_release+0x90/0x94
       [<ffffff8008202f58>] __fput+0xa8/0x1ec
       [<ffffff80082030f4>] ____fput+0xc/0x14
       [<ffffff80080c3ef8>] task_work_run+0xb0/0xe4
       [<ffffff8008088bf4>] do_notify_resume+0x64/0x6c
       [<ffffff8008084d5c>] work_pending+0x10/0x14
       Code: 91010108 54ffff4a 8b040108 cb050042 (d50b7428)
      
      Since we clear the buffer anyway in the following call to
      tmc_etr_enable_hw(), remove the erroneous memset().
      
      Fixes: commit de546197
      
       ("coresight: tmc: allocating memory when needed")
      Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
      Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
      Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      f3b8172f
    • Suzuki K Poulose's avatar
      coresight: Fix tmc_read_unprepare_etr · 8e215298
      Suzuki K Poulose authored
      
      
      At the end of the trace capture, we free the allocated memory,
      resetting the drvdata->buf to NULL, to indicate that trace data
      was collected and the next trace session should allocate the
      memory in tmc_enable_etr_sink_sysfs.
      
      The tmc_enable_etr_sink_sysfs, we only allocate memory if drvdata->vaddr
      is not NULL (which is not performed at the end of previous session).
      This can cause, drvdata->vaddr getting assigned NULL and later we do
      memset() which causes a crash as below :
      
      Unable to handle kernel NULL pointer dereference at virtual
       address  00000000
      pgd = ffffffc9747f0000
      [00000000] *pgd=00000009f402e003, *pud=00000009f402e003,
       *pmd=0000000000000000
      Internal error: Oops: 96000046 [#1] PREEMPT SMP
      Modules linked in:
      CPU: 0 PID: 1592 Comm: bash Not tainted 4.7.0-rc1+ #1712
      Hardware name: ARM Juno development board (r0) (DT)
      task: ffffffc078fe0080 ti: ffffffc974178000 task.ti: ffffffc974178000
      PC is at __memset+0x1ac/0x200
      LR is at tmc_enable_etr_sink+0xf8/0x304
      pc : [<ffffff80083a002c>] lr : [<ffffff800859be44>] pstate: 400001c5
      sp : ffffffc97417bc00
      x29: ffffffc97417bc00 x28: ffffffc974178000
      
      Call trace:
      Exception stack(0xffffffc97417ba40 to 0xffffffc97417bb60)
      ba40: 0000000000000001 ffffffc974a5d098 ffffffc97417bc00 ffffff80083a002c
      ba60: ffffffc974a5d118 0000000000000000 0000000000000000 0000000000000000
      ba80: 0000000000000001 0000000000000000 ffffff800859bdec 0000000000000040
      baa0: ffffff8008b45b58 00000000000001c0 ffffffc97417baf0 ffffff80080eddb4
      bac0: 0000000000000003 ffffffc078fe0080 ffffffc078fe0960 ffffffc078fe0940
      bae0: 0000000000000000 0000000000000000 00000000007fffc0 0000000000000004
      bb00: 0000000000000000 0000000000000040 000000000000003f 0000000000000000
      bb20: 0000000000000000 0000000000000000 0000000000000000 0000000000000001
      bb40: ffffffc078fe0960 0000000000000018 ffffffffffffffff 0008669628000000
      [<ffffff80083a002c>] __memset+0x1ac/0x200
      [<ffffff8008599814>] coresight_enable_path+0xa8/0x1dc
      [<ffffff8008599b10>] coresight_enable+0x88/0x1b8
      [<ffffff8008599d88>] enable_source_store+0x3c/0x6c
      [<ffffff800845eaf4>] dev_attr_store+0x18/0x28
      [<ffffff80082829e8>] sysfs_kf_write+0x54/0x64
      [<ffffff8008281c30>] kernfs_fop_write+0x148/0x1d8
      [<ffffff8008200128>] __vfs_write+0x28/0x110
      [<ffffff8008200e88>] vfs_write+0xa0/0x198
      [<ffffff80082021b0>] SyS_write+0x44/0xa0
      [<ffffff8008084e70>] el0_svc_naked+0x24/0x28
      Code: 91010108 54ffff4a 8b040108 cb050042 (d50b7428)
      
      This patch fixes the issue by clearing the drvdata->vaddr while we free
      the allocated buffer at the end of a session, so that we allocate the
      memory again.
      
      Cc: mathieu.poirier@linaro.org
      Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
      Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      8e215298
    • Suzuki K Poulose's avatar
      coresight: Fix NULL pointer dereference in _coresight_build_path · ec48a1d9
      Suzuki K Poulose authored
      
      
      _coresight_build_path assumes that all the connections of a csdev
      has the child_dev initialised. This may not be true if the particular
      component is not supported by the kernel config(e.g TPIU) but is
      present in the DT. In which case, building a path can cause a crash like this :
      
        Unable to handle kernel NULL pointer dereference at virtual address 00000010
        pgd = ffffffc9750dd000
        [00000010] *pgd=00000009f5e90003, *pud=00000009f5e90003, *pmd=0000000000000000
        Internal error: Oops: 96000006 [#1] PREEMPT SMP
        Modules linked in:
        CPU: 4 PID: 1348 Comm: bash Not tainted 4.6.0-next-20160517 #1646
        Hardware name: ARM Juno development board (r0) (DT)
        task: ffffffc97517a280 ti: ffffffc9762c4000 task.ti: ffffffc9762c4000
        PC is at _coresight_build_path+0x18/0xe4
        LR is at _coresight_build_path+0xc0/0xe4
        pc : [<ffffff80083d5130>] lr : [<ffffff80083d51d8>] pstate: 20000145
        sp : ffffffc9762c7ba0
      
        [<ffffff80083d5130>] _coresight_build_path+0x18/0xe4
        [<ffffff80083d51d8>] _coresight_build_path+0xc0/0xe4
        [<ffffff80083d51d8>] _coresight_build_path+0xc0/0xe4
        [<ffffff80083d51d8>] _coresight_build_path+0xc0/0xe4
        [<ffffff80083d51d8>] _coresight_build_path+0xc0/0xe4
        [<ffffff80083d51d8>] _coresight_build_path+0xc0/0xe4
        [<ffffff80083d5cdc>] coresight_build_path+0x40/0x68
        [<ffffff80083d5e14>] coresight_enable+0x74/0x1bc
        [<ffffff80083d60a0>] enable_source_store+0x3c/0x6c
        [<ffffff800830b17c>] dev_attr_store+0x18/0x28
        [<ffffff80081ca9c4>] sysfs_kf_write+0x40/0x50
        [<ffffff80081c9e38>] kernfs_fop_write+0x140/0x1cc
        [<ffffff8008163ec8>] __vfs_write+0x28/0x110
        [<ffffff8008164bf0>] vfs_write+0xa0/0x174
        [<ffffff8008165d18>] SyS_write+0x44/0xa0
        [<ffffff8008084e70>] el0_svc_naked+0x24/0x28
      
      Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
      Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
      Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      ec48a1d9
    • Greg Kroah-Hartman's avatar
      Merge tag 'extcon-fixes-for-4.7-rc4' of... · d74ef248
      Greg Kroah-Hartman authored
      Merge tag 'extcon-fixes-for-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus
      
      Chanwoo writes:
      
      Update extcon for v4.7-rc4
      
      This patch fixes the following issue:
      - In the extcon-palmas.c, fix the state of VBUS when using GPIO detection.
      If probe funticon don't check the state during probe, the extcon client
      driver cannot get the state of VBUS gpio until the user detach the connector
      and attach the connector again.
      d74ef248
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.7-rc4' of git://people.freedesktop.org/~airlied/linux · d325ea85
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "The main drm fixes pull for rc4: one regression fix in the connector
        refcounting, and an MST fix.
      
        There rest is nouveau, amdkfd, i915, etnaviv, and radeon/amdgpu fixes,
        mostly regression or black screen fixes"
      
      * tag 'drm-fixes-for-v4.7-rc4' of git://people.freedesktop.org/~airlied/linux: (23 commits)
        drm/etnaviv: initialize iommu domain page size
        drm/nouveau/iccsense: fix memory leak
        drm/nouveau/Revert "drm/nouveau/device/pci: set as non-CPU-coherent on ARM64"
        drm/amd/powerplay: select samu dpm 0 as boot level on polaris.
        drm/amd/powerplay: update powerplay table parsing
        drm/dp/mst: Always clear proposed vcpi table for port.
        drm/crtc: only store the necessary data for set_config rollback
        drm/crtc: fix connector reference counting mismatch in drm_crtc_helper_set_config
        drm/i915/ilk: Don't disable SSC source if it's in use
        Revert "drm/amdgpu: add pipeline sync while vmid switch in same ctx"
        drm/amdgpu/gfx7: fix broken condition check
        drm/radeon: fix asic initialization for virtualized environments
        amdgpu: fix asic initialization for virtualized environments (v2)
        drm/radeon: don't use fractional dividers on RS[78]80 if SS is enabled
        drm/radeon: do not hard reset GPU while freezing on r600/r700 family
        drm/i915: Extract physical display dimensions from VBT
        drm/i915: Check VBT for port presence in addition to the strap on VLV/CHV
        drm/i915: Only ignore eDP ports that are connected
        drm/i915: Silence "unexpected child device config size" for VBT on 845g
        drm/i915: Fix NULL pointer deference when out of PLLs in IVB
        ...
      d325ea85
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.7-2' of... · e05d2ba1
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v4.7-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform driver fixes from Darren Hart:
       "Minor kconfig dependency cleanup, trivial mic mute hotkey for ideapad,
        and a needed improvement in adaptive keyboard detection for thinkpad:
      
        platform/x86:
         - Drop duplicate dependencies on X86
      
        thinkpad_acpi:
         - Add support for HKEY version 0x200
      
        ideapad_laptop:
         - Add an event for mic mute hotkey"
      
      * tag 'platform-drivers-x86-v4.7-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        platform/x86: Drop duplicate dependencies on X86
        thinkpad_acpi: Add support for HKEY version 0x200
        ideapad_laptop: Add an event for mic mute hotkey
      e05d2ba1
    • Linus Torvalds's avatar
      Merge tag 'upstream-4.7-rc4' of git://git.infradead.org/linux-ubifs · abd38301
      Linus Torvalds authored
      Pull UBI fixes from Richard Weinberger:
       "This contains fixes for a regression introduced in rc1"
      
      * tag 'upstream-4.7-rc4' of git://git.infradead.org/linux-ubifs:
        ubi: Don't bypass ->getattr()
        Revert "mtd: switch open_mtd_by_chdev() to use of vfs_stat()"
        Revert "mtd: switch ubi_open_volume_path() to vfs_stat()"
      abd38301
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.7-2' of git://git.code.sf.net/p/openipmi/linux-ipmi · f66c6e6a
      Linus Torvalds authored
      Pull ipmi bugfix from Corey Minyard:
       "Fix a fairly significant ipmi list bug
      
        This bug could cause lists to be corrupted"
      
      * tag 'for-linus-4.7-2' of git://git.code.sf.net/p/openipmi/linux-ipmi:
        ipmi: Remove smi_msg from waiting_rcv_msgs list before handle_one_recv_msg()
      f66c6e6a
    • Oleg Drokin's avatar
      nfsd: Make init_open_stateid() a bit more whole · 8c7245ab
      Oleg Drokin authored
      
      
      Move the state selection logic inside from the caller,
      always making it return correct stp to use.
      
      Signed-off-by: default avatarJ . Bruce Fields <bfields@fieldses.org>
      Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      8c7245ab
    • Oleg Drokin's avatar
      nfsd: Extend the mutex holding region around in nfsd4_process_open2() · 5cc1fb2a
      Oleg Drokin authored
      
      
      To avoid racing entry into nfs4_get_vfs_file().
      Make init_open_stateid() return with locked stateid to be unlocked
      by the caller.
      
      Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      5cc1fb2a