Hi all, Changes since 20211216: New tree: (for me) landlock The imx-mxs tree lost its build failures. The fscache tree gained conflicts agianst the asm-generic tree. The nfs-anna tree gained complex conflicts against the fscache tree, so I dropped it for today. The kvm-arm tree gained a conflict against the kvm tree. The gpio-brgl tree still has a build failure for which I have reverted a commit. The pinctrl tree gained a conflict against the arm-soc tree. The userns tree gained semantic conflicts against the cel and vhost trees. It also still had a build failure so I used the version from next-20211215 for today. The akpm-current tree gained a build failure for which I applied a patch. Non-merge commits (relative to Linus' tree): 7567 7944 files changed, 360977 insertions(+), 158070 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, arm64, 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 347 trees (counting Linus' and 94 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 (a52a8e9eaf4a Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux) Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging kbuild-current/fixes (e851dfae4371 Merge tag 'kgdb-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux) Merging arc-current/for-curr (b9cac915c541 ARC: thread_info.h: correct two typos in a comment) Merging arm-current/fixes (418ace9992a7 ARM: 9156/1: drop cc-option fallbacks for architecture selection) Merging arm64-fixes/for-next/fixes (9c5d89bc1055 arm64: kexec: Fix missing error code 'ret' warning in load_other_segments()) Merging arm-soc-fixes/arm/fixes (4bc73b7d4880 Merge tag 'tegra-for-5.16-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/fixes) Merging drivers-memory-fixes/fixes (8c5ba21c16bd memory: mtk-smi: Fix a null dereference for the ostd) Merging tee-fixes/fixes (d58071a8a76d Linux 5.16-rc3) Merging m68k-current/for-linus (8a3c0a74ae87 m68k: defconfig: Update defconfigs for v5.15-rc1) Merging powerpc-fixes/fixes (8734b41b3efe powerpc/module_64: Fix livepatching for RO modules) Merging s390-fixes/fixes (85bf17b28f97 recordmcount.pl: look for jgnop instruction as well as bcrl on s390) 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 (0c3e24746055 Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) Merging bpf/master (0c3e24746055 Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) Merging ipsec/master (7770a39d7c63 xfrm: fix a small bug in xfrm_sa_len()) Merging netfilter/master (76f12e632a15 netfilter: ctnetlink: remove expired entries first) Merging ipvs/master (a50e659b2a1b net: mvpp2: fix XDP rx queues registering) Merging wireless-drivers/master (f7d55d2e439f mt76: mt7921: fix build regression) Merging mac80211/master (3dd7d40b4366 Merge branch 'mlxsw-fixes') Merging rdma-fixes/for-rc (12d3bbdd6bd2 RDMA/hns: Replace kfree() with kvfree()) Merging sound-current/for-linus (f7ac570d0f02 ALSA: hda/realtek: fix mute/micmute LEDs for a HP ProBook) Merging sound-asoc-fixes/for-linus (0d8c447c77f0 Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus) Merging regmap-fixes/for-linus (459e1cd0d5ec Merge remote-tracking branch 'regmap/for-5.15' into regmap-linus) Merging regulator-fixes/for-linus (85223d609c99 regulator: dt-bindings: samsung,s5m8767: add missing op_mode to bucks) Merging spi-fixes/for-linus (ca0911ee2b35 Merge remote-tracking branch 'spi/for-5.15' into spi-linus) Merging pci-current/for-linus (87620512681a PCI: apple: Fix PERST# polarity) Merging driver-core.current/driver-core-linus (136057256686 Linux 5.16-rc2) Merging tty.current/tty-linus (6c33ff728812 serial: 8250_fintek: Fix garbled text for console) Merging usb.current/usb-linus (ca4d8344a72b usb: typec: tcpm: fix tcpm unregister port but leave a pending timer) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (2b503c8598d1 USB: serial: option: add Telit FN990 compositions) Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle) CONFLICT (content): Merge conflict in drivers/usb/chipidea/ci_hdrc_imx.c Merging phy/fixes (f0ae8685b285 phy: HiSilicon: Fix copy and paste bug in error handling) Merging staging.current/staging-linus (d58071a8a76d Linux 5.16-rc3) Merging iio-fixes/fixes-togreg (8f80931a3a4d iio: adc: ti-adc081c: Partial revert of removal of ACPI IDs) Merging char-misc.current/char-misc-linus (2585cf9dfaad Linux 5.16-rc5) Merging soundwire-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) Merging thunderbolt-fixes/fixes (2585cf9dfaad Linux 5.16-rc5) Merging input-current/for-linus (12f247ab590a Input: atmel_mxt_ts - fix double free in mxt_read_info_block) Merging crypto-current/master (beaaaa37c664 crypto: api - Fix boot-up crash when crypto manager is disabled) Merging vfio-fixes/for-linus (8704e8934908 vfio/pci: Fix OpRegion read) Merging kselftest-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) Merging modules-fixes/modules-linus (2a987e65025e Merge tag 'perf-tools-fixes-for-v5.16-2021-12-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) Merging dmaengine-fixes/fixes (822c9f2b833c dmaengine: st_fdma: fix MODULE_ALIAS) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (27a030e87292 mtd: dataflash: Add device-tree SPI IDs) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (d40f0b133b44 media: meson-ir-tx: remove incorrect doc comment) Merging reset-fixes/reset/fixes (92c959bae2e5 reset: renesas: Fix Runtime PM usage) Merging mips-fixes/mips-fixes (09d97da660ff MIPS: Only define pci_remap_iospace() for Ralink) Merging at91-fixes/at91-fixes (fa55b7dcdc43 Linux 5.16-rc1) Merging omap-fixes/fixes (80d680fdccba ARM: dts: omap3430-sdp: Fix NAND device node) Merging kvm-fixes/master (10e7a099bfd8 selftests: KVM: Add test to verify KVM doesn't explode on "bad" I/O) Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu) Merging hwmon-fixes/hwmon (cdc5287acad9 hwmon: (lm90) Do not report 'busy' status bit as alarm) 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 (c748b846dab6 Merge branch 'misc-5.16' 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 (7d0c009043f6 platform/x86/intel: hid: add quirk to support Surface Go 3) Merging samsung-krzk-fixes/fixes (4f5d06d381ba arm64: dts: exynos: drop samsung,ufs-shareability-reg-offset in ExynosAutov9) Merging pinctrl-samsung-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) Merging devicetree-fixes/dt/linus (75e895343d5a Revert "kbuild: Enable DT schema checks for %.dtb targets") Merging scsi-fixes/fixes (2fe24343922e scsi: pm8001: Fix phys_to_virt() usage on dma_addr_t) Merging drm-fixes/drm-fixes (2585cf9dfaad Linux 5.16-rc5) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (53b349527328 drm/i915/display: Fix an unsigned subtraction which can never be negative.) Merging mmc-fixes/fixes (4fc7261dbab1 mmc: sdhci-tegra: Fix switch to HS400ES mode) Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) Merging gnss-fixes/gnss-linus (136057256686 Linux 5.16-rc2) Merging hyperv-fixes/hyperv-fixes (1dc2f2b81a6a hv: utils: add PTP_1588_CLOCK to Kconfig to fix build) Merging soc-fsl-fixes/fix (7e5e744183bb soc: fsl: dpio: fix qbman alignment error in the virtualization context) Merging risc-v-fixes/fixes (298d03c2d7f1 riscv: dts: unmatched: Add gpio card detect to mmc-spi-slot) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) Merging fpga-fixes/fixes (8bb7eca972ad Linux 5.15) Merging spdx/spdx-linus (bc128349588d LICENSES/LGPL-2.1: Add LGPL-2.1-or-later as valid identifiers) Merging gpio-brgl-fixes/gpio/for-current (d6912b1251b4 gpio: rockchip: needs GENERIC_IRQ_CHIP to fix build errors) Merging gpio-intel-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) Merging pinctrl-intel-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1) Merging erofs-fixes/fixes (57bbeacdbee7 erofs: fix deadlock when shrink erofs slab) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (fa55b7dcdc43 Linux 5.16-rc1) Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) Merging memblock-fixes/fixes (b5013d084e03 Merge tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) Merging cel-fixes/for-rc (8bb7eca972ad Linux 5.15) Merging irqchip-fixes/irq/irqchip-fixes (c3fbab7767c5 irqchip/irq-bcm7120-l2: Add put_device() after of_find_device_by_node()) Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) Merging perf-current/perf/urgent (9937e8daab29 perf python: Fix NULL vs IS_ERR_OR_NULL() checking) Merging efi-fixes/urgent (4bc5e64e6cf3 efi: Move efifb_setup_from_dmi() prototype from arch headers) Merging zstd-fixes/zstd-linus (d58071a8a76d Linux 5.16-rc3) Merging drm-misc-fixes/for-linux-next-fixes (fea3fdf975dd drm/ast: potential dereference of null pointer) Merging kbuild/for-next (4dc0759c563a init/Kconfig: Drop linker version check for LD_ORPHAN_WARN) Merging perf/perf/core (9c5c60521957 perf ftrace: Implement cpu and task filters in BPF) Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) Merging dma-mapping/for-next (28e4576d556b dma-direct: add a dma_direct_use_pool helper) Merging asm-generic/master (49501fb98653 asm-generic/error-injection.h: fix a spelling mistake, and a coding style issue) Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1) Merging arm/for-next (0ce29cae5ba4 Merge branches 'devel-stable', 'misc' and 'fixes' into for-next) Merging arm64/for-next/core (c0c575fb5d8e Merge remote-tracking branch 'arm64/for-next/perf' into for-next/core) Merging arm-perf/for-next/perf (1609c22a8a09 Merge branch 'for-next/perf-cpu' into for-next/perf) Merging arm-soc/for-next (0448a67bf07c soc: document merges) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (996b0777eaca Merge branch 'v5.17/dt64' into for-next) Merging aspeed/for-next (16d6dc8d8030 ARM: dts: aspeed: mtjade: Add uefi partition) Merging at91/at91-next (c4b365624007 Merge branch 'at91-soc' into at91-next) Merging drivers-memory/for-next (2e1d347deb7c Merge branch 'mem-ctrl-next' into for-next) Merging imx-mxs/for-next (6e84db1c2ee4 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) Merging mediatek/for-next (ccf7b63aac3e Merge branch 'v5.16-next/dts64' into for-next) Merging mvebu/for-next (04e78a787b74 arm/arm64: dts: Enable 2.5G Ethernet port on CN9130-CRB) Merging omap/for-next (fa0fdb78cb5d ARM: dts: am335x: Use correct vendor prefix for Asahi Kasei Corp.) Merging qcom/for-next (133d2c02948a Merge branches 'arm64-for-5.17', 'clk-for-5.17', 'defconfig-for-5.17', 'drivers-for-5.17' and 'dts-for-5.17' into for-next) Merging raspberrypi/for-next (ce94980d2970 ARM: dts: bcm2711-rpi-4-b: Add gpio offsets to line name array) Merging renesas/next (a155038f6411 Merge branch 'renesas-arm-dt-for-v5.17' into renesas-next) Merging reset/reset/next (89e7a6698fdd reset: uniphier-glue: Use devm_add_action_or_reset()) Merging rockchip/for-next (f3e71d41b8bf Merge branch 'v5.17-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (34f6cec74f61 Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (44e641bae51a Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (3ff0810ffc47 ARM: dts: stm32: Add Engicam i.Core STM32MP1 C.TOUCH 2.0 10.1" OF) Merging sunxi/sunxi/for-next (1d21ba6546a5 Merge branch 'sunxi/dt-for-5.17' into sunxi/for-next) Merging tee/next (ce352be35ba0 Merge branch 'async_notif' into next) Merging tegra/for-next (3b55f6545900 Merge branch for-5.17/arm/defconfig into for-next) CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig Merging ti/ti-next (87dabaa6bad3 Merge branch 'ti-drivers-soc-next' into ti-next) Merging xilinx/for-next (2eb48e610ef7 Merge remote-tracking branch 'zynqmp/dt' into for-next) Merging clk/clk-next (79ace752c9ea Merge branch 'clk-cleanup' into clk-next) Merging clk-imx/for-next (9dd81021084f clk: imx8mp: Fix the parent clk of the audio_root_clk) Merging clk-renesas/renesas-clk (f0b62b0bbedc clk: renesas: r9a07g044: Add GPU clock and reset entries) Merging clk-samsung/for-next (bcda841f9bf2 clk: samsung: exynos850: Register clocks early) Merging csky/linux-next (a0793fdad9a1 csky: fix typo of fpu config macro) Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs) Merging m68k/for-next (376e3fdecb0d m68k: Enable memtest functionality) Merging m68knommu/for-next (2585cf9dfaad Linux 5.16-rc5) Merging microblaze/next (7b94b7f0ae24 microblaze: add const to of_device_id) Merging mips/mips-next (858779df1c07 MIPS: OCTEON: add put_device() after of_find_device_by_node()) 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 (433fe39f674d openrisc: Add clone3 ABI wrapper) Merging parisc-hd/for-next (db9149201037 parisc: Clear stale IIR value on instruction access rights trap) Merging powerpc/next (708da3ff1d67 Merge branch 'topic/ppc-kvm' into next) Merging soc-fsl/next (67a4fa80561f soc: fsl: Correct MAINTAINERS database (SOC)) Merging risc-v/for-next (dacef016c088 riscv: dts: enable more DA9063 functions for the SiFive HiFive Unmatched) Merging s390/for-next (943136a5acd2 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 (317465bcc6f4 Merge branch 'fs.idmapped' into for-next) Merging fscrypt/master (b7e072f9b77f fscrypt: improve a few comments) Merging fscache/fscache-next (ac1c0f96f4c0 fscache: Rewrite documentation) CONFLICT (content): Merge conflict in fs/fscache/proc.c CONFLICT (modify/delete): fs/fscache/object.c deleted in fscache/fscache-next and modified in HEAD. Version HEAD of fs/fscache/object.c left in tree. CONFLICT (modify/delete): fs/cachefiles/bind.c deleted in fscache/fscache-next and modified in HEAD. Version HEAD of fs/cachefiles/bind.c left in tree. CONFLICT (content): Merge conflict in Documentation/filesystems/caching/fscache.rst $ git rm -f fs/cachefiles/bind.c $ git rm -f fs/fscache/object.c Applying: fix up for "fs: add is_idmapped_mnt() helper" Merging afs/afs-next (52af7105eceb afs: Set mtime from the client for yfs create operations) Merging btrfs/for-next (279373dee83e Fixup merge-to-merge conflict in lzo_compress_pages) Merging ceph/master (fd84bfdddd16 ceph: fix up non-directory creation in SGID directories) Merging cifs/for-next (68f87ec9c1ce cifs: ignore resource_id while getting fscache super cookie) CONFLICT (content): Merge conflict in fs/cifs/inode.c 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 (469407a3b5ed erofs: clean up erofs_map_blocks tracepoints) Merging exfat/dev (7c059dec3e6c exfat: remove argument 'sector' from exfat_get_dentry()) Merging ext3/for_next (5f0a61886e30 Pull Amir's FAN_RENAME and FAN_REPORT_TARGET_FID support for fanotify.) Merging ext4/dev (ba2e524d918a ext4: Remove unused match_table_t tokens) Merging f2fs/dev (662f6acdb013 f2fs: don't drop compressed page cache in .{invalidate,release}page) Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) Merging fuse/for-next (073c3ab6ae01 Documentation/filesystem/dax: DAX on virtiofs) Merging gfs2/for-next (817ab50b9e9c gfs2: gfs2_setattr_size error path fix) Merging jfs/jfs-next (c48a14dca2cb JFS: fix memleak in jfs_mount) Merging ksmbd/ksmbd-for-next (f2e78affc48d ksmbd: fix uninitialized symbol 'pntsd_size') Merging nfs/linux-next (064a91771f7a SUNRPC: use different lock keys for INET6 and LOCAL) Merging nfs-anna/linux-next (b66e21111495 NFSv4 only print the label when its queried) CONFLICT (content): Merge conflict in fs/nfs/fscache.h CONFLICT (content): Merge conflict in fs/nfs/fscache.c CONFLICT (modify/delete): fs/nfs/fscache-index.c deleted in HEAD and modified in nfs-anna/linux-next. Version nfs-anna/linux-next of fs/nfs/fscache-index.c left in tree. $ git reset --hard HEAD Merging nfsd/nfsd-next (2e3f00c5f29f nfsd: improve stateid access bitmask documentation) Merging cel/for-next (107c221f4624 NFSD: De-duplicate nfsd4_decode_bitmap4()) CONFLICT (content): Merge conflict in fs/nfsd/nfs4state.c Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED) Merging orangefs/for-next (ac2c63757f4f orangefs: Fix sb refcount leak when allocate sb info failed.) Merging overlayfs/overlayfs-next (5b0a414d06c3 ovl: fix filattr copy-up failure) Merging ubifs/next (9aaa6cc099f6 ubifs: Document sysfs nodes) Merging v9fs/9p-next (6e195b0f7c8e 9p: fix a bunch of checkpatch warnings) Merging xfs/for-next (089558bc7ba7 xfs: remove all COW fork extents when remounting readonly) Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) Merging iomap/iomap-for-next (5ad448ce2976 iomap: iomap_read_inline_data cleanup) Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID) Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes) Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next) Merging printk/for-next (09b7bafa9876 Merge branch 'for-5.17' into for-next) Merging pci/next (770851f91de8 Merge branch 'pci/errors') Merging pstore/for-next/pstore (a5d05b07961a pstore/ftrace: Allow immediate recording) Merging hid/for-next (1b3f198064b9 Merge branch 'for-5.17/thrustmaster' into for-next) Merging i2c/i2c/for-next (da6c84e2ef39 Merge branch 'i2c/for-mergewindow' into i2c/for-next) Merging i3c/i3c/next (3f43926f2712 i3c/master/mipi-i3c-hci: Fix a potentially infinite loop in 'hci_dat_v1_get_index()') Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) Merging hwmon-staging/hwmon-next (df159e2b2601 hwmon: (ntc_thermistor) Move DT matches to the driver block) Merging jc_docs/docs-next (ddffdcce9caa docs/zh_CN: Add sched-design-CFS Chinese translation) Merging v4l-dvb/master (3a956f0b123c Merge tag 'platform-drivers-x86-int3472-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86 into media_tree) Merging v4l-dvb-next/master (68b9bcc8a534 media: ipu3-cio2: Add support for instantiating i2c-clients for VCMs) Merging pm/linux-next (8dff5ac97bf3 Merge branches 'pm-cpuidle' and 'pm-sleep' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (8f5783ad9eb8 cpufreq: qcom-hw: Use optional irq API) Merging cpupower/cpupower (79a0dc5530a9 tools: cpupower: fix typo in cpupower-idle-set(1) manpage) Merging devfreq/devfreq-next (4667431419e9 PM / devfreq: Reduce log severity for informative message) Merging opp/opp/linux-next (7ca81b690e59 dt-bindings: opp: Allow multi-worded OPP entry name) Merging thermal/thermal/linux-next (8ee1c0f6526c thermal/drivers/rz2gl: Add error check for reset_control_deassert()) Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) Merging dlm/next (e4dc81ed5a80 fs: dlm: memory cache for lowcomms hotpath) Merging rdma/for-next (c8f476da84ad Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux) Merging net-next/master (7cd2802d7496 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf-next/for-next (4658e15d39e6 Merge branch 'bpf: remove the cgroup -> bpf header dependecy') Merging ipsec-next/master (ac1077e92825 net: xfrm: drop check of pols[0] for the second time) Merging mlx5-next/mlx5-next (685b1afd7911 net/mlx5: Introduce log_max_current_uc_list_wr_supported bit) Merging netfilter-next/master (604ba230902d net: prestera: flower template support) Merging ipvs-next/master (632cb151ca53 netfilter: ctnetlink: remove useless type conversion to bool) Merging wireless-drivers-next/master (fd5e3c4ab92e Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging bluetooth/master (a33d805b3225 Bluetooth: btintel: Add missing quirks and msft ext for legacy bootloader) Merging mac80211-next/master (75c5bd68b699 ieee80211: change HE nominal packet padding value defines) Merging mtd/mtd/next (6420ac0af95d mtdchar: prevent unbounded allocation in MEMWRITE ioctl) Merging nand/nand/next (c14e281a8e76 dt-bindings: mtd: ti,gpmc-nand: Add missing 'rb-gpios') Merging spi-nor/spi-nor/next (22bfe94528d7 mtd: spi-nor: issi: is25lp256: Init flash based on SFDP) Merging crypto/master (3f9dd4c802b9 crypto: hisilicon/qm - fix incorrect return value of hisi_qm_resume()) Merging drm/drm-next (244a36e50da0 drm/vc4: kms: Wait for the commit before increasing our clock rate) Merging drm-misc/for-linux-next (d6c75c295f67 omapdrm: dss: mark runtime PM functions __maybe_unused) Merging amdgpu/drm-next (c8f56d6d0eaa drm/amdgpu: bump driver version for new CTX OP to set/get stable pstates) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dc.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/nv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c Applying: fix up for "drm/amdgpu: cancel the correct hrtimer on exit" Merging drm-intel/for-linux-next (a36e7dc0af1c drm/i915/dg1: Read OPROM via SPI controller) Merging drm-intel-gt/for-linux-next-gt (491fe469ad0e drm/i915/selftests: Follow up on increase timeout in i915_gem_contexts selftests) Merging drm-tegra/drm/tegra/for-next (d210919dbdc8 drm/tegra: Add back arm_iommu_detach_device()) Merging drm-msm/msm-next (f61550b3864b drm/msm/dp: dp_link_parse_sink_count() return immediately if aux read failed) 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 (96894b795967 drm/etnaviv: constify static struct cooling_ops) Merging regmap/for-next (02d6fdecb9c3 regmap: allow to define reg_update_bits for no bus configuration) Merging sound/for-next (dec242b6a838 ALSA: gus: Fix memory leaks at memory allocator error paths) Merging sound-asoc/for-next (0f2ee77d2655 ASoC: Changes to SOF kcontrol data set/get ops) Merging modules/modules-next (d457f9e1ae29 MAINTAINERS: Remove myself as modules maintainer) Merging input/next (e8c3ed6b7a4a Input: ucb1400_ts - remove redundant variable penup) Merging block/for-next (eb00a4e5d162 Merge branch 'for-5.17/block' into for-next) Merging device-mapper/for-next (1cef171abd39 dm integrity: fix data corruption due to improper use of bvec_kmap_local) Merging libata/for-next (5da5231bb478 libata: if T_LENGTH is zero, dma direction should be DMA_NONE) Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug) Merging mmc/next (5479a013c874 Merge branch 'fixes' into next) Merging mfd/for-mfd-next (54d4c88b3759 mfd: Kconfig: Change INTEL_SOC_PMIC_CHTDC_TI to bool) Merging backlight/for-backlight-next (3976e974df1f video: backlight: ili9320: Make ili9320_remove() return void) Merging battery/for-next (9652c02428f3 power: bq25890: add POWER_SUPPLY_PROP_TEMP) Merging regulator/for-next (0fc31d8f1a8a regulator: Introduce tps68470-regulator driver) Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) Merging apparmor/apparmor-next (fa55b7dcdc43 Linux 5.16-rc1) 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 (52f982f00b22 security,selinux: remove security_add_mnt_opt()) Merging smack/next (0934ad42bb2c smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi) Merging tomoyo/master (f702e1107601 tomoyo: use hwight16() in tomoyo_domain_quota_is_ok()) Merging tpmdd/next (b181162ce6e3 char: tpm: cr50: Set TPM_FIRMWARE_POWER_MANAGED based on device property) Merging watchdog/master (0fcfb00b28c0 Linux 5.16-rc4) Merging iommu/next (b94daa4a392c Merge branches 'virtio' and 'core' into next) Merging audit/next (8f110f530635 audit: ensure userspace is penalized the same as the kernel when under pressure) Merging devicetree/for-next (1f012283e936 of/fdt: Rework early_init_dt_scan_memory() to call directly) Merging mailbox/mailbox-for-next (97961f78e8bc mailbox: imx: support i.MX8ULP S4 MU) Merging spi/for-next (77850bda360d spi: atmel,quadspi: Define sama7g5 QSPI) Merging tip/auto-latest (4d4207b2910c Merge irq/msi into tip/master) CONFLICT (content): Merge conflict in arch/arm64/kernel/perf_callchain.c Merging clockevents/timers/drivers/next (0642fb4ba68f clocksource/drivers/pistachio: Fix -Wunused-but-set-variable warning) Merging edac/edac-for-next (bf3e2726cc60 Merge branch 'edac-misc' into edac-for-next) Merging irqchip/irq/irqchip-next (4ddb55935bf3 Merge branch irq/misc-5.17 into irq/irqchip-next) Merging ftrace/for-next (a6ed2aee5464 tracing: Switch to kvfree_rcu() API) Merging rcu/rcu/next (52979a8e8b59 rcu: Mark ->expmask access in synchronize_rcu_expedited_wait()) Merging kvm/next (d8f6ef45a623 KVM: arm64: Use Makefile.kvm for common files) CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_hv.c CONFLICT (content): Merge conflict in arch/arm64/kvm/Makefile CONFLICT (content): Merge conflict in arch/arm64/kvm/Kconfig Merging kvm-arm/next (cfe0c69a94f8 Merge branch kvm-arm64/misc-5.17 into kvmarm-master/next) CONFLICT (content): Merge conflict in arch/arm64/kvm/arm.c Merging kvms390/next (69563fb52e00 s390: uv: Add offset comments to UV query struct and fix naming) Merging xen-tip/linux-next (bc3bfd76d55f xen/gntdev: fix unmap notification order) Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next) Merging workqueues/for-next (7f224759dbdf Merge branch 'for-5.17' into for-next) Merging drivers-x86/for-next (692562abcc6e platform/x86: hp_accel: Use SIMPLE_DEV_PM_OPS() for PM ops) Merging chrome-platform/for-next (297d34e73d49 platform/chrome: cros_ec_proto: Use ec_command for check_features) Merging hsi/for-next (a1ee1c08fcd5 HSI: core: Fix return freed object in hsi_new_client) Merging leds/for-next (d949edb503b1 leds: lp55xx: initialise output direction from dts) Merging ipmi/for-next (a87b221566e9 ipmi/watchdog: Constify ident) Merging driver-core/driver-core-next (aa483f3ce655 topology/sysfs: get rid of htmldoc warning) Merging usb/usb-next (f59f93cd1d72 usb: hub: avoid warm port reset during USB3 disconnect) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (2585cf9dfaad Linux 5.16-rc5) Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) Merging tty/tty-next (f5bced9f3435 Merge 5.16-rc4 into tty-next) Merging char-misc/char-misc-next (af40d16042d6 Merge v5.15-rc5 into char-misc-next) Merging extcon/extcon-next (a7eb8e38bcd8 extcon: Deduplicate code in extcon_set_state_sync()) Merging phy-next/next (c8d09c7ebcff phy: freescale: pcie: explicitly add bitfield.h) Merging soundwire/next (bb349fd2d580 soundwire: qcom: remove redundant version number read) Merging thunderbolt/next (3cc1c6de458e thunderbolt: Check return value of kmemdup() in icm_handle_event()) Merging vfio/next (3bf1311f351e vfio/ccw: Convert to use vfio_register_emulated_iommu_dev()) Merging staging/staging-next (d0df53d36cd5 staging: rtl8712: Fix alignment checks with flipped condition) Merging iio/togreg (e4ae54da0382 iio:accel:kxcjk-1013: Mark struct __maybe_unused to avoid warning.) Merging mux/for-next (aff1016220a5 dt-bindings: ti-serdes-mux: Add defines for J721S2 SoC) Merging icc/icc-next (01f8938ad036 Merge branch 'icc-qcm2290' into icc-next) Merging dmaengine/next (5b675b764591 dmaengine: sh: Use bitmap_zalloc() when applicable) CONFLICT (content): Merge conflict in drivers/dma/idxd/submit.c Merging cgroup/for-next (1815775e7454 cgroup: return early if it is already on preloaded list) Merging scsi/for-next (014adbc9a838 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (4be6181fea1d scsi: libsas: Decode SAM status and host byte codes) Merging vhost/linux-next (e2f504111891 vdpa: Mark vdpa_config_ops.get_vq_notification as optional) CONFLICT (content): Merge conflict in include/uapi/linux/virtio_iommu.h CONFLICT (content): Merge conflict in drivers/iommu/virtio-iommu.c Merging rpmsg/for-next (1f63f6bf326b Merge branches 'rpmsg-next', 'rproc-next' and 'hwspinlock-next' into for-next) Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) Merging gpio-brgl/gpio/for-next (c492c8dc2ed8 Merge tag 'intel-gpio-v5.17-1' of gitolite.kernel.org:pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-next) CONFLICT (content): Merge conflict in tools/testing/selftests/gpio/Makefile Applying: Revert "gpio: bcm-kona: add const to of_device_id" Merging gpio-intel/for-next (9d5f0f6644b1 gpio: sch: fix typo in a comment) Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) Merging pinctrl/for-next (804f2dbd8c76 Merge branch 'devel' into for-next) CONFLICT (content): Merge conflict in drivers/pinctrl/Makefile CONFLICT (content): Merge conflict in drivers/pinctrl/Kconfig Merging pinctrl-intel/for-next (db1b2a8caf5b pinctrl: cherryview: Use temporary variable for struct device) Merging pinctrl-renesas/renesas-pinctrl (ea7e26ebe6a9 pinctrl: renesas: r8a779a0: Align comments) Merging pinctrl-samsung/for-next (16dd3bb5c190 pinctrl: samsung: Make symbol 'exynos7885_pin_ctrl' static) Merging pwm/for-next (3f0565451cc0 dt-bindings: pwm: Avoid selecting schema on node name match) Merging userns/for-next (45d14c113078 Merge of signal-for-v5.17, and ucount-rlimit-fixes-for-v5.16 for testing in linux-next) CONFLICT (content): Merge conflict in fs/nfsd/nfssvc.c Applying: fix up for "lockd: use svc_set_num_threads() for thread start and stop" Applying: fix up for "vhost: use user_worker to check RLIMITs" Applying: fix 2 for "vhost: use user_worker to check RLIMITs" $ git reset --hard HEAD^ Merging next-20211215 version of userns Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) Merging kselftest/next (e89908201e25 selftests/vm: remove ARRAY_SIZE define from individual tests) Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' into for-next) Merging coresight/next (efa56eddf5d5 coresight: core: Fix typo in a comment) Merging rtc/rtc-next (cd17420ebea5 rtc: cmos: avoid UIP when writing alarm time) Merging nvdimm/libnvdimm-for-next (de291b590286 iomap: turn the byte variable in iomap_zero_iter into a ssize_t) CONFLICT (content): Merge conflict in fs/ext4/super.c Merging at24/at24/for-next (d08aea21c89d eeprom: at24: Add support for 24c1025 EEPROM) Merging ntb/ntb-next (f96cb827ce49 ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data) Merging seccomp/for-next/seccomp (1e6d69c7b9cd selftests/seccomp: Report event mismatches more clearly) Merging kspp/for-next/kspp (136057256686 Linux 5.16-rc2) Merging kspp-gustavo/for-next/kspp (64bc5a949ae1 Merge branch 'for-linus/kspp' into for-next/kspp) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging gnss/gnss-next (b15c90153fd9 gnss: drop stray semicolons) Merging fsi/next (7cc2f34e1f4d fsi: sbefifo: Use interruptible mutex locking) Merging slimbus/for-next (fa55b7dcdc43 Linux 5.16-rc1) Merging nvmem/for-next (779809c07324 dt-bindings: nvmem: Add missing 'reg' property) Merging xarray/main (1c9f4b00b3cf XArray: Document the locking requirement for the xa_state) Merging hyperv/hyperv-next (285f68afa8b2 x86/hyperv: Protect set_hv_tscchange_cb() against getting preempted) Merging auxdisplay/auxdisplay (4daa9ff89ef2 auxdisplay: charlcd: checking for pointer reference before dereferencing) Merging kgdb/kgdb/for-next (b77dbc86d604 kdb: Adopt scheduler's task classification) Merging hmm/hmm (6880fa6c5660 Linux 5.15-rc1) Merging fpga/for-next (98ceca2f2932 fpga: region: fix kernel-doc) Merging kunit/test (fa55b7dcdc43 Linux 5.16-rc1) Merging cfi/cfi/next (baaf965f9430 mtd: hyperbus: rpc-if: fix bug in rpcif_hb_remove) Merging kunit-next/kunit (ad659ccb5412 kunit: tool: Default --jobs to number of CPUs) 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 (00776ac534cc bus: mhi: pci_generic: Introduce Sierra EM919X support) 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 (075c05e2eb5d [RFC] drivers: android: Binder IPC in Rust) CONFLICT (modify/delete): tools/include/linux/lockdep.h deleted in HEAD and modified in rust/rust-next. Version rust/rust-next of tools/include/linux/lockdep.h left in tree. CONFLICT (content): Merge conflict in samples/Makefile CONFLICT (content): Merge conflict in samples/Kconfig CONFLICT (content): Merge conflict in Documentation/process/changes.rst $ git rm -f tools/include/linux/lockdep.h Merging cxl/next (53989fad1286 cxl/pmem: Fix module reload vs workqueue state) Merging folio/for-next (3103f9a51dd0 mm: Use multi-index entries in the page cache) CONFLICT (content): Merge conflict in mm/filemap.c Merging bitmap/bitmap-master-5.15 (785cb064e2f8 vsprintf: rework bitmap_list_string) CONFLICT (content): Merge conflict in drivers/dma/ti/edma.c CONFLICT (content): Merge conflict in arch/s390/kvm/kvm-s390.c CONFLICT (content): Merge conflict in arch/powerpc/include/asm/cputhreads.h CONFLICT (content): Merge conflict in arch/parisc/include/asm/bitops.h Merging zstd/zstd-next (fa55b7dcdc43 Linux 5.16-rc1) Merging efi/next (21e42b00f779 efi/libstub: measure loaded initrd info into the TPM) Merging unicode/for-next (e2a58d2d3416 unicode: only export internal symbols for the selftests) CONFLICT (content): Merge conflict in fs/f2fs/sysfs.c Merging slab/slab-next (bb8806276b53 bootmem: Use page->index instead of page->freelist) CONFLICT (content): Merge conflict in mm/memcontrol.c Merging random/master (860faafe95c5 irq: remove unused flags argument from __handle_irq_event_percpu()) Merging landlock/next (2585cf9dfaad Linux 5.16-rc5) Merging akpm-current/current (70a691bde53c ubsan: remove CONFIG_UBSAN_OBJECT_SIZE) CONFLICT (content): Merge conflict in mm/zsmalloc.c CONFLICT (content): Merge conflict in mm/migrate.c CONFLICT (content): Merge conflict in mm/memremap.c Applying: mm/vmalloc: alloc GFP_NO{FS,IO} for vmalloc fix $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (dac65aa895d9 lib/stackdepot: always do filter_irq_stacks() in stack_depot_save())
Attachment:
pgp4oAwIHvGEh.pgp
Description: OpenPGP digital signature
