]> www.infradead.org Git - users/jedix/linux-maple.git/log
users/jedix/linux-maple.git
4 years agoMerge remote-tracking branch 'apparmor/apparmor-next'
Stephen Rothwell [Thu, 6 May 2021 00:05:10 +0000 (10:05 +1000)]
Merge remote-tracking branch 'apparmor/apparmor-next'

4 years agoMerge remote-tracking branch 'security/next-testing'
Stephen Rothwell [Thu, 6 May 2021 00:05:08 +0000 (10:05 +1000)]
Merge remote-tracking branch 'security/next-testing'

4 years agoMerge remote-tracking branch 'pcmcia/pcmcia-next'
Stephen Rothwell [Thu, 6 May 2021 00:03:30 +0000 (10:03 +1000)]
Merge remote-tracking branch 'pcmcia/pcmcia-next'

4 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:55:00 +0000 (09:55 +1000)]
Merge remote-tracking branch 'block/for-next'

4 years agoMerge remote-tracking branch 'etnaviv/etnaviv/next'
Stephen Rothwell [Wed, 5 May 2021 23:53:14 +0000 (09:53 +1000)]
Merge remote-tracking branch 'etnaviv/etnaviv/next'

4 years agoMerge remote-tracking branch 'imx-drm/imx-drm/next'
Stephen Rothwell [Wed, 5 May 2021 23:53:14 +0000 (09:53 +1000)]
Merge remote-tracking branch 'imx-drm/imx-drm/next'

# Conflicts:
# drivers/gpu/drm/imx/ipuv3-plane.c

4 years agoMerge remote-tracking branch 'drm-msm/msm-next'
Stephen Rothwell [Wed, 5 May 2021 23:53:11 +0000 (09:53 +1000)]
Merge remote-tracking branch 'drm-msm/msm-next'

4 years agoMerge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:53:10 +0000 (09:53 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'

4 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Wed, 5 May 2021 23:53:09 +0000 (09:53 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

4 years agonext-20210504/amdgpu
Stephen Rothwell [Wed, 5 May 2021 23:41:14 +0000 (09:41 +1000)]
next-20210504/amdgpu

4 years agoMerge remote-tracking branch 'drm-misc/for-linux-next'
Stephen Rothwell [Wed, 5 May 2021 23:27:28 +0000 (09:27 +1000)]
Merge remote-tracking branch 'drm-misc/for-linux-next'

4 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 5 May 2021 23:25:45 +0000 (09:25 +1000)]
Merge remote-tracking branch 'bluetooth/master'

4 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:23:34 +0000 (09:23 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

4 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 5 May 2021 23:21:28 +0000 (09:21 +1000)]
Merge remote-tracking branch 'pm/linux-next'

4 years agoMerge remote-tracking branch 'jc_docs/docs-next'
Stephen Rothwell [Wed, 5 May 2021 23:20:11 +0000 (09:20 +1000)]
Merge remote-tracking branch 'jc_docs/docs-next'

4 years agoMerge remote-tracking branch 'i3c/i3c/next'
Stephen Rothwell [Wed, 5 May 2021 23:18:33 +0000 (09:18 +1000)]
Merge remote-tracking branch 'i3c/i3c/next'

4 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:18:32 +0000 (09:18 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'

4 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:15:59 +0000 (09:15 +1000)]
Merge remote-tracking branch 'hid/for-next'

4 years agoMerge remote-tracking branch 'printk/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:15:57 +0000 (09:15 +1000)]
Merge remote-tracking branch 'printk/for-next'

4 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:16 +0000 (09:13 +1000)]
Merge remote-tracking branch 'vfs/for-next'

4 years agoMerge remote-tracking branch 'iomap/iomap-for-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:15 +0000 (09:13 +1000)]
Merge remote-tracking branch 'iomap/iomap-for-next'

4 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:14 +0000 (09:13 +1000)]
Merge remote-tracking branch 'xfs/for-next'

4 years agoMerge remote-tracking branch 'v9fs/9p-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:13 +0000 (09:13 +1000)]
Merge remote-tracking branch 'v9fs/9p-next'

4 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:11 +0000 (09:13 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

4 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:10 +0000 (09:13 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'

4 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Wed, 5 May 2021 23:13:09 +0000 (09:13 +1000)]
Merge remote-tracking branch 'ext3/for_next'

4 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 5 May 2021 23:13:07 +0000 (09:13 +1000)]
Merge remote-tracking branch 'ecryptfs/next'

4 years agoMerge remote-tracking branch 'cifsd/cifsd-for-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:06 +0000 (09:13 +1000)]
Merge remote-tracking branch 'cifsd/cifsd-for-next'

4 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Wed, 5 May 2021 23:13:03 +0000 (09:13 +1000)]
Merge remote-tracking branch 'ceph/master'

4 years agoMerge remote-tracking branch 'btrfs/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:03 +0000 (09:13 +1000)]
Merge remote-tracking branch 'btrfs/for-next'

4 years agoMerge remote-tracking branch 'pidfd/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:02 +0000 (09:13 +1000)]
Merge remote-tracking branch 'pidfd/for-next'

