Hi all, Changes since 20211029: The btrfs tree lost its build failure but gained a conflict against Linus' tree. The drm-misc tree has required a build failure so I applied te same patch. The block tree gained a conflict against Linus' tree. The mailbox tree gained conflicts against the arm-soc and devicetree trees. The scsi tree gained a conflict against the block tree. The userns tree gained a conflict against the staging tree. The folios tree inherited a semantic conflict from the akpm-current tree (a patch from akpm-current was merged into Linus' tree). I have disabled the ntfs file system for now as it fails a powerpc allyesconfig build. Non-merge commits (relative to Linus' tree): 11752 10926 files changed, 663336 insertions(+), 243304 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 343 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 (8bb7eca972ad Linux 5.15) 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 (b9cac915c541 ARC: thread_info.h: correct two typos in a comment) Merging arm-current/fixes (00568b8a6364 ARM: 9148/1: handle CONFIG_CPU_ENDIAN_BE32 in arch/arm/kernel/head.S) Merging arm64-fixes/for-next/fixes (596143e3aec3 acpi/arm64: fix next_platform_timer() section mismatch error) Merging arm-soc-fixes/arm/fixes (76f79231666a Merge tag 'soc-fsl-fix-v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/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 (d853adc7adf6 powerpc/pseries/iommu: Create huge DMA window if no MMIO32 is present) 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 (6de6e46d27ef cls_flower: Fix inability to match GRE/IPIP packets) Merging bpf/master (72f898ca0ab8 r8169: Add device 10ec:8162 to driver r8169) Merging ipsec/master (93ec1320b017 xfrm: fix rcu lock in xfrm_notify_userpolicy()) Merging netfilter/master (2199f562730d ipvs: autoload ipvs on genl access) Merging ipvs/master (2199f562730d ipvs: autoload ipvs on genl access) Merging wireless-drivers/master (603a1621caa0 mwifiex: avoid null-pointer-subtraction warning) Merging mac80211/master (689a0a9f505f cfg80211: correct bridge/4addr mode check) Merging rdma-fixes/for-rc (4f960393a0ee RDMA/qedr: Fix NULL deref for query_qp on the GSI QP) Merging sound-current/for-linus (3ab799201845 ALSA: mixer: fix deadlock in snd_mixer_oss_set_volume) Merging sound-asoc-fixes/for-linus (bc886482dd19 Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus) Merging regmap-fixes/for-linus (38a4b4fb7c73 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 (d81d0e41ed5f spi: spl022: fix Microwire full duplex mode) 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 (519d81956ee2 Linux 5.15-rc6) 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 (d917e679c615 iio: trigger: Fix reference counting) 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 (3906fe9bb7f1 Linux 5.15-rc7) Merging input-current/for-linus (a02dcde595f7 Input: touchscreen - avoid bitwise vs logical OR warning) Merging crypto-current/master (f8690a4b5a1b crypto: x86/sm4 - Fix invalid section entry size) 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 (ca5e83eddc8b Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) 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 (3dd60fb9d95d nvdimm/pmem: stop using q_usage_count as external pgmap refcount) 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 (25f54d08f12f autofs: fix wait name hash calculation in autofs_wait()) 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 (09d9e4d04187 scsi: ufs: ufshpb: Remove HPB2.0 flows) Merging drm-fixes/drm-fixes (b112166a894d MAINTAINERS: dri-devel is for all of drivers/gpu) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (9a4aa3a2f160 drm/i915: Revert 'guc_id' from i915_request tracepoint) Merging mmc-fixes/fixes (90935eb303e0 mmc: tmio: reenable card irqs after the reset callback) 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 (8017c99680fa hyperv/vmbus: include linux/bitops.h) Merging soc-fsl-fixes/fix (7e5e744183bb soc: fsl: dpio: fix qbman alignment error in the virtualization context) Merging risc-v-fixes/fixes (54c5639d8f50 riscv: Fix asan-stack clang build) 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 (c0eee6fbfa2b gpio: mlxbf2.c: Add check for bgpio_init failure) Merging gpio-intel-fixes/fixes (1649b8376694 gpio: pca953x: Improve bias setting) Merging pinctrl-intel-fixes/fixes (3906fe9bb7f1 Linux 5.15-rc7) 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 (87066fdd2e30 Revert "mm/secretmem: use refcount_t instead of atomic_t") 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 (27730c8cd60d perf script: Fix PERF_SAMPLE_WEIGHT_STRUCT support) 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 (8c0fd1262637 dma-buf: acquire name lock before read/write dma_buf.name) Merging kbuild/for-next (7c5c49dc2b80 [for -next only] kconfig: generate include/generated/rustc_cfg) Merging perf/perf/core (624ff63abfd3 perf intel-pt: Support itrace d+o option to direct debug log to stdout) Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) Merging dma-mapping/for-next (9fbd8dc19aa5 dma-mapping: use 'bitmap_zalloc()' when applicable) Merging asm-generic/master (7efbbe6e1414 qcom_scm: hide Kconfig symbol) Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1) Merging arm/for-next (2aa8f79c7509 Merge branch 'devel-stable' into for-next) Merging arm64/for-next/core (e6359798f62d 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 (fdf79096aec7 Merge branch 'arm/drivers' into for-next) 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 (f3c0366411d6 ARM: dts: at91: sama7g5-ek: use blocks 0 and 1 of TCB0 as cs and ce) Merging drivers-memory/for-next (0fcbc3b7bcea 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 (bbe9515ab088 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 (0d5808cf190b Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (9c8df6432a73 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 (9c4c7a13f4c8 Merge branch 'clk-debugfs' 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 (6dbe88e93c35 m68knommu: Remove MCPU32 config symbol) Merging microblaze/next (43bdcbd50043 microblaze: timer: Remove unused properties) Merging mips/mips-next (95b8a5e0111a MIPS: Remove NETLOGIC support) Merging nds32/next (07cd7745c6f2 nds32/setup: remove unused memblock_region variable in setup_memory()) CONFLICT (content): Merge conflict in arch/nds32/Kconfig CONFLICT (content): Merge conflict in arch/nds32/Kbuild 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 (84345349641c parisc: Fix code/instruction patching on PA1.x machines) Merging powerpc/next (81291383ffde powerpc/32e: Ignore ESR in instruction storage interrupt handler) Merging soc-fsl/next (54c8b5b6f8a8 soc: fsl: dpio: rename the enqueue descriptor variable) Merging risc-v/for-next (ffa7a9141bb7 riscv: defconfig: enable DRM_NOUVEAU) CONFLICT (content): Merge conflict in arch/riscv/Makefile Merging s390/for-next (4ab5b2549146 Merge branch 'features' into for-next) Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) 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 (b7e072f9b77f fscrypt: improve a few comments) Merging fscache/fscache-next (cb5484ae3fec fscache: Update the documentation to reflect I/O API changes) Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") Merging btrfs/for-next (764ada313576 Merge branch 'for-next-next-v5.15-20211029' into for-next-20211029) CONFLICT (content): Merge conflict in fs/btrfs/lzo.c Merging ceph/master (324bfaa1a6cc libceph: drop ->monmap and err initialization) Merging cifs/for-next (ae272e34bfa1 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 (a0961f351d82 erofs: don't trigger WARN() when decompression fails) Merging exfat/dev (efc7bd8527d0 exfat: fix incorrect loading of i_blocks for large files) Merging ext3/for_next (d1ccf9fdcfc9 Merge filesystem error notification series from Gabriel.) Merging ext4/dev (916ff8d5ea0e ext4: prevent partial update of the extent blocks) Merging f2fs/dev (10a26878564f f2fs: support fault injection for dquot_initialize()) Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) Merging fuse/for-next (a390ccb316be fuse: add FOPEN_NOFLUSH) Merging gfs2/for-next (e34e6f8133b8 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 (647bc03ba456 ksmbd: don't need 8byte alignment for request length in ksmbd_check_message) Merging nfs/linux-next (01d29f87fcfe NFSv4: Fix a regression in nfs_set_open_stateid_locked()) 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) CONFLICT (content): Merge conflict in include/trace/events/sunrpc.h 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 (9aaa6cc099f6 ubifs: Document sysfs nodes) Merging v9fs/9p-next (9c4d94dc9a64 net/9p: increase default msize to 128k) Merging xfs/for-next (2a09b575074f xfs: use swap() to make code cleaner) 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 (482e00075d66 fs: remove leftover comments from mandatory locking removal) Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next) Merging printk/for-next (ad7fea30c59e Merge branch 'for-5.16' into for-next) Merging pci/next (6de1dedb1db1 Merge branch 'remotes/lorenzo/pci/xgene') Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long) Merging hid/for-next (05a194aaf5e4 Merge branch 'for-5.15/upstream-fixes' into for-next) Merging i2c/i2c/for-next (6bf9e6543811 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 (10f0d2ab9aa6 hwmon: (nct7802) Add of_node_put() before return) Merging jc_docs/docs-next (1f57bd42b77c docs: submitting-patches: make section about the Link: tag more explicit) Merging v4l-dvb/master (57c3b9f55ba8 media: venus: core: Add sdm660 DT compatible and resource struct) Merging v4l-dvb-next/master (320510b91925 media: atomisp: get rid of two unused functions) Merging pm/linux-next (5f6ba0ff183c Merge branch 'acpi-glue' 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 (5cf79c293821 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 (a67a46af4ad6 thermal/core: Deprecate changing cooling device state from userspace) 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 (6d202d9f70a3 RDMA/hns: Use the core code to manage the fixed mmap entries) Merging net-next/master (ae0393500e3b net: bridge: switchdev: fix shim definition for br_switchdev_mdb_notify) Merging bpf-next/for-next (f48ad69097fe selftests/bpf: Fix fclose/pclose mismatch in test_progs) Merging ipsec-next/master (ad57dae8a64d xfrm: Remove redundant fields and related parentheses) Merging mlx5-next/mlx5-next (60dd57c74794 Merge brank 'mlx5_mkey' into rdma.git for-next) Merging netfilter-next/master (241eb3f3ee42 netfilter: ebtables: use array_size() helper in copy_{from,to}_user()) Merging ipvs-next/master (241eb3f3ee42 netfilter: ebtables: use array_size() helper in copy_{from,to}_user()) Merging wireless-drivers-next/master (2619f904b25c Merge tag 'iwlwifi-next-for-kalle-2021-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) Merging bluetooth/master (d6cba4e6d0e2 Bluetooth: btusb: Add support using different nvm for variant WCN6855 controller) Merging mac80211-next/master (62bf703f4423 cfg80211: move offchan_cac_event to a dedicated work) 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 (39ef08517082 crypto: testmgr - fix wrong key length for pkcs1pad) Merging drm/drm-next (31fa8cbce466 drm: Add R10 and R12 FourCC) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_trace.h CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_panel_orientation_quirks.c Merging drm-misc/for-linux-next (b3ec8cdf457e fbdev: Garbage collect fbdev scrolling acceleration, part 1 (from TODO list)) Merging amdgpu/drm-next (5930f124b0bb drm/amdgpu: bump driver version for INFO SENSOR profile mode subquery) Merging drm-intel/for-linux-next (5740211ea442 drm/i915/dmabuf: fix broken build) Merging drm-intel-gt/for-linux-next-gt (5740211ea442 drm/i915/dmabuf: fix broken build) Merging drm-tegra/drm/tegra/for-next (5dccbc9de8f0 drm/tegra: dc: rgb: Allow changing PLLD rate on Tegra30+) Merging drm-msm/msm-next (02d44fde976a drm/msm/dp: fix missing #include) 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 (a8d880671c13 Merge remote-tracking branch 'regmap/for-5.16' into regmap-next) Merging sound/for-next (2672e1970ab0 ALSA: firewire-motu: remove TODO for interaction with userspace about control message) Merging sound-asoc/for-next (226d19fa1127 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 (b43fadb6631f Merge branch 'for-5.16/drivers' into for-next) CONFLICT (content): Merge conflict in fs/io_uring.c CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshpb.c Merging device-mapper/for-next (54d97aac0bb9 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 (348ecd61770f Merge branch 'fixes' into next) Merging mfd/for-mfd-next (818ed35d6425 mfd: tps80031: Remove driver) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/brcm,cru.yaml 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 (7492b724df4d Merge series "Remove TPS80031 driver" from Dmitry Osipenko <digetx@xxxxxxxxx>:) 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 (32ba540f3c2a evm: mark evm_fixmode as __ro_after_init) 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 (0934ad42bb2c smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi) Merging tomoyo/master (7d2a07b76933 Linux 5.14) Merging tpmdd/next (7eba41fe8c7b tpm_tis_spi: Add missing SPI ID) Merging watchdog/master (ee1a0696934a watchdog: bcm63xx_wdt: fix fallthrough warning) Merging iommu/next (6a0df9df4c64 Merge branches 'apple/dart', 'arm/mediatek', 'arm/renesas', 'arm/smmu', '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 (a16c4510683f of/unittest: Disable new dtc node_name_vs_property_name and interrupt_map warnings) Merging mailbox/mailbox-for-next (97961f78e8bc mailbox: imx: support i.MX8ULP S4 MU) CONFLICT (content): Merge conflict in MAINTAINERS Merging spi/for-next (e6f98315aba2 Merge remote-tracking branch 'spi/for-5.16' into spi-next) CONFLICT (content): Merge conflict in drivers/spi/spi-tegra20-slink.c Merging tip/auto-latest (5989725f40fa Merge x86/core 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 CONFLICT (content): Merge conflict in arch/riscv/Kconfig Merging clockevents/timers/drivers/next (eda9a4f7af6e clocksource/drivers/timer-ti-dm: Select TIMER_OF) Merging edac/edac-for-next (f889e52436d6 Merge branch 'edac-urgent' into edac-for-next) Merging irqchip/irq/irqchip-next (11e45471abea Merge branch irq/misc-5.16 into irq/irqchip-next) Merging ftrace/for-next (93d76e4a0e01 tracing/histogram: Fix documentation inline emphasis warning) CONFLICT (content): Merge conflict in kernel/trace/ftrace.c CONFLICT (content): Merge conflict in kernel/kprobes.c CONFLICT (content): Merge conflict in include/linux/trace_recursion.h CONFLICT (content): Merge conflict in arch/parisc/kernel/ftrace.c Applying: Upcoming merge conflict between ftrace and s390 trees Merging rcu/rcu/next (a01016aa420e refscale: Always log the error message) CONFLICT (content): Merge conflict in kernel/rcu/tasks.h Merging kvm/next (9c6eb531e760 Merge tag 'kvm-s390-next-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c CONFLICT (content): Merge conflict in arch/riscv/Kconfig Merging kvm-arm/next (5a2acbbb0179 Merge branch kvm/selftests/memslot 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 (3fd8417f2c72 KVM: s390: add debug statement for diag 318 CPNC data) Merging xen-tip/linux-next (837b21d4c304 xen-pciback: allow compiling on other archs than x86) CONFLICT (content): Merge conflict in arch/x86/xen/irq.c Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next) Merging workqueues/for-next (f9eaaa82b474 workqueue: doc: Call out the non-reentrance conditions) Merging drivers-x86/for-next (bf653b61cf5f platform/x86: touchscreen_dmi: Add info for the Viglen Connect 10 tablet) Merging chrome-platform/for-next (297d34e73d49 platform/chrome: cros_ec_proto: Use ec_command for check_features) 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 (fc4e78481afa char: ipmi: replace snprintf in show functions with sysfs_emit) Merging driver-core/driver-core-next (27e0bcd02990 device property: Drop redundant NULL checks) Merging usb/usb-next (a0548b26901f usb: gadget: Mark USB_FSL_QE broken on 64-bit) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (910c996335c3 USB: serial: keyspan: fix memleak on probe errors) Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) Merging tty/tty-next (cc8d7b4aea79 tty: Fix extra "not" in TTY_DRIVER_REAL_RAW description) Merging char-misc/char-misc-next (536de747bc48 comedi: dt9812: fix DMA buffers on stack) CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/gem.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c Merging extcon/extcon-next (9e6ef3a25e5e dt-bindings: extcon: usbc-tusb320: Add TUSB320L compatible string) Merging phy-next/next (b4dc97ab0a62 phy: Sparx5 Eth SerDes: Fix return value check in sparx5_serdes_probe()) Merging soundwire/next (abd9a6049bb5 soundwire: qcom: add debugfs entry for soundwire register dump) Merging thunderbolt/next (0a0624a26f9c thunderbolt: Fix -Wrestrict warning) Merging vfio/next (3bf1311f351e vfio/ccw: Convert to use vfio_register_emulated_iommu_dev()) Merging staging/staging-next (10508ae08ed8 staging: r8188eu: hal: remove goto statement and local variable) Merging iio/togreg (12b6d77431f5 iio: adc: ina2xx: Avoid double reference counting from get_task_struct/put_task_struct()) 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 (e06748539432 dmaengine: fsl-edma: support edma memcpy) Merging cgroup/for-next (822bc9bac9e9 cgroup: no need for cgroup_mutex for /proc/cgroups) Merging scsi/for-next (3c7603727c3a Merge branch 'fixes' into for-next) CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c Merging scsi-mkp/for-next (a1efc896cb8a scsi: sr: Remove duplicate assignment) Merging vhost/linux-next (06aff93f1842 iommu/virtio: Support identity-mapped domains) 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 (585a07079909 gpio: realtek-otto: fix GPIO line IRQ offset) Merging gpio-intel/for-next (1649b8376694 gpio: pca953x: Improve bias setting) Merging gpio-sim/gpio/gpio-sim (5065e08e4ef3 gpio: sim: fix missing unlock on error in gpio_sim_config_commit_item()) Merging pinctrl/for-next (a0f160ffcb83 pinctrl: add pinctrl/GPIO driver for Apple SoCs) 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 (2302fcb6e492 Merge of per_signal_struct_coredumps-for-v5.16, ucount-fixes-for-v5.16, and exit-cleanups-for-v5.16 for testing in linux-next) CONFLICT (modify/delete): drivers/staging/r8188eu/core/rtw_mp.c deleted in HEAD and modified in userns/for-next. Version userns/for-next of drivers/staging/r8188eu/core/rtw_mp.c left in tree. $ git rm -f drivers/staging/r8188eu/core/rtw_mp.c Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) Merging kselftest/next (f35dcaa0a8a2 selftests/core: fix conflicting types compile error for close_range()) Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' into for-next) Merging coresight/next (561ced0bb90a arm64: errata: Enable TRBE workaround for write to out-of-range address) Merging rtc/rtc-next (a5feda3b361e rtc: s3c: Add time range) 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 (879f756fa9bf Merge branches 'for-next/hardening', 'for-next/overflow' and 'for-next/thread_info/cpu' into for-next/kspp) CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/fw/api/tx.h Merging kspp-gustavo/for-next/kspp (704f6142a903 firmware/psci: fix application of sizeof to pointer) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging gnss/gnss-next (0f79ce970e79 gnss: drop stray semicolons) Merging fsi/next (7cc2f34e1f4d fsi: sbefifo: Use interruptible mutex locking) 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 (285f68afa8b2 x86/hyperv: Protect set_hv_tscchange_cb() against getting preempted) Merging auxdisplay/auxdisplay (97fbb29fc1eb MAINTAINERS: Add DT Bindings for Auxiliary Display Drivers) 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 (52a5d80a2225 kunit: tool: fix typecheck errors about loading qemu configs) 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 (988f45dfe7ea 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 (c6d7e1341cc9 ocxl: Use pci core's DVSEC functionality) 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" Applying: mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault-vs-folios Merging bitmap/bitmap-master-5.15 (785cb064e2f8 vsprintf: rework bitmap_list_string) CONFLICT (content): Merge conflict in arch/parisc/include/asm/bitops.h Merging zstd/zstd-1.4.10 (464413496acb MAINTAINERS: Add maintainer entry for zstd) Merging efi/next (720dff78de36 efi: Allow efi=runtime) Merging unicode/for-next (e2a58d2d3416 unicode: only export internal symbols for the selftests) CONFLICT (content): Merge conflict in fs/f2fs/sysfs.c Applying: disable ntfs for now due to Merging akpm-current/current (42ff691f7a36 kernel.h: split out instruction pointer accessors) 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 lib/bootconfig.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 CONFLICT (content): Merge conflict in arch/s390/kernel/setup.c Applying: drm/locking: fix for name conflict $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (2276c629fb05 kasan: add kasan mode messages when kasan init)
Attachment:
pgpe2DESAEm2k.pgp
Description: OpenPGP digital signature
