1. 22 Sep, 2017 4 commits
    • Linus Torvalds's avatar
      Merge branch '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 7e6d8f83
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
      
       - Fix a build error on MSP71xx which used to rely on somehow magically
         <asm/setup.h> being pulled in which no longer happens.
      
       - Fix the __write_64bit_c0_split inline assembler where there was the
         theoretical possibility of GCC interpret the constraints such that
         bad code could result.
      
       - A __init was causing section mismatch errors on Alchemy. Just to be
         on the safe side, Manuel's patch does away with all of them.
      
       - Fix perf event init.
      
      * '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: PCI: fix pcibios_map_irq section mismatch
        MIPS: Fix input modify in __write_64bit_c0_split()
        MIPS: MSP71xx: Include asm/setup.h
        MIPS: Fix perf event init
      7e6d8f83
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · c8107ed9
      Linus Torvalds authored
      Pull s390 fixes from Martin Schwidefsky:
      
       - A couple of bug fixes: memory management, perf, cio, dasd and
         scm_blk.
      
       - A larger change in regard to the CPU topology to improve performance
         for systems running under z/VM or KVM.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/topology: enable / disable topology dynamically
        s390/topology: alternative topology for topology-less machines
        s390/mm: fix write access check in gup_huge_pmd()
        s390/mm: make pmdp_invalidate() do invalidation only
        s390/cio: recover from bad paths
        s390/scm_blk: consistently use blk_status_t as error type
        s390/dasd: fix race during dasd initialization
        s390/perf: fix bug when creating per-thread event
      c8107ed9
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 7a6d0071
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
       - Fix compiler warnings in inside-secure
       - Fix LS1021A support in caam
       - Avoid using RBP in x86 crypto code
       - Fix bug in talitos that prevents hashing with algif
       - Fix bugs talitos hashing code that cause incorrect hash result
       - Fix memory freeing path bug in drbg
       - Fix af_alg crash when two SG lists are chained
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: af_alg - update correct dst SGL entry
        crypto: caam - fix LS1021A support on ARMv7 multiplatform kernel
        crypto: inside-secure - fix gcc-4.9 warnings
        crypto: talitos - Don't provide setkey for non hmac hashing algs
        crypto: talitos - fix hashing
        crypto: talitos - fix sha224
        crypto: x86/twofish - Fix RBP usage
        crypto: sha512-avx2 - Fix RBP usage
        crypto: x86/sha256-ssse3 - Fix RBP usage
        crypto: x86/sha256-avx2 - Fix RBP usage
        crypto: x86/sha256-avx - Fix RBP usage
        crypto: x86/sha1-ssse3 - Fix RBP usage
        crypto: x86/sha1-avx2 - Fix RBP usage
        crypto: x86/des3_ede - Fix RBP usage
        crypto: x86/cast6 - Fix RBP usage
        crypto: x86/cast5 - Fix RBP usage
        crypto: x86/camellia - Fix RBP usage
        crypto: x86/blowfish - Fix RBP usage
        crypto: drbg - fix freeing of resources
      7a6d0071
    • Linus Torvalds's avatar
      Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 6e80ecdd
      Linus Torvalds authored
      Pull libnvdimm fixes from Dan Williams:
       "A crash fix and corresponding regression test enabling for the crash
        scenario. The unit test for this crash is available in ndctl-v58.2.
      
        This branch has received a build success notification from the
        0day-kbuild robot over 148 configs. The fix is tagged for -stable /
        backport to 4.13"
      
      * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
        libnvdimm, namespace: fix btt claim class crash
        tools/testing/nvdimm: disable labels for nfit_test.1
      6e80ecdd
  2. 21 Sep, 2017 10 commits
    • Linus Torvalds's avatar
      Merge tag 'kbuild-fixes-v4.14' of... · 4a704d6d
      Linus Torvalds authored
      Merge tag 'kbuild-fixes-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
      
      Pull Kbuild fixes from Masahiro Yamada:
       "Here are some early Kbuild fixes.
      
        The in-kernel firmware was removed during the previous merge window.
        Since then, some bug reports of broken rpm building are flying in ML.
        We need to fix it now.
      
        Summary:
      
         - remove firmware install from rpm-pkg / deb-pkg
      
         - fix mismatch between release number and UTS_VERSION for rpm-pkg"
      
      * tag 'kbuild-fixes-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        kbuild: rpm-pkg: fix version number handling
        kbuild: deb-pkg: remove firmware package support
        kbuild: rpm-pkg: delete firmware_install to fix build error
      4a704d6d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 449cd5d2
      Linus Torvalds authored
      Pull misc fixes from Al Viro:
       "A couple of regression fixes, one for this merge window, one for the
        previous cycle"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        ipc/shm: Fix order of parameters when calling copy_compat_shmid_to_user
        iov_iter: fix page_copy_sane for compound pages
      449cd5d2
    • Linus Torvalds's avatar
      Merge tag 'mtd/fixes-for-4.14-rc2' of git://git.infradead.org/linux-mtd · d9fde269
      Linus Torvalds authored
      Pull mtd fixes from Boris Brezillon:
       "SPI NOR:
         - Fix the SFDP parsing code (bugs reported by Geert Uytterhoeven)
      
        NAND:
         - Fix a resource leak in the lpc32xx_mlc driver
         - Fix a build warning in the core"
      
      * tag 'mtd/fixes-for-4.14-rc2' of git://git.infradead.org/linux-mtd:
        mtd: nand: remove unused blockmask variable
        mtd: nand: lpc32xx_mlc: Fix an error handling path in lpc32xx_nand_probe()
        mtd: spi-nor: fix DMA unsafe buffer issue in spi_nor_read_sfdp()
        mtd: spi-nor: Check consistency of the memory size extracted from the SFDP
      d9fde269
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.14-rc2' of git://people.freedesktop.org/~airlied/linux · b6e78a6f
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "amdkfd, i915 and exynos fixes.
      
        I've ended up on unplanned + planned leave this week, but there were
        some fixes I decided to dequeue, some amdkfd bits missed the next pull
        but they are pretty trivial, so I included them.
      
        I'm not sure I'll see much else for rc2, lots of people are at XDC"
      
      * tag 'drm-fixes-for-v4.14-rc2' of git://people.freedesktop.org/~airlied/linux:
        drm/exynos/hdmi: Fix unsafe list iteration
        drm: exynos: include linux/irq.h
        drm/exynos: Fix suspend/resume support
        drm/exynos: Fix locking in the suspend/resume paths
        drm/i915: Remove unused 'in_vbl' from i915_get_crtc_scanoutpos()
        drm/i915/cnp: set min brightness from VBT
        Revert "drm/i915/bxt: Disable device ready before shutdown command"
        drm/i915/bxt: set min brightness from VBT
        drm/i915: Fix an error handling in 'intel_framebuffer_init()'
        drm/i915/gvt: Fix incorrect PCI BARs reporting
        drm/amdkfd: pass queue's mqd when destroying mqd
        drm/amdkfd: remove memset before memcpy
        uapi linux/kfd_ioctl.h: only use __u32 and __u64
      b6e78a6f
    • Linus Torvalds's avatar
      Merge tag 'dma-mapping-4.14-2' of git://git.infradead.org/users/hch/dma-mapping · 20c29a97
      Linus Torvalds authored
      Pull dma mapping fix from Christoph Hellwig:
       "A fix for a fix that went in this merge window from Arnd"
      
      * tag 'dma-mapping-4.14-2' of git://git.infradead.org/users/hch/dma-mapping:
        dma-coherent: fix rmem_dma_device_init regression
      20c29a97
    • Manuel Lauss's avatar
      MIPS: PCI: fix pcibios_map_irq section mismatch · 8eba3651
      Manuel Lauss authored
      Drop  the __init from pcibios_map_irq() to make this section mis-
      match go away:
      
      WARNING: vmlinux.o(.text+0x56acd4): Section mismatch in reference from the function pcibios_scanbus() to the function .init.text:pcibios_map_irq()
      The function pcibios_scanbus() references
      the function __init pcibios_map_irq().
      This is often because pcibios_scanbus lacks a __init
      annotation or the annotation of pcibios_map_irq is wrong.
      
      Run-Tested only on Alchemy.
      Signed-off-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/17267/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      8eba3651
    • James Hogan's avatar
      MIPS: Fix input modify in __write_64bit_c0_split() · c22c8043
      James Hogan authored
      The inline asm in __write_64bit_c0_split() modifies the 64-bit input
      operand by shifting the high register left by 32, and constructing the
      full 64-bit value in the low register (even on a 32-bit kernel), so if
      that value is used again it could cause breakage as GCC would assume the
      registers haven't changed when they have.
      
      To quote the GCC extended asm documentation:
      > Warning: Do not modify the contents of input-only operands (except for
      > inputs tied to outputs). The compiler assumes that on exit from the
      > asm statement these operands contain the same values as they had
      > before executing the statement.
      
      Avoid modifying the input by using a temporary variable as an output
      which is modified instead of the input and not otherwise used. The asm
      is always __volatile__ so GCC shouldn't optimise it out. The low
      register of the temporary output is written before the high register of
      the input is read, so we have two constraint alternatives, one where
      both use the same registers (for when the input value isn't subsequently
      used), and one with an early clobber on the output in case the low
      output uses the same register as the high input. This allows the
      resulting assembly to remain mostly unchanged.
      
      A diff of a MIPS32r6 kernel reveals only three differences, two in
      relation to write_c0_r10k_diag() in cpu_probe() (register allocation
      rearranged slightly but otherwise identical), and one in relation to
      write_c0_cvmmemctl2() in kvm_vz_local_flush_guesttlb_all(), but the
      octeon CPU is only supported on 64-bit kernels where
      __write_64bit_c0_split() isn't used so that shouldn't matter in
      practice. So there currently doesn't appear to be anything broken by
      this bug.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/17315/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      c22c8043
    • Arnd Bergmann's avatar
      MIPS: MSP71xx: Include asm/setup.h · 9bbe7dc0
      Arnd Bergmann authored
      msp71xx_defconfig can not be built at the in v4.14-rc1
      
      arch/mips/pmcs-msp71xx/msp_smp.c:72:2: error: implicit declaration of function 'set_vi_handler' [-Werror=implicit-function-declaration]
      
      I don't know what caused the regression, but including the right
      header is the obvious fix.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/17309/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      9bbe7dc0
    • Will Deacon's avatar
      ipc/shm: Fix order of parameters when calling copy_compat_shmid_to_user · 58aff0af
      Will Deacon authored
      Commit 553f770e ("ipc: move compat shmctl to native") moved the
      compat IPC syscall handling into ipc/shm.c and refactored the struct
      accessors in the process. Unfortunately, the call to
      copy_compat_shmid_to_user when handling a compat {IPC,SHM}_STAT command
      gets the arguments the wrong way round, passing a kernel stack address
      as the user buffer (destination) and the user buffer as the kernel stack
      address (source).
      
      This patch fixes the parameter ordering so the buffers are accessed
      correctly.
      
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      58aff0af
    • Petar Penkov's avatar
      iov_iter: fix page_copy_sane for compound pages · a90bcb86
      Petar Penkov authored
      Issue is that if the data crosses a page boundary inside a compound
      page, this check will incorrectly trigger a WARN_ON.
      
      To fix this, compute the order using the head of the compound page and
      adjust the offset to be relative to that head.
      
      Fixes: 72e809ed ("iov_iter: sanity checks for copy to/from page
      primitives")
      Signed-off-by: default avatarPetar Penkov <ppenkov@google.com>
      CC: Al Viro <viro@zeniv.linux.org.uk>
      CC: Eric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      a90bcb86
  3. 20 Sep, 2017 26 commits