4 years agoMerge remote-tracking branch 'sh/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:12 +0000 (09:08 +1000)]
Merge remote-tracking branch 'sh/for-next'

4 years agoMerge remote-tracking branch 's390/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:12 +0000 (09:08 +1000)]
Merge remote-tracking branch 's390/for-next'

4 years agoMerge remote-tracking branch 'risc-v/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:11 +0000 (09:08 +1000)]
Merge remote-tracking branch 'risc-v/for-next'

# Conflicts:
# Documentation/admin-guide/kernel-parameters.txt
# arch/riscv/kernel/setup.c
# arch/riscv/mm/kasan_init.c

4 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 5 May 2021 23:08:10 +0000 (09:08 +1000)]
Merge remote-tracking branch 'powerpc/next'

# Conflicts:
# arch/powerpc/Kconfig

4 years agoMerge remote-tracking branch 'h8300/h8300-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:06 +0000 (09:08 +1000)]
Merge remote-tracking branch 'h8300/h8300-next'

4 years agoMerge remote-tracking branch 'csky/linux-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:06 +0000 (09:08 +1000)]
Merge remote-tracking branch 'csky/linux-next'

4 years agoMerge remote-tracking branch 'ti-k3/ti-k3-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:05 +0000 (09:08 +1000)]
Merge remote-tracking branch 'ti-k3/ti-k3-next'

4 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:00 +0000 (09:08 +1000)]
Merge remote-tracking branch 'tegra/for-next'

4 years agoMerge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:00 +0000 (09:08 +1000)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'

# Conflicts:
# arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
# arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts

4 years agoMerge remote-tracking branch 'scmi/for-linux-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:57 +0000 (09:07 +1000)]
Merge remote-tracking branch 'scmi/for-linux-next'

4 years agoMerge remote-tracking branch 'samsung-krzk/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:56 +0000 (09:07 +1000)]
Merge remote-tracking branch 'samsung-krzk/for-next'

4 years agoMerge remote-tracking branch 'rockchip/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:54 +0000 (09:07 +1000)]
Merge remote-tracking branch 'rockchip/for-next'

4 years agoMerge remote-tracking branch 'reset/reset/next'
Stephen Rothwell [Wed, 5 May 2021 23:07:54 +0000 (09:07 +1000)]
Merge remote-tracking branch 'reset/reset/next'

# Conflicts:
# drivers/reset/core.c

4 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Wed, 5 May 2021 23:07:50 +0000 (09:07 +1000)]
Merge remote-tracking branch 'renesas/next'

4 years agoMerge remote-tracking branch 'realtek/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:50 +0000 (09:07 +1000)]
Merge remote-tracking branch 'realtek/for-next'

4 years agoMerge remote-tracking branch 'raspberrypi/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:49 +0000 (09:07 +1000)]
Merge remote-tracking branch 'raspberrypi/for-next'

# Conflicts:
# arch/arm/boot/dts/bcm2711.dtsi

4 years agoMerge remote-tracking branch 'qcom/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:42 +0000 (09:07 +1000)]
Merge remote-tracking branch 'qcom/for-next'

4 years agoMerge remote-tracking branch 'omap/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:36 +0000 (09:07 +1000)]
Merge remote-tracking branch 'omap/for-next'

4 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:35 +0000 (09:07 +1000)]
Merge remote-tracking branch 'mvebu/for-next'

4 years agoMerge remote-tracking branch 'mediatek/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:33 +0000 (09:07 +1000)]
Merge remote-tracking branch 'mediatek/for-next'

4 years agoMerge remote-tracking branch 'keystone/next'
Stephen Rothwell [Wed, 5 May 2021 23:07:33 +0000 (09:07 +1000)]
Merge remote-tracking branch 'keystone/next'

4 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:27 +0000 (09:07 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'

4 years agoMerge remote-tracking branch 'drivers-memory/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:27 +0000 (09:07 +1000)]
Merge remote-tracking branch 'drivers-memory/for-next'

4 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:24 +0000 (09:07 +1000)]
Merge remote-tracking branch 'at91/at91-next'

4 years agoMerge remote-tracking branch 'aspeed/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:22 +0000 (09:07 +1000)]
Merge remote-tracking branch 'aspeed/for-next'

4 years agoMerge remote-tracking branch 'amlogic/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:20 +0000 (09:07 +1000)]
Merge remote-tracking branch 'amlogic/for-next'

4 years agoMerge remote-tracking branch 'actions/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:19 +0000 (09:07 +1000)]
Merge remote-tracking branch 'actions/for-next'

4 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:19 +0000 (09:07 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

# Conflicts:
# arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts

4 years agoMerge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Wed, 5 May 2021 23:07:09 +0000 (09:07 +1000)]
Merge remote-tracking branch 'arm64/for-next/core'

# Conflicts:
# arch/arm64/kernel/alternative.c

4 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:07 +0000 (09:07 +1000)]
Merge remote-tracking branch 'arm/for-next'

