Hi all, Changes since 20211020: The gfs2 tree lost its build failure. The tip tree still had its build failure for which I reverted 2 commits. It also gained a conflict against the iommu tree. The kvm tree gained a conflict against the tip tree. The userns tree lost its build failure. The kspp-gustavo tree still had its build failures for which I applied a patch and reverted a commit. The akpm-current tree gained a semantic conflict against the folio tree. Non-merge commits (relative to Linus' tree): 9340 8819 files changed, 566116 insertions(+), 193374 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 340 trees (counting Linus' and 92 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 (2f111a6fd5b5 Merge tag 'ceph-for-5.15-rc7' of git://github.com/ceph/ceph-client) Merging fixes/fixes (3ca706c189db drm/ttm: fix type mismatch error on sparc64) Merging kbuild-current/fixes (0664684e1ebd kbuild: Add -Werror=ignored-optimization-argument to CLANG_FLAGS) Merging arc-current/for-curr (c3ca31ce0ea1 ARC: fix potential build snafu) Merging arm-current/fixes (48ccc8edf5b9 ARM: 9141/1: only warn about XIP address when not compile testing) Merging arm64-fixes/for-next/fixes (596143e3aec3 acpi/arm64: fix next_platform_timer() section mismatch error) Merging arm-soc-fixes/arm/fixes (36b6dcbc1245 Merge tag 'reset-fixes-for-v5.15' of git://git.pengutronix.de/pza/linux into arm/fixes) Merging drivers-memory-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging m68k-current/for-linus (9fde03486402 m68k: Remove set_fs()) Merging powerpc-fixes/fixes (787252a10d94 powerpc/smp: do not decrement idle task preempt count in CPU offline) Merging s390-fixes/fixes (8b7216439e2e s390: add Alexander Gordeev as reviewer) Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) Merging net/master (4225fea1cb28 ptp: Fix possible memory leak in ptp_clock_register()) Merging bpf/master (732b74d64704 virtio-net: fix for skb_over_panic inside big mode) Merging ipsec/master (93ec1320b017 xfrm: fix rcu lock in xfrm_notify_userpolicy()) Merging netfilter/master (d9aaaf223297 netfilter: ebtables: allocate chainstack on CPU local nodes) Merging ipvs/master (d9aaaf223297 netfilter: ebtables: allocate chainstack on CPU local nodes) Merging wireless-drivers/master (603a1621caa0 mwifiex: avoid null-pointer-subtraction warning) Merging mac80211/master (a2083eeb119f cfg80211: scan: fix RCU in cfg80211_add_nontrans_list()) Merging rdma-fixes/for-rc (2dace185caa5 RDMA/irdma: Do not hold qos mutex twice on QP resume) Merging sound-current/for-linus (29664923725a ALSA: usb-audio: Fix microphone sound on Jieli webcam.) Merging sound-asoc-fixes/for-linus (1f1040c78dba Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus) Merging regmap-fixes/for-linus (ec872b2b6554 Merge remote-tracking branch 'regmap/for-5.15' into regmap-linus) Merging regulator-fixes/for-linus (519d81956ee2 Linux 5.15-rc6) Merging spi-fixes/for-linus (6744c839e111 Merge remote-tracking branch 'spi/for-5.15' into spi-linus) Merging pci-current/for-linus (e4e737bb5c17 Linux 5.15-rc2) Merging driver-core.current/driver-core-linus (519d81956ee2 Linux 5.15-rc6) Merging tty.current/tty-linus (519d81956ee2 Linux 5.15-rc6) Merging usb.current/usb-linus (519d81956ee2 Linux 5.15-rc6) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (ec8de6b8cec2 USB: serial: keyspan: fix memleak on probe errors) Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle) Merging phy/fixes (6880fa6c5660 Linux 5.15-rc1) Merging staging.current/staging-linus (519d81956ee2 Linux 5.15-rc6) Merging iio-fixes/fixes-togreg (fe6f45f6ba22 iio: core: check return value when calling dev_set_name()) Merging char-misc.current/char-misc-linus (519d81956ee2 Linux 5.15-rc6) Merging soundwire-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging thunderbolt-fixes/fixes (64570fbc14f8 Linux 5.15-rc5) Merging input-current/for-linus (a02dcde595f7 Input: touchscreen - avoid bitwise vs logical OR warning) Merging crypto-current/master (0e14ef38669c crypto: x86/sm4 - Fix frame pointer stack corruption) Merging vfio-fixes/for-linus (42de956ca7e5 vfio/ap_ops: Add missed vfio_uninit_group_dev()) Merging kselftest-fixes/fixes (519d81956ee2 Linux 5.15-rc6) Merging modules-fixes/modules-linus (0d67e332e6df module: fix clang CFI with MODULE_UNLOAD=n) Merging dmaengine-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (f60f5741002b mtd: rawnand: qcom: Update code word value for raw read) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (206704a1fe0b media: atomisp: restore missing 'return' statement) Merging reset-fixes/reset/fixes (3ad60b4b3570 reset: socfpga: add empty driver allowing consumers to probe) Merging mips-fixes/mips-fixes (740da9d7ca4e MIPS: Revert "add support for buggy MT7621S core detection") Merging at91-fixes/at91-fixes (dbe68bc9e82b ARM: dts: at91: sama7g5ek: to not touch slew-rate for SDMMC pins) Merging omap-fixes/fixes (80d680fdccba ARM: dts: omap3430-sdp: Fix NAND device node) Merging kvm-fixes/master (9f1ee7b169af KVM: SEV-ES: reduce ghcb_sa_len to 32 bits) Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu) Merging hwmon-fixes/hwmon (ada61aa0b118 hwmon: Fix possible memleak in __hwmon_device_register()) Merging nvdimm-fixes/libnvdimm-fixes (d55174cccac2 nvdimm/pmem: fix creating the dax group) Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) Merging btrfs-fixes/next-fixes (d7395f03c79c Merge branch 'misc-5.15' into next-fixes) Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx()) Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging drivers-x86-fixes/fixes (7df227847ab5 platform/x86: int1092: Fix non sequential device mode handling) Merging samsung-krzk-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging pinctrl-samsung-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging devicetree-fixes/dt/linus (b2d70c0dbf27 dt-bindings: drm/bridge: ti-sn65dsi86: Fix reg value) Merging scsi-fixes/fixes (4e5483b8440d scsi: ufs: ufs-pci: Force a full restore after suspend-to-disk) Merging drm-fixes/drm-fixes (519d81956ee2 Linux 5.15-rc6) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (59be177a909a drm/i915: Remove memory frequency calculation) Merging mmc-fixes/fixes (162079f2dccd mmc: winbond: don't build on M68K) Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) Merging gnss-fixes/gnss-linus (e73f0f0ee754 Linux 5.14-rc1) Merging hyperv-fixes/hyperv-fixes (b0674bc214ce hypverv/vmbus: include linux/bitops.h) Merging soc-fsl-fixes/fix (c1e64c0aec8c soc: fsl: qe: fix static checker warning) Merging risc-v-fixes/fixes (3ef6ca4f354c checksyscalls: Unconditionally ignore fstat{,at}64) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) Merging fpga-fixes/fixes (2a2a79577dda fpga: ice40-spi: Add SPI device ID table) Merging spdx/spdx-linus (519d81956ee2 Linux 5.15-rc6) Merging gpio-brgl-fixes/gpio/for-current (6fda593f3082 gpio: mockup: Convert to use software nodes) Merging gpio-intel-fixes/fixes (1649b8376694 gpio: pca953x: Improve bias setting) Merging pinctrl-intel-fixes/fixes (64570fbc14f8 Linux 5.15-rc5) Merging erofs-fixes/fixes (c40dd3ca2a45 erofs: clear compacted_2b if compacted_4b_initial > totalidx) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (519d81956ee2 Linux 5.15-rc6) Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) Merging memblock-fixes/fixes (6e44bd6d34d6 memblock: exclude NOMAP regions from kmemleak) Merging cel-fixes/for-rc (7d2a07b76933 Linux 5.14) Merging irqchip-fixes/irq/irqchip-fixes (b78f26926b17 irqchip/gic: Work around broken Renesas integration) Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) Merging perf-current/perf/urgent (3ff6d64e68ab libperf tests: Fix test_stat_cpu) Merging efi-fixes/urgent (38fa3206bf44 efi: Change down_interruptible() in virt_efi_reset_system() to down_trylock()) Merging drm-misc-fixes/for-linux-next-fixes (e76c4e810206 drm/panel: ilitek-ili9881c: Fix sync for Feixin K101-IM2BYL02 panel) Merging kbuild/for-next (a8ea7ec588ac [for -next only] kconfig: generate include/generated/rustc_cfg) Merging perf/perf/core (be8ecc57f180 perf srcline: Use long-running addr2line per DSO) Merging compiler-attributes/compiler-attributes (b83a908498d6 compiler_attributes.h: move __compiletime_{error|warning}) Merging dma-mapping/for-next (c2bbf9d1e9ac dma-debug: teach add_dma_entry() about DMA_ATTR_SKIP_CPU_SYNC) Merging asm-generic/master (7efbbe6e1414 qcom_scm: hide Kconfig symbol) Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1) Merging arm/for-next (c03c06cd0ac5 Merge branch 'devel-stable' into for-next) Merging arm64/for-next/core (f90f4ae11855 Merge branch 'for-next/fixes' into for-next/core) Merging arm-perf/for-next/perf (e656972b6986 drivers/perf: Improve build test coverage) Merging arm-soc/for-next (c175536e7eff soc: document merges) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (83e38509109e Merge branch 'v5.16/dt64' into for-next) Merging aspeed/for-next (509d3f2b755f Merge branches 'defconfig-for-v5.16' and 'dt-for-v5.16' into for-next) Merging at91/at91-next (6880fa6c5660 Linux 5.15-rc1) Merging drivers-memory/for-next (3111a22e06df Merge branch 'mem-ctrl-next' into for-next) Merging imx-mxs/for-next (8bd7cd1cc7f0 Merge branch 'imx/maintainers' into for-next) Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) Merging mediatek/for-next (0efac36e9559 Merge branch 'v5.16-tmp/dts64' into for-next) Merging mvebu/for-next (04e78a787b74 arm/arm64: dts: Enable 2.5G Ethernet port on CN9130-CRB) Merging omap/for-next (92d190433bd8 Merge branch 'omap-for-v5.16/gpmc' into for-next) Merging qcom/for-next (35aab56bc55a Merge branches 'arm64-defconfig-for-5.16', 'arm64-for-5.16', 'drivers-for-5.16' and 'dts-for-5.16' into for-next) Merging raspberrypi/for-next (a036b0a5d7d6 ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address) Merging renesas/next (525a6b4bd53f Merge branch 'renesas-arm-dt-for-v5.16' into renesas-next) Merging reset/reset/next (8c81620ac1ac reset: mchp: sparx5: Extend support for lan966x) Merging rockchip/for-next (cc3bcb015bb1 Merge branch 'v5.16-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (3ed6ae3305e0 Merge branch 'for-v5.16/dts-riscv' into for-next) Merging scmi/for-linux-next (b92b4019a797 Merge branch 'for-next/ffa' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (d4b3aaf0f90b ARM: dts: stm32: use usbphyc ck_usbo_48m as USBH OHCI clock on stm32mp151) Merging sunxi/sunxi/for-next (7fb77af71236 Merge branch 'sunxi/dt-for-5.16' into sunxi/for-next) Merging tegra/for-next (bbd827b4de7e Merge branch for-5.16/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 (f46d16cf5b43 arm64: dts: ti: k3-j721e-sk: Add DDR carveout memory nodes) Merging xilinx/for-next (326b5e9db528 Merge branch 'zynqmp/soc' into for-next) Merging clk/clk-next (e88c20ffe7d5 Merge branch 'clk-composite-determine-fix' into clk-next) Merging clk-imx/for-next (e8271eff5d8c clk: imx: Make CLK_IMX8ULP select MXC_CLK) Merging clk-renesas/renesas-clk (2bd9feed2316 clk: renesas: r8a779[56]x: Add MLP clocks) Merging clk-samsung/for-next (651521d396a8 clk: samsung: remove __clk_lookup() usage) Merging csky/linux-next (e21e52ad1e01 csky: Make HAVE_TCM depend on !COMPILE_TEST) Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs) Merging m68k/for-next (8a3c0a74ae87 m68k: defconfig: Update defconfigs for v5.15-rc1) Merging m68knommu/for-next (b7c534f5015b m68knommu: Remove MCPU32 config symbol) Merging microblaze/next (6880fa6c5660 Linux 5.15-rc1) Merging mips/mips-next (169dd5f08a8c MIPS: Loongson64: Add of_node_put() before break) Merging nds32/next (07cd7745c6f2 nds32/setup: remove unused memblock_region variable in setup_memory()) CONFLICT (content): Merge conflict in arch/nds32/Kconfig Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) Merging openrisc/for-next (210893cad279 openrisc: signal: remove unused DEBUG_SIG macro) Merging parisc-hd/for-next (144857444edb parisc/unwind: use copy_from_kernel_nofault()) Merging powerpc/next (8f6aca0e0f26 powerpc/perf: Fix cycles/instructions as PM_CYC/PM_INST_CMPL in power10) Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) Merging risc-v/for-next (9406369ae627 riscv: dts: microchip: use vendor compatible for Cadence SD4HC) Merging s390/for-next (2482e6b6e33c Merge branch 'features' into for-next) Merging sh/for-next (12285ff8667b sh: kdump: add some attribute to function) 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 (ab6ff1fda1e8 uml: x86: add FORCE to user_constants.h) Merging xtensa/xtensa-for-next (bd47cdb78997 xtensa: move section symbols to asm/sections.h) Merging pidfd/for-next (61bc346ce64a uapi/linux/prctl: provide macro definitions for the PR_SCHED_CORE type argument) Merging fscrypt/master (7f595d6a6cdc fscrypt: allow 256-bit master keys with AES-256-XTS) Merging fscache/fscache-next (2bc879c792fa Merge branch 'fscache-remove-old-io' into fscache-next) Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") Merging btrfs/for-next (00c9626f46be Merge branch 'for-next-next-v5.15-20211014' into for-next-20211014) Merging ceph/master (324bfaa1a6cc libceph: drop ->monmap and err initialization) Merging cifs/for-next (08e9f52e2dce cifs: for compound requests, use open handle if possible) Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup()) Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) Merging erofs/dev (622ceaddb764 erofs: lzma compression support) Merging exfat/dev (efc7bd8527d0 exfat: fix incorrect loading of i_blocks for large files) Merging ext3/for_next (e96a1866b405 isofs: Fix out of bound access for corrupted isofs image) Merging ext4/dev (916ff8d5ea0e ext4: prevent partial update of the extent blocks) Merging f2fs/dev (2d03fd8b9014 f2fs: multidevice: support direct IO) Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) Merging fuse/for-next (e15a9a5fca6c fuse: take cache_mask into account in getattr) Merging gfs2/for-next (d000f3b901c3 gfs2: Fix unused value warning in do_gfs2_set_flags()) Merging jfs/jfs-next (c48a14dca2cb JFS: fix memleak in jfs_mount) Merging ksmbd/ksmbd-for-next (0d994cd482ee ksmbd: add buffer validation in session setup) Merging nfs/linux-next (9e1ff307c779 Linux 5.15-rc4) Merging nfs-anna/linux-next (8cfb9015280d NFS: Always provide aligned buffers to the RPC read layers) Merging nfsd/nfsd-next (291cd656da04 NFSD:fix boolreturn.cocci warning) Merging cel/for-next (c20106944eb6 NFSD: Keep existing listeners on portlist error) Merging ntfs3/master (8607954cf255 fs/ntfs3: Check for NULL pointers in ni_try_remove_attr_list) Merging orangefs/for-next (ac2c63757f4f orangefs: Fix sb refcount leak when allocate sb info failed.) Merging overlayfs/overlayfs-next (1dc1eed46f9f ovl: fix IOCB_DIRECT if underlying fs doesn't support direct IO) Merging ubifs/next (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode) Merging v9fs/9p-next (9c4d94dc9a64 net/9p: increase default msize to 128k) Merging xfs/for-next (11a83f4c3930 xfs: remove the xfs_dqblk_t typedef) Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) Merging iomap/iomap-for-next (03b8df8d43ec iomap: standardize tracepoint formatting and storage) Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID) Merging file-locks/locks-next (e9728cc72d91 locks: remove changelog comments) Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next) Merging printk/for-next (c15b5fc054c3 ia64: don't do IA64_CMPXCHG_DEBUG without CONFIG_PRINTK) Merging pci/next (b1e6b59cdeff Merge branch 'remotes/lorenzo/pci/xgene') Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long) Merging hid/for-next (26922a6c2aaf Merge branches 'for-5.16/asus' and 'for-5.16/apple' into for-next) Merging i2c/i2c/for-next (26701d49482a Merge branch 'i2c/for-mergewindow' into i2c/for-next) Merging i3c/i3c/next (a3587e2c0578 i3c: fix incorrect address slot lookup on 64-bit) Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) Merging hwmon-staging/hwmon-next (66ae4d562b6a hwmon: (tmp421) Add of_node_put() before return) Merging jc_docs/docs-next (2df9f7f57905 docs: translations: zh_CN: memory-hotplug.rst: fix a typo) Merging v4l-dvb/master (fd2eda71a47b media: remove myself from dvb media maintainers) Merging v4l-dvb-next/master (b35d3fea2a39 media: allegro: write vui parameters for HEVC) Merging pm/linux-next (7f01eda12647 Merge branch 'acpi-pm' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (b3c08d1ad2bb cpufreq: Fix parameter in parse_perf_domain()) Merging cpupower/cpupower (79a0dc5530a9 tools: cpupower: fix typo in cpupower-idle-set(1) manpage) Merging devfreq/devfreq-next (6b28c7d0781e PM / devfreq: Strengthen check for freq_table) Merging opp/opp/linux-next (27ff8187f13e opp: Fix return in _opp_add_static_v2()) Merging thermal/thermal/linux-next (1dd7128b839f thermal/core: Fix null pointer dereference in thermal_release()) Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) Merging dlm/next (ecd95673142e fs: dlm: avoid comms shutdown delay in release_lockspace) Merging rdma/for-next (71ee1f127543 Merge brank 'mlx5_mkey' into rdma.git for-next) Merging net-next/master (2641b62d2fab phy: micrel: ksz8041nl: do not use power down mode) CONFLICT (content): Merge conflict in tools/testing/selftests/net/forwarding/forwarding.config.sample CONFLICT (content): Merge conflict in net/netfilter/ipvs/ip_vs_ctl.c CONFLICT (content): Merge conflict in include/linux/mlx5/fs.h CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/ice/ice_devlink.c Merging bpf-next/for-next (99aaebfc288a Merge branch 'btf_dump fixes for s390') Merging ipsec-next/master (83688aec17bf net/ipv4/xfrm4_tunnel.c: remove superfluous header files from xfrm4_tunnel.c) Merging mlx5-next/mlx5-next (b8dfed636fc6 net/mlx5: Add priorities for counters in RDMA namespaces) Merging netfilter-next/master (05be94633783 net: ethernet: ixp4xx: Make use of dma_pool_zalloc() instead of dma_pool_alloc/memset()) Merging ipvs-next/master (ffdd33dd9c12 netfilter: core: Fix clang warnings about unused static inlines) Merging wireless-drivers-next/master (9bc0b1aa8b7e Merge tag 'mt76-for-kvalo-2021-10-20' of https://github.com/nbd168/wireless) Merging bluetooth/master (7a517ac9c00b Bluetooth: btsdio: Do not bind to non-removable BCM4345 and BCM43455) Merging mac80211-next/master (171964252189 mac80211: MBSSID support in interface handling) Merging mtd/mtd/next (c13de2386c78 mtd: core: don't remove debugfs directory if device is in use) Merging nand/nand/next (fc9e18f9e987 mtd: rawnand: arasan: Prevent an unsupported configuration) Merging spi-nor/spi-nor/next (df872ab1ffe4 mtd: spi-nor: nxp-spifi: Make use of the helper function devm_platform_ioremap_resource_byname()) Merging crypto/master (06f6e365e2ec crypto: octeontx2 - set assoclen in aead_do_fallback()) Merging drm/drm-next (1176d15f0f6e Merge tag 'drm-intel-gt-next-2021-10-08' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_gem_submit.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_context.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_ttm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_migrate.c Merging drm-misc/for-linux-next (0597ca7b43e4 drm/radeon: use new iterator in radeon_sync_resv) Merging amdgpu/drm-next (019906884a57 drm/amdgpu/vcn3.0: remove intermediate variable) Merging drm-intel/for-linux-next (1af10a97b3a6 drm/i915/display: Add warn_on in intel_psr_pause()) Merging drm-tegra/drm/tegra/for-next (5dccbc9de8f0 drm/tegra: dc: rgb: Allow changing PLLD rate on Tegra30+) Merging drm-msm/msm-next (2203bd0e5c12 drm/msm: uninitialized variable in msm_gem_import()) Merging imx-drm/imx-drm/next (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource()) Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function) Merging regmap/for-next (ec872b2b6554 Merge remote-tracking branch 'regmap/for-5.15' into regmap-linus) Merging sound/for-next (f917c04fac45 ALSA: memalloc: Fix a typo in snd_dma_buffer_sync() description) Merging sound-asoc/for-next (e9cb4d969b85 Merge remote-tracking branch 'asoc/for-5.16' into asoc-next) Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer) Merging input/next (c6ac8f0b4ca9 Input: ili210x - add ili251x firmware update support) Merging block/for-next (4977e4467304 Merge branch 'for-5.16/drivers' into for-next) Merging device-mapper/for-next (dffca4d565b3 dm: Remove redundant flush_workqueue() calls) Merging libata/for-next (1af5f7af2484 pata_radisys: fix checking of DMA state) Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug) Merging mmc/next (738216c1953e memstick: r592: Fix a UAF bug when removing the driver) Merging mfd/for-mfd-next (813c24f4caf3 mfd: altera-sysmgr: Fix a mistake caused by resource_size conversion) Merging backlight/for-backlight-next (3976e974df1f video: backlight: ili9320: Make ili9320_remove() return void) Merging battery/for-next (172d0ccea55c power: bq25890: add return values to error messages) Merging regulator/for-next (0735be7fa1ad Merge remote-tracking branch 'regulator/for-5.16' into regulator-next) Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) Merging integrity/next-integrity (cc4299ea0399 ima: Use strscpy instead of strlcpy) Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) CONFLICT (content): Merge conflict in certs/system_keyring.c Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) Merging selinux/next (15bf32398ad4 security: Return xattr name from security_dentry_init_security()) CONFLICT (content): Merge conflict in include/uapi/linux/audit.h CONFLICT (content): Merge conflict in fs/io_uring.c CONFLICT (content): Merge conflict in fs/io-wq.c Applying: fixup for "io_uring: init opcode in io_init_req()" Merging smack/next (b57d02091b8f Smack: fix W=1 build warnings) Merging tomoyo/master (7d2a07b76933 Linux 5.14) Merging tpmdd/next (f985911b7bc7 crypto: public_key: fix overflow during implicit conversion) Merging watchdog/master (519d81956ee2 Linux 5.15-rc6) Merging iommu/next (145cac8e9cfe Merge branches 'apple/dart', 'arm/mediatek', 'arm/renesas', 'arm/tegra', 'x86/amd', 'x86/vt-d' and 'core' into next) Applying: fix for "iommu/dart: Exclude MSI doorbell from PCIe device IOVA range" Merging audit/next (d9516f346e8b audit: return early if the filter rule has a lower priority) CONFLICT (content): Merge conflict in include/uapi/linux/audit.h Merging devicetree/for-next (f925a97b32f4 of/unittest: Add of_node_put() before return) Merging mailbox/mailbox-for-next (0a5ad4322927 mailbox: mtk-cmdq: Fix local clock ID usage) Merging spi/for-next (c292766c0a54 Merge remote-tracking branch 'spi/for-5.16' into spi-next) Merging tip/auto-latest (5a6f572f84d8 Merge remote-tracking branch 'tip/x86/fpu' into tip-master) CONFLICT (content): Merge conflict in arch/x86/kernel/fpu/signal.c CONFLICT (content): Merge conflict in arch/x86/include/asm/fpu/api.h Applying: Revert "sched: Add wrapper for get_wchan() to keep task blocked" Applying: Revert "x86: Fix get_wchan() to support the ORC unwinder" Merging clockevents/timers/drivers/next (32cf6d0ae0d8 Merge branch 'timers/drivers/armv8.6_arch_timer' into timers/drivers/next) Merging edac/edac-for-next (f889e52436d6 Merge branch 'edac-urgent' into edac-for-next) Merging irqchip/irq/irqchip-next (737e975fe230 Merge branch irq/modular-irqchips into irq/irqchip-next) Merging ftrace/for-next (8d6e90983ade tracing: Create a sparse bitmask for pid filtering) CONFLICT (content): Merge conflict in kernel/kprobes.c Merging rcu/rcu/next (4b246eab4750 rcu/nocb: Make local rcu_nocb_lock_irqsave() safe against concurrent deoffloading) CONFLICT (content): Merge conflict in kernel/rcu/tasks.h Merging kvm/next (a25c78d04c1b Merge commit 'kvm-pagedata-alloc-fixes' into HEAD) CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c CONFLICT (content): Merge conflict in arch/riscv/Kconfig Merging kvm-arm/next (be08c3cf3c5a Merge branch kvm-arm64/pkvm/fixed-features into kvmarm-master/next) Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests) Merging kvms390/next (2ef7843375dc KVM: s390: Add a routine for setting userspace CPU state) Merging xen-tip/linux-next (319933a80fd4 xen/balloon: fix cancelled balloon action) Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next) Merging workqueues/for-next (55df0933be74 workqueue: Introduce show_one_worker_pool and show_one_workqueue.) Merging drivers-x86/for-next (5ecc1e947822 Input: axp20x-pek - Use new soc_intel_is_cht() helper) Merging chrome-platform/for-next (eb057514ccca platform/chrome: cros_ec: Fix spelling mistake "responsed" -> "response") Merging hsi/for-next (4ef69e17eb56 HSI: cmt_speech: unmark comments as kernel-doc) Merging leds/for-next (97b31c1f8eb8 leds: trigger: Disable CPU trigger on PREEMPT_RT) Merging ipmi/for-next (ed83855f1efc ipmi: ipmb: fix dependencies to eliminate build error) Merging driver-core/driver-core-next (b5bc8ac25aa1 Merge 5.15-rc6 into driver-core-next) Merging usb/usb-next (8ef1e58783b9 usb: typec: STUSB160X should select REGMAP_I2C) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (c8345c0500de USB: serial: kl5kusb105: drop line-status helper) Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) Merging tty/tty-next (3968ddcf05fb tty: tty_buffer: Fix the softlockup issue in flush_to_ldisc) Merging char-misc/char-misc-next (8135cc5b270b MAINTAINERS: Update the entry for MHI bus) Merging extcon/extcon-next (f83d7033d4ec dt-bindings: extcon: usbc-tusb320: Add TUSB320L compatible string) Merging phy-next/next (fc2a3a3641af phy: cadence-torrent: Add support to output received reference clock) Merging soundwire/next (abd9a6049bb5 soundwire: qcom: add debugfs entry for soundwire register dump) Merging thunderbolt/next (0a0624a26f9c thunderbolt: Fix -Wrestrict warning) Merging vfio/next (9cef73918e15 vfio: Use cdev_device_add() instead of device_create()) Merging staging/staging-next (d9f32a101e43 staging: r8188eu: Remove redundant 'if' statement) Merging iio/togreg (ef226dcf3d88 dt-bindings: iio: io-channel-mux: allow duplicate channel, labels) Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) Merging icc/icc-next (dfe14674bf7b Merge branch 'icc-rpm' into icc-next) Merging dmaengine/next (635156d94b64 dmaengine: imx-sdma: remove space after sizeof) Merging cgroup/for-next (0061270307f2 cgroup: cgroup-v1: do not exclude cgrp_dfl_root) Merging scsi/for-next (edc5cb40999b Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (83c3a7beaef7 scsi: lpfc: Update lpfc version to 14.0.0.3) Merging vhost/linux-next (d3d74a13e565 virtio_net: clarify tailroom logic) CONFLICT (content): Merge conflict in drivers/net/virtio_net.c Merging rpmsg/for-next (6ee5808de074 Merge branches 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) Merging gpio-brgl/gpio/for-next (f4a20dfac88c gpio: mc33880: Drop if with an always false condition) Merging gpio-intel/for-next (1649b8376694 gpio: pca953x: Improve bias setting) Merging pinctrl/for-next (664bad61ccde Merge branch 'devel' into for-next) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/brcm,cru.yaml Merging pinctrl-intel/for-next (176412f8674b pinctrl: intel: Kconfig: Add configuration menu to Intel pin control) Merging pinctrl-renesas/renesas-pinctrl (f4e260bffcf3 pinctrl: renesas: checker: Prefix common checker output) Merging pinctrl-samsung/for-next (f9d8de699ac4 pinctrl: samsung: support ExynosAutov9 SoC pinctrl) Merging pwm/for-next (3f2b16734914 pwm: mtk-disp: Implement atomic API .get_state()) Merging userns/for-next (e9012e756d30 Merge of per_signal_struct_coredumps-for-v5.16, and ucount-fixes-for-v5.16 for testing in linux-next) Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) Merging kselftest/next (6880fa6c5660 Linux 5.15-rc1) Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' into for-next) Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) Merging rtc/rtc-next (f8d4e4fa51ec rtc: pcf8523: add BSM support) Merging nvdimm/libnvdimm-for-next (e765f13ed126 nvdimm/pmem: move dax_attribute_group from dax to pmem) Merging at24/at24/for-next (762925405482 dt-bindings: at24: add ON Semi CAT24C04 and CAT24C05) Merging ntb/ntb-next (f96cb827ce49 ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data) Merging seccomp/for-next/seccomp (d9bbdbf324cd x86: deduplicate the spectre_v2_user documentation) Merging kspp/for-next/kspp (fdd1e437c7af Merge branch 'for-next/hardening' into for-next/kspp) Merging kspp-gustavo/for-next/kspp (3915822ab3a5 Merge branch 'for-next/cast-function' into for-next/kspp) Applying: fixup for "ftrace: Fix -Wmissing-prototypes errors" Applying: Revert "Makefile: Enable -Wcast-function-type" Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging gnss/gnss-next (0f79ce970e79 gnss: drop stray semicolons) Merging fsi/next (0cd413b5e756 fsi: occ: Add dynamic debug to dump command and response) Merging slimbus/for-next (6880fa6c5660 Linux 5.15-rc1) Merging nvmem/for-next (413333fd6a88 nvmem: imx-ocotp: add support for post processing) Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) Merging hyperv/hyperv-next (9d68cd9120e4 hv_utils: Set the maximum packet size for VSS driver to the length of the receive buffer) Merging auxdisplay/auxdisplay (24ebc044c72e auxdisplay: Replace symbolic permissions with octal permissions) Merging kgdb/kgdb/for-next (f8416aa29185 kernel: debug: Convert to SPDX identifier) Merging hmm/hmm (6880fa6c5660 Linux 5.15-rc1) Merging fpga/for-next (57b44817a8d6 MAINTAINERS: Drop outdated FPGA Manager website) Merging kunit/test (6880fa6c5660 Linux 5.15-rc1) Merging cfi/cfi/next (ff1176468d36 Linux 5.14-rc3) Merging kunit-next/kunit (17ac23eb43f0 kunit: Reset suite count after running tests) 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 mhi/mhi-next (8c61951b372d Merge tag 'soundwire-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next) Merging memblock/for-next (e888fa7bb882 memblock: Check memory add/cap ordering) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) Merging rust/rust-next (a5085d70a3ba MAINTAINERS: Rust) CONFLICT (content): Merge conflict in scripts/kconfig/confdata.c CONFLICT (content): Merge conflict in scripts/Makefile.modfinal CONFLICT (content): Merge conflict in Makefile Applying: Kbuild: fix for "kbuild: split DEBUG_CFLAGS out to scripts/Makefile.debug" Merging cxl/next (ed97afb53365 cxl/pci: Disambiguate cxl_pci further from cxl_mem) Merging folio/for-next (121703c1c817 mm/writeback: Add folio_write_one) CONFLICT (modify/delete): fs/cachefiles/rdwr.c deleted in HEAD and modified in folio/for-next. Version folio/for-next of fs/cachefiles/rdwr.c left in tree. $ git rm -f fs/cachefiles/rdwr.c Applying: fix up for "9p: Convert to using the netfs helper lib to do reads and caching" Merging bitmap/bitmap-master-5.15 (785cb064e2f8 vsprintf: rework bitmap_list_string) Merging zstd/zstd-1.4.10 (464413496acb MAINTAINERS: Add maintainer entry for zstd) Merging efi/next (720dff78de36 efi: Allow efi=runtime) Merging akpm-current/current (d345d2b90870 ipc/ipc_sysctl.c: remove fallback for !CONFIG_PROC_SYSCTL) CONFLICT (content): Merge conflict in mm/mempolicy.c CONFLICT (content): Merge conflict in mm/internal.h CONFLICT (content): Merge conflict in mm/filemap.c CONFLICT (content): Merge conflict in kernel/sched/core.c CONFLICT (content): Merge conflict in kernel/exit.c CONFLICT (content): Merge conflict in include/linux/sched/mm.h CONFLICT (content): Merge conflict in include/linux/migrate.h Applying: fix up for "mm: Add folio flag manipulation functions" $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". CONFLICT (content): Merge conflict in include/linux/page-flags.h Merging akpm/master (1e19a46e1e0d kasan: add kasan mode messages when kasan init)
Attachment:
pgpvtWNMMaiJI.pgp
Description: OpenPGP digital signature
