Hi all, Changes since 20201204: The nfs-anna tree gained a conflict against the nfs tree. The block tree gained a conflict against the btrfs tree and a semantic conflict against the bpf-next tree. The rcu tree lost its build failure. The kvm-arm tree gained a difficult conflict against the arm64 tree so I used the version from next-20201203. The staging tree gained a semantic conflict against the tip tree. Non-merge commits (relative to Linus' tree): 10267 9437 files changed, 716509 insertions(+), 173023 deletions(-) ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig and htmldocs. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 327 trees (counting Linus' and 85 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (ab91292cb3e9 Merge tag 'char-misc-5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) Merging fixes/fixes (4e33a343ac74 powerpc: fix the allyesconfig build) Merging kbuild-current/fixes (7d32358be8ac kbuild: avoid split lines in .mod files) Merging arc-current/for-curr (3a71e423133a ARC: build: use $(READELF) instead of hard-coded readelf) Merging arm-current/fixes (9fa2e7af3d53 ARM: 9019/1: kprobes: Avoid fortify_panic() when copying optprobe template) Merging arm64-fixes/for-next/fixes (929c1f3384d7 arm64: mte: fix prctl(PR_GET_TAGGED_ADDR_CTRL) if TCF0=NONE) Merging arm-soc-fixes/arm/fixes (ae597565d13f Merge tag 'optee-valid-memory-type-for-v5.11' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes) Merging drivers-memory-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging m68k-current/for-linus (50c5feeea0af ide/macide: Convert Mac IDE driver to platform driver) Merging powerpc-fixes/fixes (a1ee28117077 powerpc/64s/powernv: Fix memory corruption when saving SLB entries on MCE) Merging s390-fixes/fixes (b1cae1f84a0f s390: fix irq state tracing) Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) Merging net/master (edd2410b165e net: mscc: ocelot: fix dropping of unknown IPv4 multicast on Seville) Merging bpf/master (12c8a8ca117f xsk: Return error code if force_zc is set) Merging ipsec/master (48f486e13ffd net: xfrm: fix memory leak in xfrm_user_policy()) Merging netfilter/master (bbe2ba04c5a9 Merge tag 'net-5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging ipvs/master (bbe2ba04c5a9 Merge tag 'net-5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging wireless-drivers/master (74a8c816fa8f rtw88: debug: Fix uninitialized memory in debugfs code) Merging mac80211/master (bdeca45a0cc5 mac80211: set SDATA_STATE_RUNNING for monitor interfaces) Merging rdma-fixes/for-rc (b65054597872 Linux 5.10-rc6) Merging sound-current/for-linus (c72b9bfe0f91 ALSA: hda/realtek: make bass spk volume adjustable on a yoga laptop) Merging sound-asoc-fixes/for-linus (7dd105ff02c8 Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus) Merging regmap-fixes/for-linus (e6e9354b5830 regmap: Remove duplicate `type` field from regmap `regcache_sync` trace event) Merging regulator-fixes/for-linus (291de1d102fa regulator: axp20x: Fix DLDO2 voltage control register mask for AXP22x) Merging spi-fixes/for-linus (9a1cddca6c95 Merge remote-tracking branch 'spi/for-5.10' into spi-linus) Merging pci-current/for-linus (cce14622a703 PCI: Add function 1 DMA alias quirk for Marvell 9215 SATA controller) Merging driver-core.current/driver-core-linus (f8394f232b1e Linux 5.10-rc3) Merging tty.current/tty-linus (c8bcd9c5be24 tty: Fix ->session locking) Merging usb.current/usb-linus (a4b98a7512f1 usb: gadget: f_fs: Use local copy of descriptors for userspace copy) Merging usb-gadget-fixes/fixes (129aa9734559 usb: raw-gadget: fix memory leak in gadget_setup) Merging usb-serial-fixes/usb-linus (3f203f057edf USB: serial: kl5kusb105: fix memleak on open) Merging usb-chipidea-fixes/for-usb-fixes (e6c11a2dcaec usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul) Merging phy/fixes (fb89b2544b64 phy: mediatek: fix spelling mistake in Kconfig "veriosn" -> "version") Merging staging.current/staging-linus (418baf2c28f3 Linux 5.10-rc5) Merging char-misc.current/char-misc-linus (264f53b41946 Revert "mei: virtio: virtualization frontend driver") Merging soundwire-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging thunderbolt-fixes/fixes (600c0849cf86 thunderbolt: Fix use-after-free in remove_unplugged_switch()) Merging input-current/for-linus (8c3b55a299c3 Input: atmel_mxt_ts - fix lost interrupts) Merging crypto-current/master (c3a98c3ad5c0 crypto: x86/poly1305 - add back a needed assignment) Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) Merging vfio-fixes/for-linus (e4eccb853664 vfio/pci: Bypass IGD init in case of -ENODEV) Merging kselftest-fixes/fixes (7d764b685ee1 selftests: binderfs: use SKIP instead of XFAIL) Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) Merging dmaengine-fixes/fixes (418baf2c28f3 Linux 5.10-rc5) Merging backlight-fixes/for-backlight-fixes (bbf5c979011a Linux 5.9) Merging mtd-fixes/mtd/fixes (9c8f45d970a3 mtd: rawnand: xway: Do not force a particular software ECC engine) Merging mfd-fixes/for-mfd-fixes (bbf5c979011a Linux 5.9) Merging v4l-dvb-fixes/fixes (cc2ff9730e0f media: vidtv: fix kernel-doc markups) Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) Merging mips-fixes/mips-fixes (ac3b57adf87a MIPS: Alchemy: Fix memleak in alchemy_clk_setup_cpu) Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) Merging omap-fixes/fixes (f1dc15cd7fc1 ARM: dts: OMAP3: disable AES on N950/N9) Merging kvm-fixes/master (c2b1209d852f MAINTAINERS: Update email address for Sean Christopherson) Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390) Merging hwmon-fixes/hwmon (bce776f10069 hwmon: (ina3221) Fix PM usage counter unbalance in ina3221_write_enable) Merging nvdimm-fixes/libnvdimm-fixes (88b67edd7247 dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX) Merging btrfs-fixes/next-fixes (462b8e885b92 Merge branch 'misc-5.10' into next-fixes) Merging vfs-fixes/fixes (4bbf439b09c5 fix return values of seq_read_iter()) Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()) Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) Merging drivers-x86-fixes/fixes (c9aa128080cb platform/x86: touchscreen_dmi: Add info for the Irbis TW118 tablet) Merging samsung-krzk-fixes/fixes (cd12e4f14f7c CREDITS: remove trailing white spaces) Merging pinctrl-samsung-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging devicetree-fixes/dt/linus (bdac39a3bd28 dt-bindings: clock: imx5: fix example) Merging scsi-fixes/fixes (eeaf06af6f87 scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()") Merging drm-fixes/drm-fixes (de9b485d1dc9 Merge tag 'drm-misc-fixes-2020-12-03' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (ccc9e67ab26f drm/i915/display: Defer initial modeset until after GGTT is initialised) Merging mmc-fixes/fixes (c0d638a03bc5 mmc: mediatek: mark PM functions as __maybe_unused) Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-rc1) Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2) Merging hyperv-fixes/hyperv-fixes (5f1251a48c17 video: hyperv_fb: Fix the cache type when mapping the VRAM) Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) Merging risc-v-fixes/fixes (30aca1bacb39 RISC-V: fix barrier() use in <vdso/processor.h>) Merging pidfd-fixes/fixes (aabe19b82793 nsproxy: use put_nsproxy() in switch_task_namespaces()) Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake) Merging spdx/spdx-linus (3cea11cd5e3b Linux 5.10-rc2) Merging gpio-intel-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging pinctrl-intel-fixes/fixes (5f714771d01e pinctrl: baytrail: Avoid clearing debounce value when turning it off) Merging erofs-fixes/fixes (a30573b3cdc7 erofs: fix setting up pcluster for temporary pages) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (3084db0e0d50 kunit: fix display of failed expectations for strings) Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) Merging memblock-fixes/fixes (b9bc36704cca ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations) Merging drm-misc-fixes/for-linux-next-fixes (fd4e788e971c drm/omap: sdi: fix bridge enable/disable) Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang) Merging kbuild/for-next (f5037e22315c kconfig: clean up header inclusion) Merging compiler-attributes/compiler-attributes (196793946264 Compiler Attributes: remove CONFIG_ENABLE_MUST_CHECK) Merging dma-mapping/for-next (7679325702c9 selftests/dma: add test application for DMA_MAP_BENCHMARK) Merging asm-generic/master (8eb42bcea5ae Merge branch 'asm-generic-fixes' into asm-generic) Merging arc/for-next (def9d2780727 Linux 5.5-rc7) Merging arm/for-next (40bd54f12902 Merge branch 'devel-stable' into for-next) Merging arm64/for-next/core (ecc28f75f519 Merge remote-tracking branch 'arm64/for-next/iommu/core' into for-next/core) Merging arm-perf/for-next/perf (ce4b2c01781a arm64: Fix build failure when HARDLOCKUP_DETECTOR_PERF is enabled) Merging arm-soc/for-next (33fa6976a384 soc: document merges) Merging amlogic/for-next (685aa8d083e1 Merge branch 'v5.11/soc' into tmp/aml-rebuild) Merging aspeed/for-next (41707a524026 Merge branches 'soc-for-v5.11' and 'defconfig-for-v5.11' into for-next) Merging at91/at91-next (e77be1651978 Merge branches 'at91-drivers', 'at91-dt' and 'at91-defconfig' into at91-next) Merging drivers-memory/for-next (1133e15678af Merge branch 'mem-ctrl-next' into for-next) Merging imx-mxs/for-next (09690c0e0d1c Merge branch 'imx/defconfig' into for-next) Merging keystone/next (b2a8f6ce4bdc Merge branch 'for_5.11/drivers-soc' into next) Merging mediatek/for-next (727bfb2c55b0 Merge branch 'v5.10-next/soc' into for-next) Merging mvebu/for-next (dc14300bb67b Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (06d6b9e10f25 Merge branch 'omap-for-v5.11/dt' into for-next) Merging qcom/for-next (d7288346e0a4 Merge branches 'arm64-for-5.11', 'arm64-defconfig-for-5.11', 'drivers-for-5.11' and 'dts-for-5.11' into for-next) Merging raspberrypi/for-next (278407a53c3b ARM: dts: bcm283x: increase dwc2's RX FIFO size) Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) Merging renesas/next (c51a6c86347a Merge branch 'renesas-drivers-for-v5.11' into renesas-next) Merging reset/reset/next (d06c4dec98b6 reset-controller: ti: force the write operation when assert or deassert) Merging rockchip/for-next (e15c5c9836dc Merge branch 'v5.11-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (72f4b57a4d4b Merge branch 'next/drivers' into for-next) Merging scmi/for-linux-next (b65054597872 Linux 5.10-rc6) Merging stm32/stm32-next (814fddb955f8 ARM: multi_v7_defconfig: enable STM32 dfsdm audio support) Merging sunxi/sunxi/for-next (9e3b3fad3579 Merge branch 'sunxi/fixes-for-5.10' into sunxi/for-next) Merging tegra/for-next (b11a0dfbd316 Merge branch for-5.11/arm64/defconfig into for-next) Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) Merging ti-k3-new/ti-k3-next (de7caab0974f Merge branch 'ti-k3-dts-next' into ti-k3-next) Merging clk/clk-next (9dc1f9729380 Merge branch 'clk-qcom' into clk-next) Merging clk-samsung/for-next (44a9e78f9242 clk: samsung: Prevent potential endless loop in the PLL ops) Merging csky/linux-next (ba3b26607f55 csky: Optimize atomic operations with correct barrier usage) Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>) Merging ia64/next (c331649e6371 ia64: Use libata instead of the legacy ide driver in defconfigs) Merging m68k/for-next (a7b5458ce73b m68k: Fix WARNING splat in pmac_zilog driver) Merging m68knommu/for-next (3237f7dedb6d m68k: m68328: remove duplicate code) Merging microblaze/next (ed2124c0b9a8 microblaze: add support for TIF_NOTIFY_SIGNAL) Merging mips/mips-next (4f1682b8a97d MIPS: Move memblock_dump_all() to the end of setup_arch()) Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>) Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through) Merging openrisc/for-next (d8398bf840f8 openrisc: add local64.h to fix blk-iocost build) Merging parisc-hd/for-next (19621e5fd02b parisc: Switch to clockevent based timers) CONFLICT (content): Merge conflict in arch/parisc/kernel/time.c Applying: revert the rest of "parisc: use legacy_timer_tick" Merging powerpc/next (c9344769e2b4 selftests/powerpc: Fix uninitialized variable warning) Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) Merging soc-fsl/next (e95f287deed2 soc: fsl: handle RCPM errata A-008646 on SoC LS1021A) Merging risc-v/for-next (b5b11a8ac4b5 RISC-V: Move dynamic relocation section under __init) Merging s390/for-next (a184e7e2b71c Merge branch 'features' into for-next) CONFLICT (content): Merge conflict in arch/s390/include/asm/mmu_context.h Merging sh/for-next (b0cfc315ff38 sh: fix syscall tracing) Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) Merging uml/linux-next (9a5085b3fad5 um: Call pgtable_pmd_page_dtor() in __pmd_free_tlb()) Merging xtensa/xtensa-for-next (dc293f210690 xtensa: uaccess: Add missing __user to strncpy_from_user() prototype) Merging fscrypt/master (4a4b8721f1a5 fscrypt: simplify master key locking) Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) Merging btrfs/for-next (219d4f384127 Merge branch 'for-next-next-v5.10-20201201' into for-next-20201201) Merging ceph/master (62575e270f66 ceph: check session state after bumping session->s_seq) Merging cifs/for-next (ea64370bcae1 cifs: refactor create_sd_buf() and and avoid corrupting the buffer) Merging configfs/for-next (65cdb4a214c0 configfs: fix kernel-doc markup issue) Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) Merging erofs/dev (1b2b66d55670 erofs: remove a void EROFS_VERSION macro set in Makefile) Merging exfat/dev (f9893351acae Merge tag 'kconfig-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging ext3/for_next (d2bc88b6e0fd Pull reiserfs disk corruption handling fix.) Merging ext4/dev (f902b2165010 ext4: fix bogus warning in ext4_update_dx_flag()) Merging f2fs/dev (fb51dab71878 f2fs: fix race of pending_pages in decompression) Merging fsverity/fsverity (bde493349025 fs-verity: move structs needed for file signing to UAPI header) Merging fuse/for-next (9d769e6aa252 fuse: support SB_NOSEC flag to improve write performance) Merging jfs/jfs-next (c61b3e483900 jfs: Fix array index bounds check in dbAdjTree) Merging nfs/linux-next (bf701b765eaa NFS: switch nfsiod to be an UNBOUND workqueue.) Merging nfs-anna/linux-next (861b1da5a534 SUNRPC: Keep buf->len in sync with xdr->nwords when expanding holes) CONFLICT (content): Merge conflict in net/sunrpc/xdr.c Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class) Merging cel/cel-next (4d1d4f30deed nfsd: Record NFSv4 pre/post-op attributes as non-atomic) Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret) Merging overlayfs/overlayfs-next (c11faf32599f ovl: fix incorrect extent info in metacopy case) Merging ubifs/next (e2a05cc7f822 ubifs: mount_ubifs: Release authentication resource in error handling path) Merging v9fs/9p-next (324a158fe535 fs: 9p: add generic splice_write file operation) Merging xfs/for-next (eb8409071a1d xfs: revert "xfs: fix rmap key and record comparison functions") Merging zonefs/for-next (48bfd5c6fac1 zonefs: document the explicit-open mount option) Merging iomap/iomap-for-next (1a31182edd00 iomap: Call inode_dio_end() before generic_write_sync()) Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) Merging file-locks/locks-next (8d1ddb5e7937 fcntl: Fix potential deadlock in send_sig{io, urg}()) Merging vfs/for-next (61c207915a76 Merge branches 'work.sparc', 'work.epoll', 'work.sparc32' and 'regset.followup' into for-next) Merging printk/for-next (eb4e76080fcf Merge branch 'for-5.10-pr_cont-fixup' into for-next) Merging pci/next (46f821a9cff2 Merge branch 'remotes/lorenzo/pci/misc') Merging pstore/for-next/pstore (26fecbf7602d pstore: Move kmsg_bytes default into Kconfig) Merging hid/for-next (cdaa1e42b483 Merge branch 'for-5.10/upstream-fixes' into for-next) Merging i2c/i2c/for-next (c80de4722a01 Merge branch 'i2c/for-current' into i2c/for-next) Merging i3c/i3c/next (015cbe1f0506 i3c: Resign from my maintainer role) Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) Merging hwmon-staging/hwmon-next (a19028293d6c dt-bindings: hwmon: Add documentation for ltc2992) Merging jc_docs/docs-next (f5889e70b9cc scripts: get_feat.pl: reduce table width for all features output) Merging v4l-dvb/master (63288c829b1a media: pixfmt-compressed.rst: fix 'bullet' formatting) CONFLICT (content): Merge conflict in MAINTAINERS Merging v4l-dvb-next/master (d0a9fffedca1 docs: fs: api-summary.rst: get rid of kernel-doc include) Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) Merging pm/linux-next (c35cc6e0cf05 Merge branch 'acpi-scan' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (32c855670808 cpufreq: vexpress-spc: Add missing MODULE_ALIAS) Merging cpupower/cpupower (748f0d70087c cpupower: Provide online and offline CPU information) Merging devfreq/devfreq-next (98fd9972ed60 PM / devfreq: tegra20: Deprecate in a favor of emc-stat based driver) Merging opp/opp/linux-next (ed40e33c0b91 opp: Reduce the size of critical section in _opp_kref_release()) Merging thermal/thermal/linux-next (e57eb8b5050c thermal: imx8mm: Disable the clock on probe failure) Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') Merging dlm/next (4f19d071f9be fs: dlm: check on existing node address) Merging swiotlb/linux-next (fc0021aa340a swiotlb: remove the tbl_dma_addr argument to swiotlb_tbl_map_single) Merging rdma/for-next (f93c39bc9547 RDMA/hns: Add support for QP stash) CONFLICT (content): Merge conflict in include/linux/dma-mapping.h Merging net-next/master (4054eebf0fb0 Merge branch 'r8169-improve-rtl_rx-and-NUM_RX_DESC-handling') Applying: fix up for "xdp: Handle MEM_TYPE_XSK_BUFF_POOL correctly in xdp_return_buff()" Merging bpf-next/for-next (34da87213d3d selftests/bpf: Test bpf_sk_storage_get in tcp iterators) Merging ipsec-next/master (c7a5899eb26e xfrm: redact SA secret with lockdown confidentiality) Merging mlx5-next/mlx5-next (04b222f95773 RDMA/mlx5: Remove IB representors dead code) Merging netfilter-next/master (04295878beac netfilter: use actual socket sk for REJECT action) Merging ipvs-next/master (04295878beac netfilter: use actual socket sk for REJECT action) Merging wireless-drivers-next/master (9eb597c74483 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging bluetooth/master (f71b680cb35f Bluetooth: Set missing suspend task bits) Merging mac80211-next/master (0064c5c1b3bf net: xfrm: use core API for updating/providing stats) Merging gfs2/for-next (6e5c4ea37a99 gfs2: in signal_our_withdraw wait for unfreeze of _this_ fs only) Merging mtd/mtd/next (22ca56a34b32 mtd: devices: powernv_flash: Add function names to headers and fix 'dev') Merging nand/nand/next (21ad647ff44f mtd: rawnand: gpmi: fix reference count leak in gpmi ops) Merging spi-nor/spi-nor/next (ad624dfd7bb6 mtd: spi-nor: micron-st: allow using MT35XU512ABA in Octal DTR mode) Merging crypto/master (0464e0ef4f14 crypto: aegis128 - avoid spurious references crypto_aegis128_update_simd) Merging drm/drm-next (5eb3c85e343a Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nouveau_bo.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/gvt.h CONFLICT (content): Merge conflict in drivers/gpu/drm/ast/ast_mode.c Merging amdgpu/drm-next (14133a21f0b5 drm/amdgpu/display: move link_bandwidth_kbps under CONFIG_DRM_AMD_DC_DCN) CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c Merging drm-intel/for-linux-next (9d8fddf8579a drm/i915: Disable outputs during unregister) Merging drm-tegra/drm/tegra/for-next (bf3a3cdcad40 drm/tegra: sor: Disable clocks on error in tegra_sor_init()) Merging drm-misc/for-linux-next (47b1adc1d2a3 drm/panel: s6e63m0: Fix init sequence again) Merging drm-msm/msm-next (e319a1b956f7 drm/msm: add IOMMU_SUPPORT dependency) CONFLICT (content): Merge conflict in include/drm/drm_crtc.h CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c Applying: drm/msm/gem: fix up for "drm/msm: Introduce GEM object funcs" Merging imx-drm/imx-drm/next (099e5bde9bd2 drm/imx: depend on COMMON_CLK to fix compile tests) Merging etnaviv/etnaviv/next (4612bad5701e drm/etnaviv: Add lockdep annotations for context lock) Merging regmap/for-next (4616c509d187 Merge remote-tracking branch 'regmap/for-5.11' into regmap-next) Merging sound/for-next (88a06d6fd6b3 ALSA: rawmidi: Access runtime->avail always in spinlock) Merging sound-asoc/for-next (69701680846a Merge remote-tracking branch 'asoc/for-5.11' into asoc-next) Merging modules/modules-next (147ad605dc12 init: use type alignment for kernel parameters) Merging input/next (7ce8d91b8a84 Input: vsxxxaa - fix Kconfig spelling mistake) Merging block/for-next (b994d23bfe57 Merge branch 'for-5.11/io_uring' into for-next) CONFLICT (content): Merge conflict in fs/f2fs/super.c CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h CONFLICT (content): Merge conflict in fs/f2fs/checkpoint.c CONFLICT (content): Merge conflict in fs/btrfs/check-integrity.c CONFLICT (content): Merge conflict in arch/arm64/include/asm/thread_info.h Applying: fixup for "block: merge struct block_device and struct hd_struct" Applying: fixup for "net: Remove the err argument from sock_from_file" Merging device-mapper/for-next (a2b8b2d97567 dm crypt: export sysfs of kcryptd workqueue) Merging pcmcia/pcmcia-next (70d3a462fc24 pcmcia: omap: Fix error return code in omap_cf_probe()) Merging mmc/next (6f56023aea3a Merge branch 'fixes' into next) Merging mfd/for-mfd-next (0cd3aa995740 mfd: kempld-core: Add support for additional devices) Merging backlight/for-backlight-next (789eb04b6c56 backlight: pwm_bl: Fix interpolation) Merging battery/for-next (faa2cec66798 power: supply: wm831x_power: remove unneeded break) Merging regulator/for-next (9408285b3084 Merge remote-tracking branch 'regulator/for-5.11' into regulator-next) Merging security/next-testing (9dcd47fc1f7d Merge branch 'fixes-v5.10' into next-testing) Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable) Merging integrity/next-integrity (207cdd565dfc ima: Don't modify file descriptor mode on the fly) Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type) Merging safesetid/safesetid-next (03ca0ec13892 LSM: SafeSetID: Fix warnings reported by test bot) Merging selinux/next (3df98d79215a lsm,selinux: pass flowi_common instead of flowi to the LSM hooks) Merging smack/next (9b0072e2b2b5 security/smack: remove unused varible 'rc') Merging tomoyo/master (15269fb19310 tomoyo: Fix typo in comments.) Merging tpmdd/next (bec020d3b6fd tpm: Fix fall-through warnings for Clang) Merging watchdog/master (3650b228f83a Linux 5.10-rc1) Merging iommu/next (4dd6ce478003 iommu: Fix a check in iommu_check_bind_data()) Merging audit/next (6b3211842a11 audit: replace atomic_add_return()) Merging devicetree/for-next (d7a3fd7f00ee dt-bindings: fsl-imx-drm: fix example compatible string) Merging mailbox/mailbox-for-next (017909281eb0 mailbox: stm32-ipcc: cast void pointers to unsigned long) Merging spi/for-next (23597b99043d Merge remote-tracking branch 'spi/for-5.11' into spi-next) Merging tip/auto-latest (2521bfed6027 Merge branch 'linus' into auto-latest) CONFLICT (content): Merge conflict in tools/power/cpupower/utils/helpers/misc.c CONFLICT (content): Merge conflict in arch/x86/pci/i386.c CONFLICT (content): Merge conflict in Documentation/x86/index.rst Merging clockevents/timers/drivers/next (e588acdb8087 clocksource/drivers/riscv: Make RISCV_TIMER depends on RISCV_SBI) Merging edac/edac-for-next (8763e5cbb958 Merge remote-tracking branch 'ras/edac-spr' into edac-for-next) Merging irqchip/irq/irqchip-next (74cde1a53368 irqchip/gic-v3-its: Unconditionally save/restore the ITS state on suspend) Merging ftrace/for-next (b111545d26c0 tracing: Remove the useless value assignment in test_create_synth_event()) Merging rcu/rcu/next (2c05cc592050 percpu_ref: Print stack trace upon reference-count underflow) Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup) Merging kvm-arm/next (e12a393fa549 Merge remote-tracking branch 'origin/kvm-arm64/psci-relay' into kvmarm-master/queue) Merging kvm-ppc/kvm-ppc-next (cf59eb13e151 KVM: PPC: Book3S: Fix symbol undeclared warnings) Merging kvms390/next (d121365715a0 s390/gmap: make gmap memcg aware) Merging xen-tip/linux-next (65cae18882f9 x86/xen: don't unbind uninitialized lock_kicker_irq) Merging percpu/for-next (eb4c8d15efda Merge branch 'for-5.11' into for-next) Merging workqueues/for-next (ac87f8ff6cf1 workqueue: Kick a worker based on the actual activation of delayed works) Merging drivers-x86/for-next (912b341585e3 platform/x86: mlx-platform: Remove PSU EEPROM from MSN274x platform configuration) Merging chrome-platform/for-next (de0f49487db3 platform/chrome: cros_ec_typec: Register partner altmodes) Merging hsi/for-next (8a77ed6d1fdd HSI: core: fix a kernel-doc markup) Merging leds/for-next (98650b087417 leds: turris-omnia: check for LED_COLOR_ID_RGB instead LED_COLOR_ID_MULTI) Merging ipmi/for-next (368ffd9adc7a ipmi: msghandler: Suppress suspicious RCU usage warning) Merging driver-core/driver-core-next (784b2c48ac12 driver core: auxiliary bus: Fix auxiliary bus shutdown null auxdrv ptr) Merging usb/usb-next (e3541d5de544 usb: mtu3: mtu3_debug: remove an unused struct member) Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.) Merging usb-serial/usb-next (daa919196be4 USB: serial: cp210x: clean up dtr_rts()) Merging usb-chipidea-next/for-usb-next (5126075ac4cf usb: chipidea: ci_hdrc_imx: Use of_device_get_match_data()) Merging phy-next/next (18b648322d44 phy: mediatek: statify mtk_hdmi_phy_driver) CONFLICT (content): Merge conflict in drivers/phy/samsung/phy-exynos-pcie.c CONFLICT (content): Merge conflict in MAINTAINERS Merging tty/tty-next (e0efb3168d34 tty: Remove dead termiox code) Merging char-misc/char-misc-next (888982a84752 Merge tag 'mhi-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-next) CONFLICT (content): Merge conflict in drivers/misc/habanalabs/common/memory.c Merging extcon/extcon-next (54589b557a8d extcon: fsa9480: Support TI TSU6111 variant) Merging soundwire/next (17e0da0b8979 soundwire: intel: fix another unused-function warning) Merging thunderbolt/next (db0746e3399e thunderbolt: Add support for Intel Maple Ridge) Merging vfio/next (bccce80bbd44 vfio-ccw: Wire in the request callback) Merging staging/staging-next (138f3e126548 Staging: rtl8723bs/core fix brace coding style issues in rtw_ioctl_set.c) CONFLICT (modify/delete): Documentation/devicetree/bindings/iio/adc/mt6577_auxadc.txt deleted in staging/staging-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/iio/adc/mt6577_auxadc.txt left in tree. $ git rm -f Documentation/devicetree/bindings/iio/adc/mt6577_auxadc.txt Applying: fixup for "irq_work: Cleanup" Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr) Merging icc/icc-next (abb888d86f62 Merge branch 'icc-5.11' into HEAD) Merging dmaengine/next (5d051f37f49d dmaengine: ti: drop of_match_ptr and mark of_device_id table as maybe unused) CONFLICT (content): Merge conflict in drivers/dma/idxd/submit.c CONFLICT (content): Merge conflict in drivers/dma/idxd/registers.h CONFLICT (content): Merge conflict in drivers/dma/idxd/device.c Merging cgroup/for-next (5a7b5f32c5aa cgroup/cgroup.c: replace 'of->kn->priv' with of_cft()) Merging scsi/for-next (aa6a6ffe922b Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (492096ecfa39 scsi: target: core: Fix fall-through warnings for Clang) Merging vhost/linux-next (fb202878ae6b vdpa: ifcvf: Use dma_set_mask_and_coherent to simplify code) Merging rpmsg/for-next (ca08b94fd559 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (0f8d9ac8978b Merge branch 'devel' into for-next) Merging gpio-brgl/gpio/for-next (48f32a835373 gpio: mvebu: switch pwm duration registers to regmap) CONFLICT (content): Merge conflict in drivers/gpio/gpiolib-acpi.c Merging gpio-intel/for-next (e709a7b5a066 gpiolib: acpi: Make Intel GPIO tree official for GPIO ACPI work) Merging pinctrl/for-next (9b185cd4fdca Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (0b74e40a4e41 pinctrl: baytrail: Avoid clearing debounce value when turning it off) Merging pinctrl-samsung/for-next (c5564a50d990 pinctrl: samsung: s3c24xx: remove unneeded break) Merging pwm/for-next (45b6efd75c8f pwm: keembay: Fix build failure with -Os) Merging userns/for-next (a1142ad21375 Merge of signal-for-v5.11, and exec-for-v5.11 for testing in linux-next) CONFLICT (content): Merge conflict in kernel/bpf/task_iter.c Merging ktest/for-next (ff131efff141 ktest.pl: Fix spelling mistake "Cant" -> "Can't") Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) Merging kselftest/next (c2e46f6b3e35 selftests/cgroup: Fix build on older distros) Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") Merging livepatching/for-next (59fc1e476962 Merge branch 'for-5.10/flive-patching' into for-next) Merging coresight/next (66a09659259c coresight: remove broken __exit annotations) Merging rtc/rtc-next (ce9af8939202 rtc: s3c: Remove dead code related to periodic tick handling) Merging nvdimm/libnvdimm-for-next (a1b8638ba132 Linux 5.9-rc7) Merging at24/at24/for-next (3650b228f83a Linux 5.10-rc1) Merging ntb/ntb-next (75b6f6487ced ntb: intel: add Intel NTB LTR vendor support for gen4 NTB) Merging seccomp/for-next/seccomp (2c07343abd89 selftests/seccomp: Update kernel config) CONFLICT (content): Merge conflict in arch/csky/include/asm/Kbuild Merging kspp/for-next/kspp (09162bc32c88 Linux 5.10-rc4) Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2) Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) Merging slimbus/for-next (6790dc4a58f3 slimbus: qcom-ngd-ctrl: fix SSR dependencies) CONFLICT (content): Merge conflict in drivers/slimbus/Kconfig Merging nvmem/for-next (292b72c982a6 nvmem: imx-ocotp: add support for the unaliged word count) Merging xarray/main (80c1dbebf308 XArray: Fix splitting to non-zero orders) Merging hyperv/hyperv-next (b0c03eff79a6 drivers: hv: vmbus: Fix checkpatch SPLIT_STRING) Merging auxdisplay/auxdisplay (351dcacc6d77 auxdisplay: panel: Remove redundant charlcd_ops structures) Merging kgdb/kgdb/for-next (d081a6e35316 kdb: Fix pager search for multi-line strings) Merging pidfd/for-next (4e62d55d77bb selftests: openat2: add RESOLVE_ conflict test) Merging hmm/hmm (3650b228f83a Linux 5.10-rc1) Merging fpga/for-next (aaf8fe39c952 Revert "fpga: dfl: fix the definitions of type & feature_id for dfl devices") Merging kunit/test (3650b228f83a Linux 5.10-rc1) Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) Merging cfi/cfi/next (5de15b610f78 mtd: hyperbus: add Renesas RPC-IF driver) Merging kunit-next/kunit (5f6b99d0287d fs: ext4: Modify inode-test.c to use KUnit parameterized testing feature) Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) Merging mhi/mhi-next (4ea6fa2cb921 mhi: pci_generic: Fix implicit conversion warning) Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications) CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl Applying: rest of merge fix up for syscall conflict Merging memblock/for-next (5bdba520c1b3 mm: memblock: drop __init from memblock functions to make it inline) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) Merging counters/counters (3650b228f83a Linux 5.10-rc1) Merging akpm-current/current (c564d100b334 lib/lzo/lzo1x_compress.c: make lzogeneric1x_1_compress() static) CONFLICT (content): Merge conflict in mm/memcontrol.c CONFLICT (content): Merge conflict in mm/highmem.c CONFLICT (content): Merge conflict in include/linux/sched.h CONFLICT (content): Merge conflict in include/linux/mm.h CONFLICT (content): Merge conflict in include/linux/memcontrol.h CONFLICT (content): Merge conflict in include/linux/kernel.h CONFLICT (content): Merge conflict in arch/riscv/Kconfig CONFLICT (content): Merge conflict in arch/arc/Kconfig CONFLICT (content): Merge conflict in arch/Kconfig Applying: fixup for "mm: move lruvec stats update functions to vmstat.h" $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (c69848b7e332 secretmem: test: add basic selftest for memfd_secret(2))
Attachment:
pgp5wRLmtiwPS.pgp
Description: OpenPGP digital signature