4 years agoMerge remote-tracking branch 'asm-generic/master'
Stephen Rothwell [Wed, 5 May 2021 23:07:06 +0000 (09:07 +1000)]
Merge remote-tracking branch 'asm-generic/master'

4 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 5 May 2021 22:52:07 +0000 (08:52 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

4 years agoMerge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes'
Stephen Rothwell [Wed, 5 May 2021 22:49:06 +0000 (08:49 +1000)]
Merge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes'

# Conflicts:
# drivers/gpu/drm/ttm/ttm_bo.c

4 years agoMerge remote-tracking branch 'pidfd-fixes/fixes'
Stephen Rothwell [Wed, 5 May 2021 22:49:03 +0000 (08:49 +1000)]
Merge remote-tracking branch 'pidfd-fixes/fixes'

4 years agoMerge remote-tracking branch 'rtc-fixes/rtc-fixes'
Stephen Rothwell [Wed, 5 May 2021 22:49:01 +0000 (08:49 +1000)]
Merge remote-tracking branch 'rtc-fixes/rtc-fixes'

4 years agoMerge remote-tracking branch 'scsi-fixes/fixes'
Stephen Rothwell [Wed, 5 May 2021 22:49:00 +0000 (08:49 +1000)]
Merge remote-tracking branch 'scsi-fixes/fixes'

4 years agoMerge remote-tracking branch 'devicetree-fixes/dt/linus'
Stephen Rothwell [Wed, 5 May 2021 22:48:59 +0000 (08:48 +1000)]
Merge remote-tracking branch 'devicetree-fixes/dt/linus'

4 years agoMerge remote-tracking branch 'vfs-fixes/fixes'
Stephen Rothwell [Wed, 5 May 2021 22:48:58 +0000 (08:48 +1000)]
Merge remote-tracking branch 'vfs-fixes/fixes'

4 years agoMerge remote-tracking branch 'btrfs-fixes/next-fixes'
Stephen Rothwell [Wed, 5 May 2021 22:48:56 +0000 (08:48 +1000)]
Merge remote-tracking branch 'btrfs-fixes/next-fixes'

4 years agoMerge remote-tracking branch 'nvdimm-fixes/libnvdimm-fixes'
Stephen Rothwell [Wed, 5 May 2021 22:48:56 +0000 (08:48 +1000)]
Merge remote-tracking branch 'nvdimm-fixes/libnvdimm-fixes'

4 years agoMerge remote-tracking branch 'v4l-dvb-fixes/fixes'
Stephen Rothwell [Wed, 5 May 2021 22:48:54 +0000 (08:48 +1000)]
Merge remote-tracking branch 'v4l-dvb-fixes/fixes'

4 years agoMerge remote-tracking branch 'vfio-fixes/for-linus'
Stephen Rothwell [Wed, 5 May 2021 22:48:53 +0000 (08:48 +1000)]
Merge remote-tracking branch 'vfio-fixes/for-linus'

4 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Wed, 5 May 2021 22:48:44 +0000 (08:48 +1000)]
Merge remote-tracking branch 'ide/master'

4 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Wed, 5 May 2021 22:48:40 +0000 (08:48 +1000)]
Merge remote-tracking branch 'input-current/for-linus'

4 years agoMerge remote-tracking branch 'soundwire-fixes/fixes'
Stephen Rothwell [Wed, 5 May 2021 22:48:39 +0000 (08:48 +1000)]
Merge remote-tracking branch 'soundwire-fixes/fixes'

4 years agoMerge remote-tracking branch 'iio-fixes/fixes-togreg'
Stephen Rothwell [Wed, 5 May 2021 22:48:38 +0000 (08:48 +1000)]
Merge remote-tracking branch 'iio-fixes/fixes-togreg'

4 years agoMerge remote-tracking branch 'phy/fixes'
Stephen Rothwell [Wed, 5 May 2021 22:48:37 +0000 (08:48 +1000)]
Merge remote-tracking branch 'phy/fixes'

# Conflicts:
# drivers/phy/qualcomm/phy-qcom-qmp.c

4 years agoMerge remote-tracking branch 'usb-chipidea-fixes/for-usb-fixes'
Stephen Rothwell [Wed, 5 May 2021 22:48:35 +0000 (08:48 +1000)]
Merge remote-tracking branch 'usb-chipidea-fixes/for-usb-fixes'

