1. 16 Nov, 2018 1 commit
  2. 15 Nov, 2018 5 commits
  3. 09 Nov, 2018 9 commits
    • A.s. Dong's avatar
      pinctrl: fsl: imx7ulp: change to use imx legacy binding · dbffda08
      A.s. Dong authored
      We already had an earlier conclusion that all new i.MX Socs will keep
      using the legacy i.MX Pinctrl bindings instead of generic pin config.
      However, MX7ULP generic pin config binding support has already been in
      tree before that time. Per SoC maintainers' suggestions, in order to
      get a better consistency for all i.MX devices, we'd like to go back to
      imx legacy binding for MX7ULP as well.
      
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Shawn Guo <shawnguo@kernel.org>
      Cc: Stefan Agner <stefan@agner.ch>
      Cc: Sascha Hauer <kernel@pengutronix.de>
      Cc: Fabio Estevam <fabio.estevam@nxp.com>
      Cc: linux-gpio@vger.kernel.org
      Signed-off-by: default avatarDong Aisheng <aisheng.dong@nxp.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      dbffda08
    • A.s. Dong's avatar
      dt-bindings: pinctrl: imx7ulp: back to imx legacy binding for consistency · 0934eec7
      A.s. Dong authored
      We already had an earlier conclusion that all new i.MX Socs will keep
      using the legacy i.MX Pinctrl bindings instead of generic pin config.
      However, MX7ULP generic pin config binding support has already been in
      tree before that time. Per SoC maintainers' suggestions, in order to
      get a better consistency for all i.MX devices, we'd like to go back to
      imx legacy binding for MX7ULP as well.
      
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Shawn Guo <shawnguo@kernel.org>
      Cc: Stefan Agner <stefan@agner.ch>
      Cc: Sascha Hauer <kernel@pengutronix.de>
      Cc: linux-gpio@vger.kernel.org
      Cc: devicetree@vger.kernel.org
      Signed-off-by: default avatarDong Aisheng <aisheng.dong@nxp.com>
      Acked-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
      Reviewed-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      0934eec7
    • Nathan Chancellor's avatar
      pinctrl: zynq: Use define directive for PIN_CONFIG_IO_STANDARD · cd8a145a
      Nathan Chancellor authored
      Clang warns when one enumerated type is implicitly converted to another:
      
      drivers/pinctrl/pinctrl-zynq.c:985:18: warning: implicit conversion from
      enumeration type 'enum zynq_pin_config_param' to different enumeration
      type 'enum pin_config_param' [-Wenum-conversion]
              {"io-standard", PIN_CONFIG_IOSTANDARD, zynq_iostd_lvcmos18},
              ~               ^~~~~~~~~~~~~~~~~~~~~
      drivers/pinctrl/pinctrl-zynq.c:990:16: warning: implicit conversion from
      enumeration type 'enum zynq_pin_config_param' to different enumeration
      type 'enum pin_config_param' [-Wenum-conversion]
              = { PCONFDUMP(PIN_CONFIG_IOSTANDARD, "IO-standard", NULL, true),
                  ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      ./include/linux/pinctrl/pinconf-generic.h:163:11: note: expanded from
      macro 'PCONFDUMP'
              .param = a, .display = b, .format = c, .has_arg = d     \
                       ^
      2 warnings generated.
      
      It is expected that pinctrl drivers can extend pin_config_param because
      of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion
      isn't an issue. Most drivers that take advantage of this define the
      PIN_CONFIG variables as constants, rather than enumerated values. Do the
      same thing here so that Clang no longer warns.
      Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
      Acked-by: default avatarMichal Simek <michal.simek@xilinx.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      cd8a145a
    • Nathan Chancellor's avatar
      pinctrl: lpc18xx: Use define directive for PIN_CONFIG_GPIO_PIN_INT · f24bfb39
      Nathan Chancellor authored
      Clang warns when one enumerated type is implicitly converted to another:
      
      drivers/pinctrl/pinctrl-lpc18xx.c:643:29: warning: implicit conversion
      from enumeration type 'enum lpc18xx_pin_config_param' to different
      enumeration type 'enum pin_config_param' [-Wenum-conversion]
              {"nxp,gpio-pin-interrupt", PIN_CONFIG_GPIO_PIN_INT, 0},
              ~                          ^~~~~~~~~~~~~~~~~~~~~~~
      drivers/pinctrl/pinctrl-lpc18xx.c:648:12: warning: implicit conversion
      from enumeration type 'enum lpc18xx_pin_config_param' to different
      enumeration type 'enum pin_config_param' [-Wenum-conversion]
              PCONFDUMP(PIN_CONFIG_GPIO_PIN_INT, "gpio pin int", NULL, true),
              ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      ./include/linux/pinctrl/pinconf-generic.h:163:11: note: expanded from
      macro 'PCONFDUMP'
              .param = a, .display = b, .format = c, .has_arg = d     \
                       ^
      2 warnings generated.
      
      It is expected that pinctrl drivers can extend pin_config_param because
      of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion
      isn't an issue. Most drivers that take advantage of this define the
      PIN_CONFIG variables as constants, rather than enumerated values. Do the
      same thing here so that Clang no longer warns.
      
      Link: https://github.com/ClangBuiltLinux/linux/issues/140Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      f24bfb39
    • Nathan Chancellor's avatar
      pinctrl: bcm2835: Use define directive for BCM2835_PINCONF_PARAM_PULL · b40ac08f
      Nathan Chancellor authored
      Clang warns when one enumerated type is implicitly converted to another:
      
      drivers/pinctrl/bcm/pinctrl-bcm2835.c:707:40: warning: implicit
      conversion from enumeration type 'enum bcm2835_pinconf_param' to
      different enumeration type 'enum pin_config_param' [-Wenum-conversion]
              configs[0] = pinconf_to_config_packed(BCM2835_PINCONF_PARAM_PULL, pull);
                           ~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~
      1 warning generated.
      
      It is expected that pinctrl drivers can extend pin_config_param because
      of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion
      isn't an issue. Most drivers that take advantage of this define the
      PIN_CONFIG variables as constants, rather than enumerated values. Do the
      same thing here so that Clang no longer warns.
      Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
      Acked-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      b40ac08f
    • Nathan Chancellor's avatar
      pinctrl: sprd: Use define directive for sprd_pinconf_params values · 957063c9
      Nathan Chancellor authored
      Clang warns when one enumerated type is implicitly converted to another:
      
      drivers/pinctrl/sprd/pinctrl-sprd.c:845:19: warning: implicit conversion
      from enumeration type 'enum sprd_pinconf_params' to different
      enumeration type 'enum pin_config_param' [-Wenum-conversion]
              {"sprd,control", SPRD_PIN_CONFIG_CONTROL, 0},
              ~                ^~~~~~~~~~~~~~~~~~~~~~~
      drivers/pinctrl/sprd/pinctrl-sprd.c:846:22: warning: implicit conversion
      from enumeration type 'enum sprd_pinconf_params' to different
      enumeration type 'enum pin_config_param' [-Wenum-conversion]
              {"sprd,sleep-mode", SPRD_PIN_CONFIG_SLEEP_MODE, 0},
              ~                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
      
      It is expected that pinctrl drivers can extend pin_config_param because
      of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion
      isn't an issue. Most drivers that take advantage of this define the
      PIN_CONFIG variables as constants, rather than enumerated values. Do the
      same thing here so that Clang no longer warns.
      
      Link: https://github.com/ClangBuiltLinux/linux/issues/138Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
      Reviewed-by: default avatarBaolin Wang <baolin.wang@linaro.org>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      957063c9
    • Nathan Chancellor's avatar
      pinctrl: max77620: Use define directive for max77620_pinconf_param values · 1f60652d
      Nathan Chancellor authored
      Clang warns when one enumerated type is implicitly converted to another:
      
      drivers/pinctrl/pinctrl-max77620.c:56:12: warning: implicit conversion
      from enumeration type 'enum max77620_pinconf_param' to different
      enumeration type 'enum pin_config_param' [-Wenum-conversion]
                      .param = MAX77620_ACTIVE_FPS_SOURCE,
                               ^~~~~~~~~~~~~~~~~~~~~~~~~~
      
      It is expected that pinctrl drivers can extend pin_config_param because
      of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion
      isn't an issue. Most drivers that take advantage of this define the
      PIN_CONFIG variables as constants, rather than enumerated values. Do the
      same thing here so that Clang no longer warns.
      
      Link: https://github.com/ClangBuiltLinux/linux/issues/139Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      1f60652d
    • Brian Masney's avatar
      pinctrl: qcom: spmi-gpio: fix gpio-hog related boot issues · 149a9604
      Brian Masney authored
      When attempting to setup up a gpio hog, device probing would repeatedly
      fail with -EPROBE_DEFERED errors. It was caused by a circular dependency
      between the gpio and pinctrl frameworks. If the gpio-ranges property is
      present in device tree, then the gpio framework will handle the gpio pin
      registration and eliminate the circular dependency.
      
      See Christian Lamparter's commit a86caa9b ("pinctrl: msm: fix
      gpio-hog related boot issues") for a detailed commit message that
      explains the issue in much more detail. The code comment in this commit
      came from Christian's commit.
      Signed-off-by: default avatarBrian Masney <masneyb@onstation.org>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      149a9604
    • Colin Ian King's avatar
      pinctrl: mediatek: clean up indentation issues, add missing tab · 78bf386d
      Colin Ian King authored
      Trivial fix to clean up indentation issues, add one level of
      indentation on two if statements.
      Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      78bf386d
  4. 05 Nov, 2018 5 commits
  5. 04 Nov, 2018 9 commits
    • Linus Torvalds's avatar
      Linux 4.20-rc1 · 65102238
      Linus Torvalds authored
      65102238
    • Linus Torvalds's avatar
      Merge tag 'tags/upstream-4.20-rc1' of git://git.infradead.org/linux-ubifs · 42bd06e9
      Linus Torvalds authored
      Pull UBIFS updates from Richard Weinberger:
      
       - Full filesystem authentication feature, UBIFS is now able to have the
         whole filesystem structure authenticated plus user data encrypted and
         authenticated.
      
       - Minor cleanups
      
      * tag 'tags/upstream-4.20-rc1' of git://git.infradead.org/linux-ubifs: (26 commits)
        ubifs: Remove unneeded semicolon
        Documentation: ubifs: Add authentication whitepaper
        ubifs: Enable authentication support
        ubifs: Do not update inode size in-place in authenticated mode
        ubifs: Add hashes and HMACs to default filesystem
        ubifs: authentication: Authenticate super block node
        ubifs: Create hash for default LPT
        ubfis: authentication: Authenticate master node
        ubifs: authentication: Authenticate LPT
        ubifs: Authenticate replayed journal
        ubifs: Add auth nodes to garbage collector journal head
        ubifs: Add authentication nodes to journal
        ubifs: authentication: Add hashes to index nodes
        ubifs: Add hashes to the tree node cache
        ubifs: Create functions to embed a HMAC in a node
        ubifs: Add helper functions for authentication support
        ubifs: Add separate functions to init/crc a node
        ubifs: Format changes for authentication support
        ubifs: Store read superblock node
        ubifs: Drop write_node
        ...
      42bd06e9
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-4.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 4710e789
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
       "Highlights include:
      
        Bugfix:
         - Fix build issues on architectures that don't provide 64-bit cmpxchg
      
        Cleanups:
         - Fix a spelling mistake"
      
      * tag 'nfs-for-4.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFS: fix spelling mistake, EACCESS -> EACCES
        SUNRPC: Use atomic(64)_t for seq_send(64)
      4710e789
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 35e74524
      Linus Torvalds authored
      Pull more timer updates from Thomas Gleixner:
       "A set of commits for the new C-SKY architecture timers"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        dt-bindings: timer: gx6605s SOC timer
        clocksource/drivers/c-sky: Add gx6605s SOC system timer
        dt-bindings: timer: C-SKY Multi-processor timer
        clocksource/drivers/c-sky: Add C-SKY SMP timer
      35e74524
    • Linus Torvalds's avatar
      Merge tag 'ntb-4.20' of git://github.com/jonmason/ntb · 04578e84
      Linus Torvalds authored
      Pull NTB updates from Jon Mason:
       "Fairly minor changes and bug fixes:
      
        NTB IDT thermal changes and hook into hwmon, ntb_netdev clean-up of
        private struct, and a few bug fixes"
      
      * tag 'ntb-4.20' of git://github.com/jonmason/ntb:
        ntb: idt: Alter the driver info comments
        ntb: idt: Discard temperature sensor IRQ handler
        ntb: idt: Add basic hwmon sysfs interface
        ntb: idt: Alter temperature read method
        ntb_netdev: Simplify remove with client device drvdata
        NTB: transport: Try harder to alloc an aligned MW buffer
        ntb: ntb_transport: Mark expected switch fall-throughs
        ntb: idt: Set PCIe bus address to BARLIMITx
        NTB: ntb_hw_idt: replace IS_ERR_OR_NULL with regular NULL checks
        ntb: intel: fix return value for ndev_vec_mask()
        ntb_netdev: fix sleep time mismatch
      04578e84
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 71e56028
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "A memory (under-)allocation fix and a comment fix"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/topology: Fix off by one bug
        sched/rt: Update comment in pick_next_task_rt()
      71e56028
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 601a8807
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "A number of fixes and some late updates:
      
         - make in_compat_syscall() behavior on x86-32 similar to other
           platforms, this touches a number of generic files but is not
           intended to impact non-x86 platforms.
      
         - objtool fixes
      
         - PAT preemption fix
      
         - paravirt fixes/cleanups
      
         - cpufeatures updates for new instructions
      
         - earlyprintk quirk
      
         - make microcode version in sysfs world-readable (it is already
           world-readable in procfs)
      
         - minor cleanups and fixes"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        compat: Cleanup in_compat_syscall() callers
        x86/compat: Adjust in_compat_syscall() to generic code under !COMPAT
        objtool: Support GCC 9 cold subfunction naming scheme
        x86/numa_emulation: Fix uniform-split numa emulation
        x86/paravirt: Remove unused _paravirt_ident_32
        x86/mm/pat: Disable preemption around __flush_tlb_all()
        x86/paravirt: Remove GPL from pv_ops export
        x86/traps: Use format string with panic() call
        x86: Clean up 'sizeof x' => 'sizeof(x)'
        x86/cpufeatures: Enumerate MOVDIR64B instruction
        x86/cpufeatures: Enumerate MOVDIRI instruction
        x86/earlyprintk: Add a force option for pciserial device
        objtool: Support per-function rodata sections
        x86/microcode: Make revision and processor flags world-readable
      601a8807
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 01897f3e
      Linus Torvalds authored
      Pull perf updates and fixes from Ingo Molnar:
       "These are almost all tooling updates: 'perf top', 'perf trace' and
        'perf script' fixes and updates, an UAPI header sync with the merge
        window versions, license marker updates, much improved Sparc support
        from David Miller, and a number of fixes"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (66 commits)
        perf intel-pt/bts: Calculate cpumode for synthesized samples
        perf intel-pt: Insert callchain context into synthesized callchains
        perf tools: Don't clone maps from parent when synthesizing forks
        perf top: Start display thread earlier
        tools headers uapi: Update linux/if_link.h header copy
        tools headers uapi: Update linux/netlink.h header copy
        tools headers: Sync the various kvm.h header copies
        tools include uapi: Update linux/mmap.h copy
        perf trace beauty: Use the mmap flags table generated from headers
        perf beauty: Wire up the mmap flags table generator to the Makefile
        perf beauty: Add a generator for MAP_ mmap's flag constants
        tools include uapi: Update asound.h copy
        tools arch uapi: Update asm-generic/unistd.h and arm64 unistd.h copies
        tools include uapi: Update linux/fs.h copy
        perf callchain: Honour the ordering of PERF_CONTEXT_{USER,KERNEL,etc}
        perf cs-etm: Correct CPU mode for samples
        perf unwind: Take pgoff into account when reporting elf to libdwfl
        perf top: Do not use overwrite mode by default
        perf top: Allow disabling the overwrite mode
        perf trace: Beautify mount's first pathname arg
        ...
      01897f3e
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e9ebc215
      Linus Torvalds authored
      Pull irq fixes from Ingo Molnar:
       "An irqchip driver fix and a memory (over-)allocation fix"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip/irq-mvebu-sei: Fix a NULL vs IS_ERR() bug in probe function
        irq/matrix: Fix memory overallocation
      e9ebc215
  6. 03 Nov, 2018 11 commits
    • Peter Zijlstra's avatar
      sched/topology: Fix off by one bug · 993f0b05
      Peter Zijlstra authored
      With the addition of the NUMA identity level, we increased @level by
      one and will run off the end of the array in the distance sort loop.
      
      Fixed: 051f3ca0 ("sched/topology: Introduce NUMA identity node sched domain")
      Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: linux-kernel@vger.kernel.org
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      993f0b05
    • Ingo Molnar's avatar
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d2ff0ff2
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A few fixes who have come in near or during the merge window:
      
         - Removal of a VLA usage in Marvell mpp platform code
      
         - Enable some IPMI options for ARM64 servers by default, helps
           testing
      
         - Enable PREEMPT on 32-bit ARMv7 defconfig
      
         - Minor fix for stm32 DT (removal of an unused DMA property)
      
         - Bugfix for TI OMAP1-based ams-delta (-EINVAL -> IRQ_NOTCONNECTED)"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: dts: stm32: update HASH1 dmas property on stm32mp157c
        ARM: orion: avoid VLA in orion_mpp_conf
        ARM: defconfig: Update multi_v7 to use PREEMPT
        arm64: defconfig: Enable some IPMI configs
        soc: ti: QMSS: Fix usage of irq_set_affinity_hint
        ARM: OMAP1: ams-delta: Fix impossible .irq < 0
      d2ff0ff2
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 83650fd5
      Linus Torvalds authored
      Pull more arm64 updates from Catalin Marinas:
      
       - fix W+X page (mark RO) allocated by the arm64 kprobes code
      
       - Makefile fix for .i files in out of tree modules
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: kprobe: make page to RO mode when allocate it
        arm64: kdump: fix small typo
        arm64: makefile fix build of .i file in external module case
      83650fd5
    • Linus Torvalds's avatar
      Merge tag 'dma-mapping-4.20-2' of git://git.infradead.org/users/hch/dma-mapping · 3308a383
      Linus Torvalds authored
      Pull dma-mapping fix from Christoph Hellwig:
       "Avoid compile warnings on non-default arm64 configs"
      
      * tag 'dma-mapping-4.20-2' of git://git.infradead.org/users/hch/dma-mapping:
        arm64: fix warnings without CONFIG_IOMMU_DMA
      3308a383
    • Linus Torvalds's avatar
      Merge tag 'kbuild-v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 9a12efc5
      Linus Torvalds authored
      Pull Kbuild updates from Masahiro Yamada:
      
       - clean-up leftovers in Kconfig files
      
       - remove stale oldnoconfig and silentoldconfig targets
      
       - remove unneeded cc-fullversion and cc-name variables
      
       - improve merge_config script to allow overriding option prefix
      
      * tag 'kbuild-v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        kbuild: remove cc-name variable
        kbuild: replace cc-name test with CONFIG_CC_IS_CLANG
        merge_config.sh: Allow to define config prefix
        kbuild: remove unused cc-fullversion variable
        kconfig: remove silentoldconfig target
        kconfig: remove oldnoconfig target
        powerpc: PCI_MSI needs PCI
        powerpc: remove CONFIG_MCA leftovers
        powerpc: remove CONFIG_PCI_QSPAN
        scsi: aha152x: rename the PCMCIA define
      9a12efc5
    • Linus Torvalds's avatar
      Merge tag '4.20-rc1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 · 16944728
      Linus Torvalds authored
      Pull cifs fixes and updates from Steve French:
       "Three small fixes (one Kerberos related, one for stable, and another
        fixes an oops in xfstest 377), two helpful debugging improvements,
        three patches for cifs directio and some minor cleanup"
      
      * tag '4.20-rc1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: fix signed/unsigned mismatch on aio_read patch
        cifs: don't dereference smb_file_target before null check
        CIFS: Add direct I/O functions to file_operations
        CIFS: Add support for direct I/O write
        CIFS: Add support for direct I/O read
        smb3: missing defines and structs for reparse point handling
        smb3: allow more detailed protocol info on open files for debugging
        smb3: on kerberos mount if server doesn't specify auth type use krb5
        smb3: add trace point for tree connection
        cifs: fix spelling mistake, EACCESS -> EACCES
        cifs: fix return value for cifs_listxattr
      16944728
    • Linus Torvalds's avatar
      Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · ed61a132
      Linus Torvalds authored
      Pull 9p fix from Al Viro:
       "Regression fix for net/9p handling of iov_iter; broken by braino when
        switching to iov_iter_is_kvec() et.al., spotted and fixed by Marc"
      
      * 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        iov_iter: Fix 9p virtio breakage
      ed61a132
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · af102b33
      Linus Torvalds authored
      Pull more SCSI updates from James Bottomley:
       "This is a set of minor small (and safe changes) that didn't make the
        initial pull request plus some bug fixes"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: mvsas: Remove set but not used variable 'id'
        scsi: qla2xxx: Remove two arguments from qlafx00_error_entry()
        scsi: qla2xxx: Make sure that qlafx00_ioctl_iosb_entry() initializes 'res'
        scsi: qla2xxx: Remove a set-but-not-used variable
        scsi: qla2xxx: Make qla2x00_sysfs_write_nvram() easier to analyze
        scsi: qla2xxx: Declare local functions 'static'
        scsi: qla2xxx: Improve several kernel-doc headers
        scsi: qla2xxx: Modify fall-through annotations
        scsi: 3w-sas: 3w-9xxx: Use unsigned char for cdb
        scsi: mvsas: Use dma_pool_zalloc
        scsi: target: Don't request modules that aren't even built
        scsi: target: Set response length for REPORT TARGET PORT GROUPS
      af102b33
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · cddfa11a
      Linus Torvalds authored
      Merge more updates from Andrew Morton:
      
       - more ocfs2 work
      
       - various leftovers
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        memory_hotplug: cond_resched in __remove_pages
        bfs: add sanity check at bfs_fill_super()
        kernel/sysctl.c: remove duplicated include
        kernel/kexec_file.c: remove some duplicated includes
        mm, thp: consolidate THP gfp handling into alloc_hugepage_direct_gfpmask
        ocfs2: fix clusters leak in ocfs2_defrag_extent()
        ocfs2: dlmglue: clean up timestamp handling
        ocfs2: don't put and assigning null to bh allocated outside
        ocfs2: fix a misuse a of brelse after failing ocfs2_check_dir_entry
        ocfs2: don't use iocb when EIOCBQUEUED returns
        ocfs2: without quota support, avoid calling quota recovery
        ocfs2: remove ocfs2_is_o2cb_active()
        mm: thp: relax __GFP_THISNODE for MADV_HUGEPAGE mappings
        include/linux/notifier.h: SRCU: fix ctags
        mm: handle no memcg case in memcg_kmem_charge() properly
      cddfa11a
    • Michal Hocko's avatar
      memory_hotplug: cond_resched in __remove_pages · dd33ad7b
      Michal Hocko authored
      We have received a bug report that unbinding a large pmem (>1TB) can
      result in a soft lockup:
      
        NMI watchdog: BUG: soft lockup - CPU#9 stuck for 23s! [ndctl:4365]
        [...]
        Supported: Yes
        CPU: 9 PID: 4365 Comm: ndctl Not tainted 4.12.14-94.40-default #1 SLE12-SP4
        Hardware name: Intel Corporation S2600WFD/S2600WFD, BIOS SE5C620.86B.01.00.0833.051120182255 05/11/2018
        task: ffff9cce7d4410c0 task.stack: ffffbe9eb1bc4000
        RIP: 0010:__put_page+0x62/0x80
        Call Trace:
         devm_memremap_pages_release+0x152/0x260
         release_nodes+0x18d/0x1d0
         device_release_driver_internal+0x160/0x210
         unbind_store+0xb3/0xe0
         kernfs_fop_write+0x102/0x180
         __vfs_write+0x26/0x150
         vfs_write+0xad/0x1a0
         SyS_write+0x42/0x90
         do_syscall_64+0x74/0x150
         entry_SYSCALL_64_after_hwframe+0x3d/0xa2
        RIP: 0033:0x7fd13166b3d0
      
      It has been reported on an older (4.12) kernel but the current upstream
      code doesn't cond_resched in the hot remove code at all and the given
      range to remove might be really large.  Fix the issue by calling
      cond_resched once per memory section.
      
      Link: http://lkml.kernel.org/r/20181031125840.23982-1-mhocko@kernel.orgSigned-off-by: default avatarMichal Hocko <mhocko@suse.com>
      Acked-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
      Cc: Dan Williams <dan.j.williams@gmail.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      dd33ad7b