4 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Wed, 5 May 2021 22:48:33 +0000 (08:48 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'

4 years agoMerge remote-tracking branch 'spi-fixes/for-linus'
Stephen Rothwell [Wed, 5 May 2021 22:48:32 +0000 (08:48 +1000)]
Merge remote-tracking branch 'spi-fixes/for-linus'

4 years agoMerge remote-tracking branch 'sound-asoc-fixes/for-linus'
Stephen Rothwell [Wed, 5 May 2021 22:48:28 +0000 (08:48 +1000)]
Merge remote-tracking branch 'sound-asoc-fixes/for-linus'

4 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Wed, 5 May 2021 22:48:27 +0000 (08:48 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'

4 years agoMerge remote-tracking branch 'netfilter/master'
Stephen Rothwell [Wed, 5 May 2021 22:48:26 +0000 (08:48 +1000)]
Merge remote-tracking branch 'netfilter/master'

4 years agoMerge remote-tracking branch 'ipsec/master'
Stephen Rothwell [Wed, 5 May 2021 22:48:25 +0000 (08:48 +1000)]
Merge remote-tracking branch 'ipsec/master'

4 years agoMerge remote-tracking branch 'bpf/master'
Stephen Rothwell [Wed, 5 May 2021 22:48:25 +0000 (08:48 +1000)]
Merge remote-tracking branch 'bpf/master'

4 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Wed, 5 May 2021 22:48:24 +0000 (08:48 +1000)]
Merge remote-tracking branch 'net/master'

4 years agoMerge remote-tracking branch 'arm-soc-fixes/arm/fixes'
Stephen Rothwell [Wed, 5 May 2021 22:48:23 +0000 (08:48 +1000)]
Merge remote-tracking branch 'arm-soc-fixes/arm/fixes'

4 years agoMerge remote-tracking branch 'arc-current/for-curr'
Stephen Rothwell [Wed, 5 May 2021 22:48:22 +0000 (08:48 +1000)]
Merge remote-tracking branch 'arc-current/for-curr'

4 years agoMerge branch 'akpm' (patches from Andrew)
Linus Torvalds [Wed, 5 May 2021 20:50:15 +0000 (13:50 -0700)]
Merge branch 'akpm' (patches from Andrew)

Merge more updates from Andrew Morton:
 "The remainder of the main mm/ queue.

  143 patches.

  Subsystems affected by this patch series (all mm): pagecache, hugetlb,
  userfaultfd, vmscan, compaction, migration, cma, ksm, vmstat, mmap,
  kconfig, util, memory-hotplug, zswap, zsmalloc, highmem, cleanups, and
  kfence"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (143 commits)
  kfence: use power-efficient work queue to run delayed work
  kfence: maximize allocation wait timeout duration
  kfence: await for allocation using wait_event
  kfence: zero guard page after out-of-bounds access
  mm/process_vm_access.c: remove duplicate include
  mm/mempool: minor coding style tweaks
  mm/highmem.c: fix coding style issue
  btrfs: use memzero_page() instead of open coded kmap pattern
  iov_iter: lift memzero_page() to highmem.h
  mm/zsmalloc: use BUG_ON instead of if condition followed by BUG.
  mm/zswap.c: switch from strlcpy to strscpy
  arm64/Kconfig: introduce ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE
  x86/Kconfig: introduce ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE
  mm,memory_hotplug: add kernel boot option to enable memmap_on_memory
  acpi,memhotplug: enable MHP_MEMMAP_ON_MEMORY when supported
  mm,memory_hotplug: allocate memmap from the added memory range
  mm,memory_hotplug: factor out adjusting present pages into adjust_present_page_count()
  mm,memory_hotplug: relax fully spanned sections check
  drivers/base/memory: introduce memory_block_{online,offline}
  mm/memory_hotplug: remove broken locking of zone PCP structures during hot remove
  ...

4 years agoMerge tag 'nfsd-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Linus Torvalds [Wed, 5 May 2021 20:44:19 +0000 (13:44 -0700)]
Merge tag 'nfsd-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

Pull more nfsd updates from Chuck Lever:
 "Additional fixes and clean-ups for NFSD since tags/nfsd-5.13,
  including a fix to grant read delegations for files open for writing"

* tag 'nfsd-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  SUNRPC: Fix null pointer dereference in svc_rqst_free()
  SUNRPC: fix ternary sign expansion bug in tracing
  nfsd: Fix fall-through warnings for Clang
  nfsd: grant read delegations to clients holding writes
  nfsd: reshuffle some code
  nfsd: track filehandle aliasing in nfs4_files
  nfsd: hash nfs4_files by inode number
  nfsd: ensure new clients break delegations
  nfsd: removed unused argument in nfsd_startup_generic()
  nfsd: remove unused function
  svcrdma: Pass a useful error code to the send_err tracepoint
  svcrdma: Rename goto labels in svc_rdma_sendto()
  svcrdma: Don't leak send_ctxt on Send errors

4 years agoMerge tag '5.13-rc-smb3-part2' of git://git.samba.org/sfrench/cifs-2.6
Linus Torvalds [Wed, 5 May 2021 20:37:07 +0000 (13:37 -0700)]
Merge tag '5.13-rc-smb3-part2' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs updates from Steve French:
 "Ten CIFS/SMB3 changes - including two marked for stable - including
  some important multichannel fixes, as well as support for handle
  leases (deferred close) and shutdown support:

   - some important multichannel fixes

   - support for handle leases (deferred close)

   - shutdown support (which is also helpful since it enables multiple
     xfstests)

   - enable negotiating stronger encryption by default (GCM256)

   - improve wireshark debugging by allowing more options for root to
     dump decryption keys

  SambaXP and the SMB3 Plugfest test event are going on now so I am
  expecting more patches over the next few days due to extra testing
  (including more multichannel fixes)"

* tag '5.13-rc-smb3-part2' of git://git.samba.org/sfrench/cifs-2.6:
  fs/cifs: Fix resource leak
  Cifs: Fix kernel oops caused by deferred close for files.
  cifs: fix regression when mounting shares with prefix paths
  cifs: use echo_interval even when connection not ready.
  cifs: detect dead connections only when echoes are enabled.
  smb3.1.1: allow dumping keys for multiuser mounts
  smb3.1.1: allow dumping GCM256 keys to improve debugging of encrypted shares
  cifs: add shutdown support
  cifs: Deferred close for files
  smb3.1.1: enable negotiating stronger encryption by default

4 years agoMerge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Linus Torvalds [Wed, 5 May 2021 20:31:39 +0000 (13:31 -0700)]
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio updates from Michael Tsirkin:
 "A bunch of new drivers including vdpa support for block and
  virtio-vdpa.

  Beginning of vq kick (aka doorbell) mapping support.

  Misc fixes"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (40 commits)
  virtio_pci_modern: correct sparse tags for notify
  virtio_pci_modern: __force cast the notify mapping
  vDPA/ifcvf: get_config_size should return dev specific config size
  vDPA/ifcvf: enable Intel C5000X-PL virtio-block for vDPA
  vDPA/ifcvf: deduce VIRTIO device ID when probe
  vdpa_sim_blk: add support for vdpa management tool
  vdpa_sim_blk: handle VIRTIO_BLK_T_GET_ID
  vdpa_sim_blk: implement ramdisk behaviour
  vdpa: add vdpa simulator for block device
  vhost/vdpa: Remove the restriction that only supports virtio-net devices
  vhost/vdpa: use get_config_size callback in vhost_vdpa_config_validate()
  vdpa: add get_config_size callback in vdpa_config_ops
  vdpa_sim: cleanup kiovs in vdpasim_free()
  vringh: add vringh_kiov_length() helper
  vringh: implement vringh_kiov_advance()
  vringh: explain more about cleaning riov and wiov
  vringh: reset kiov 'consumed' field in __vringh_iov()
  vringh: add 'iotlb_lock' to synchronize iotlb accesses
  vdpa_sim: use iova module to allocate IOVA addresses
  vDPA/ifcvf: deduce VIRTIO device ID from pdev ids
  ...

4 years agoMerge tag 'pci-v5.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...
Linus Torvalds [Wed, 5 May 2021 20:24:11 +0000 (13:24 -0700)]
Merge tag 'pci-v5.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull pci updates from Bjorn Helgaas:
 "Enumeration:
   - Release OF node when pci_scan_device() fails (Dmitry Baryshkov)
   - Add pci_disable_parity() (Bjorn Helgaas)
   - Disable Mellanox Tavor parity reporting (Heiner Kallweit)
   - Disable N2100 r8169 parity reporting (Heiner Kallweit)
   - Fix RCiEP device to RCEC association (Qiuxu Zhuo)
   - Convert sysfs "config", "rom", "reset", "label", "index",
     "acpi_index" to static attributes to help fix races in device
     enumeration (Krzysztof Wilczyński)
   - Convert sysfs "vpd" to static attribute (Heiner Kallweit, Krzysztof
     Wilczyński)
   - Use sysfs_emit() in "show" functions (Krzysztof Wilczyński)
   - Remove unused alloc_pci_root_info() return value (Krzysztof
     Wilczyński)

  PCI device hotplug:
   - Fix acpiphp reference count leak (Feilong Lin)

  Power management:
   - Fix acpi_pci_set_power_state() debug message (Rafael J. Wysocki)
   - Fix runtime PM imbalance (Dinghao Liu)

  Virtualization:
   - Increase delay after FLR to work around Intel DC P4510 NVMe erratum
     (Raphael Norwitz)

  MSI:
   - Convert rcar, tegra, xilinx to MSI domains (Marc Zyngier)
   - For rcar, xilinx, use controller address as MSI doorbell (Marc
     Zyngier)
   - Remove unused hv msi_controller struct (Marc Zyngier)
   - Remove unused PCI core msi_controller support (Marc Zyngier)
   - Remove struct msi_controller altogether (Marc Zyngier)
   - Remove unused default_teardown_msi_irqs() (Marc Zyngier)
   - Let host bridges declare their reliance on MSI domains (Marc
     Zyngier)
   - Make pci_host_common_probe() declare its reliance on MSI domains
     (Marc Zyngier)
   - Advertise mediatek lack of built-in MSI handling (Thomas Gleixner)
   - Document ways of ending up with NO_MSI (Marc Zyngier)
   - Refactor HT advertising of NO_MSI flag (Marc Zyngier)

  VPD:
   - Remove obsolete Broadcom NIC VPD length-limiting quirk (Heiner
     Kallweit)
   - Remove sysfs VPD size checking dead code (Heiner Kallweit)
   - Convert VPF sysfs file to static attribute (Heiner Kallweit)
   - Remove unnecessary pci_set_vpd_size() (Heiner Kallweit)
   - Tone down "missing VPD" message (Heiner Kallweit)

  Endpoint framework:
   - Fix NULL pointer dereference when epc_features not implemented
     (Shradha Todi)
   - Add missing destroy_workqueue() in endpoint test (Yang Yingliang)

  Amazon Annapurna Labs PCIe controller driver:
   - Fix compile testing without CONFIG_PCI_ECAM (Arnd Bergmann)
   - Fix "no symbols" warnings when compile testing with
     CONFIG_TRIM_UNUSED_KSYMS (Arnd Bergmann)

  APM X-Gene PCIe controller driver:
   - Fix cfg resource mapping regression (Dejin Zheng)

  Broadcom iProc PCIe controller driver:
   - Return zero for success of iproc_msi_irq_domain_alloc() (Pali
     Rohár)

  Broadcom STB PCIe controller driver:
   - Add reset_control_rearm() stub for !CONFIG_RESET_CONTROLLER (Jim
     Quinlan)
   - Fix use of BCM7216 reset controller (Jim Quinlan)
   - Use reset/rearm for Broadcom STB pulse reset instead of
     deassert/assert (Jim Quinlan)
   - Fix brcm_pcie_probe() error return for unsupported revision (Wei
     Yongjun)

  Cavium ThunderX PCIe controller driver:
   - Fix compile testing (Arnd Bergmann)
   - Fix "no symbols" warnings when compile testing with
     CONFIG_TRIM_UNUSED_KSYMS (Arnd Bergmann)

  Freescale Layerscape PCIe controller driver:
   - Fix ls_pcie_ep_probe() syntax error (comma for semicolon)
     (Krzysztof Wilczyński)
   - Remove layerscape-gen4 dependencies on OF and ARM64, add dependency
     on ARCH_LAYERSCAPE (Geert Uytterhoeven)

  HiSilicon HIP PCIe controller driver:
   - Remove obsolete HiSilicon PCIe DT description (Dongdong Liu)

  Intel Gateway PCIe controller driver:
   - Remove unused pcie_app_rd() (Jiapeng Chong)

  Intel VMD host bridge driver:
   - Program IRTE with Requester ID of VMD endpoint, not child device
     (Jon Derrick)
   - Disable VMD MSI-X remapping when possible so children can use more
     MSI-X vectors (Jon Derrick)

  MediaTek PCIe controller driver:
   - Configure FC and FTS for functions other than 0 (Ryder Lee)
   - Add YAML schema for MediaTek (Jianjun Wang)
   - Export pci_pio_to_address() for module use (Jianjun Wang)
   - Add MediaTek MT8192 PCIe controller driver (Jianjun Wang)
   - Add MediaTek MT8192 INTx support (Jianjun Wang)
   - Add MediaTek MT8192 MSI support (Jianjun Wang)
   - Add MediaTek MT8192 system power management support (Jianjun Wang)
   - Add missing MODULE_DEVICE_TABLE (Qiheng Lin)

  Microchip PolarFlare PCIe controller driver:
   - Make several symbols static (Wei Yongjun)

  NVIDIA Tegra PCIe controller driver:
   - Add MCFG quirks for Tegra194 ECAM errata (Vidya Sagar)
   - Make several symbols const (Rikard Falkeborn)
   - Fix Kconfig host/endpoint typo (Wesley Sheng)

  SiFive FU740 PCIe controller driver:
   - Add pcie_aux clock to prci driver (Greentime Hu)
   - Use reset-simple in prci driver for PCIe (Greentime Hu)
   - Add SiFive FU740 PCIe host controller driver and DT binding (Paul
     Walmsley, Greentime Hu)

  Synopsys DesignWare PCIe controller driver:
   - Move MSI Receiver init to dw_pcie_host_init() so it is
     re-initialized along with the RC in resume (Jisheng Zhang)
   - Move iATU detection earlier to fix regression (Hou Zhiqiang)

  TI J721E PCIe driver:
   - Add DT binding and TI j721e support for refclk to PCIe connector
     (Kishon Vijay Abraham I)
   - Add host mode and endpoint mode DT bindings for TI AM64 SoC (Kishon
     Vijay Abraham I)

  TI Keystone PCIe controller driver:
   - Use generic config accessors for TI AM65x (K3) to fix regression
     (Kishon Vijay Abraham I)

  Xilinx NWL PCIe controller driver:
   - Add support for coherent PCIe DMA traffic using CCI (Bharat Kumar
     Gogada)
   - Add optional "dma-coherent" DT property (Bharat Kumar Gogada)

  Miscellaneous:
   - Fix kernel-doc warnings (Krzysztof Wilczyński)
   - Remove unused MicroGate SyncLink device IDs (Jiri Slaby)
   - Remove redundant dev_err() for devm_ioremap_resource() failure
     (Chen Hui)
   - Remove redundant initialization (Colin Ian King)
   - Drop redundant dev_err() for platform_get_irq() errors (Krzysztof
     Wilczyński)"

* tag 'pci-v5.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (98 commits)
  riscv: dts: Add PCIe support for the SiFive FU740-C000 SoC
  PCI: fu740: Add SiFive FU740 PCIe host controller driver
  dt-bindings: PCI: Add SiFive FU740 PCIe host controller
  MAINTAINERS: Add maintainers for SiFive FU740 PCIe driver
  clk: sifive: Use reset-simple in prci driver for PCIe driver
  clk: sifive: Add pcie_aux clock in prci driver for PCIe driver
  PCI: brcmstb: Use reset/rearm instead of deassert/assert
  ata: ahci_brcm: Fix use of BCM7216 reset controller
  reset: add missing empty function reset_control_rearm()
  PCI: Allow VPD access for QLogic ISP2722
  PCI/VPD: Add helper pci_get_func0_dev()
  PCI/VPD: Remove pci_vpd_find_tag() SRDT handling
  PCI/VPD: Remove pci_vpd_find_tag() 'offset' argument
  PCI/VPD: Change pci_vpd_init() return type to void
  PCI/VPD: Make missing VPD message less alarming
  PCI/VPD: Remove pci_set_vpd_size()
  x86/PCI: Remove unused alloc_pci_root_info() return value
  MAINTAINERS: Add Jianjun Wang as MediaTek PCI co-maintainer
  PCI: mediatek-gen3: Add system PM support
  PCI: mediatek-gen3: Add MSI support
  ...

4 years agoMerge tag 'pwm/for-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
Linus Torvalds [Wed, 5 May 2021 19:53:16 +0000 (12:53 -0700)]
Merge tag 'pwm/for-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

Pull pwm updates from Thierry Reding:
 "This adds support for the PWM controller found on Toshiba Visconti
  SoCs and converts a couple of drivers to the atomic API.

  There's also a bunch of cleanups and minor fixes across the board"

* tag 'pwm/for-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (35 commits)
  pwm: Reword docs about pwm_apply_state()
  pwm: atmel: Improve duty cycle calculation in .apply()
  pwm: atmel: Fix duty cycle calculation in .get_state()
  pwm: visconti: Add Toshiba Visconti SoC PWM support
  dt-bindings: pwm: Add bindings for Toshiba Visconti PWM Controller
  arm64: dts: rockchip: Remove clock-names from PWM nodes
  ARM: dts: rockchip: Remove clock-names from PWM nodes
  dt-bindings: pwm: rockchip: Add more compatible strings
  dt-bindings: pwm: Convert pwm-rockchip.txt to YAML
  pwm: mediatek: Remove unused function
  pwm: pca9685: Improve runtime PM behavior
  pwm: pca9685: Support hardware readout
  pwm: pca9685: Switch to atomic API
  pwm: lpss: Don't modify HW state in .remove callback
  pwm: sti: Free resources only after pwmchip_remove()
  pwm: sti: Don't modify HW state in .remove callback
  pwm: lpc3200: Don't modify HW state in .remove callback
  pwm: lpc18xx-sct: Free resources only after pwmchip_remove()
  pwm: bcm-kona: Don't modify HW state in .remove callback
  pwm: bcm2835: Free resources only after pwmchip_remove()
  ...

4 years agosmc: disallow TCP_ULP in smc_setsockopt()
Cong Wang [Wed, 5 May 2021 19:40:48 +0000 (12:40 -0700)]
smc: disallow TCP_ULP in smc_setsockopt()

syzbot is able to setup kTLS on an SMC socket which coincidentally
uses sk_user_data too. Later, kTLS treats it as psock so triggers a
refcnt warning. The root cause is that smc_setsockopt() simply calls
TCP setsockopt() which includes TCP_ULP. I do not think it makes
sense to setup kTLS on top of SMC sockets, so we should just disallow
this setup.

It is hard to find a commit to blame, but we can apply this patch
since the beginning of TCP_ULP.

Reported-and-tested-by: syzbot+b54a1ce86ba4a623b7f0@syzkaller.appspotmail.com
Fixes: 734942cc4ea6 ("tcp: ULP infrastructure")
Cc: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: Cong Wang <cong.wang@bytedance.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
4 years agonet: fix nla_strcmp to handle more then one trailing null character
Maciej Żenczykowski [Wed, 5 May 2021 16:58:31 +0000 (09:58 -0700)]
net: fix nla_strcmp to handle more then one trailing null character

Android userspace has been using TCA_KIND with a char[IFNAMESIZ]
many-null-terminated buffer containing the string 'bpf'.

This works on 4.19 and ceases to work on 5.10.

I'm not entirely sure what fixes tag to use, but I think the issue
was likely introduced in the below mentioned 5.4 commit.

Reported-by: Nucca Chen <nuccachen@google.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jiri Pirko <jiri@mellanox.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Fixes: 62794fc4fbf5 ("net_sched: add max len check for TCA_KIND")
Change-Id: I66dc281f165a2858fc29a44869a270a2d698a82b
Signed-off-by: David S. Miller <davem@davemloft.net>
4 years agoMerge tag 'thermal-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/therma...
Linus Torvalds [Wed, 5 May 2021 19:46:48 +0000 (12:46 -0700)]
Merge tag 'thermal-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux

Pull thermal updates from Daniel Lezcano:

 - Remove duplicate error message for the amlogic driver (Tang Bin)

 - Fix spellos in comments for the tegra and sun8i (Bhaskar Chowdhury)

 - Add the missing fifth node on the rcar_gen3 sensor (Niklas Söderlund)

 - Remove duplicate include in ti-bandgap (Zhang Yunkai)

 - Assign error code in the error path in the function
   thermal_of_populate_bind_params() (Jia-Ju Bai)

 - Fix spelling mistake in a comment 'disabed' -> 'disabled' (Colin Ian
   King)

 - Use the device name instead of auto-numbering for a better
   identification of the cooling device (Daniel Lezcano)

 - Improve a bit the division accuracy in the power allocator governor
   (Jeson Gao)

 - Enable the missing third sensor on msm8976 (Konrad Dybcio)

 - Add QCom tsens driver co-maintainer (Thara Gopinath)

 - Fix memory leak and use after free errors in the core code (Daniel
   Lezcano)

 - Add the MDM9607 compatible bindings (Konrad Dybcio)

 - Fix trivial spello in the copyright name for Hisilicon (Hao Fang)

 - Fix negative index array access when converting the frequency to
   power in the energy model (Brian-sy Yang)

 - Add support for Gen2 new PMIC support for Qcom SPMI (David Collins)

 - Update maintainer file for CPU cooling device section (Lukasz Luba)

 - Fix missing put_device on error in the Qcom tsens driver (Guangqing
   Zhu)

 - Add compatible DT binding for sm8350 (Robert Foss)

 - Add support for the MDM9607's tsens driver (Konrad Dybcio)

 - Remove duplicate error messages in thermal_mmio and the bcm2835
   driver (Ruiqi Gong)

 - Add the Thermal Temperature Cooling driver (Zhang Rui)

 - Remove duplicate error messages in the Hisilicon sensor driver (Ye
   Bin)

 - Use the devm_platform_ioremap_resource_byname() function instead of a
   couple of corresponding calls (dingsenjie)

 - Sort the headers alphabetically in the ti-bandgap driver (Zhen Lei)

 - Add missing property in the DT thermal sensor binding (Rafał Miłecki)

 - Remove dead code in the ti-bandgap sensor driver (Lin Ruizhe)

 - Convert the BRCM DT bindings to the yaml schema (Rafał Miłecki)

 - Replace the thermal_notify_framework() call by a call to the
   thermal_zone_device_update() function. Remove the function as well as
   the corresponding documentation (Thara Gopinath)

 - Add support for the ipq8064-tsens sensor along with a set of cleanups
   and code preparation (Ansuel Smith)

 - Add a lockless __thermal_cdev_update() function to improve the
   locking scheme in the core code and governors (Lukasz Luba)

 - Fix multiple cooling device notification changes (Lukasz Luba)

 - Remove unneeded variable initialization (Colin Ian King)

* tag 'thermal-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux: (55 commits)
  thermal/drivers/mtk_thermal: Remove redundant initializations of several variables
  thermal/core/power allocator: Use the lockless __thermal_cdev_update() function
  thermal/core/fair share: Use the lockless __thermal_cdev_update() function
  thermal/core/fair share: Lock the thermal zone while looping over instances
  thermal/core/power_allocator: Update once cooling devices when temp is low
  thermal/core/power_allocator: Maintain the device statistics from going stale
  thermal/core: Create a helper __thermal_cdev_update() without a lock
  dt-bindings: thermal: tsens: Document ipq8064 bindings
  thermal/drivers/tsens: Add support for ipq8064-tsens
  thermal/drivers/tsens: Drop unused define for msm8960
  thermal/drivers/tsens: Replace custom 8960 apis with generic apis
  thermal/drivers/tsens: Fix bug in sensor enable for msm8960
  thermal/drivers/tsens: Use init_common for msm8960
  thermal/drivers/tsens: Add VER_0 tsens version
  thermal/drivers/tsens: Convert msm8960 to reg_field
  thermal/drivers/tsens: Don't hardcode sensor slope
  Documentation: driver-api: thermal: Remove thermal_notify_framework from documentation
  thermal/core: Remove thermal_notify_framework
  iwlwifi: mvm: tt: Replace thermal_notify_framework
  dt-bindings: thermal: brcm,ns-thermal: Convert to the json-schema
  ...

4 years agonet:CXGB4: fix leak if sk_buff is not used
Íñigo Huguet [Wed, 5 May 2021 12:54:50 +0000 (14:54 +0200)]
net:CXGB4: fix leak if sk_buff is not used

An sk_buff is allocated to send a flow control message, but it's not
sent in all cases: in case the state is not appropiate to send it or if
it can't be enqueued.

In the first of these 2 cases, the sk_buff was discarded but not freed,
producing a memory leak.

Signed-off-by: Íñigo Huguet <ihuguet@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
4 years agoFix spelling error from "eleminate" to "eliminate"
Sean Gloumeau [Wed, 5 May 2021 04:15:39 +0000 (00:15 -0400)]
Fix spelling error from "eleminate" to "eliminate"

Spelling error "eleminate" amended to "eliminate".

Signed-off-by: Sean Gloumeau <sajgloumeau@gmail.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: David S. Miller <davem@davemloft.net>