Hi all, Changes since 20221124: The thermal tree still had complex conflicts against the pm tree so I dropped the thermal tree for today. The nand tree gained a conflict against the mtd-fixes tree. The char-misc tree gained a conflict against the broadcom tree. The efi tree gained a conflict against the tip tree. The slab tree lost its build failure, but gained another so I used the version from next-20221123. Non-merge commits (relative to Linus' tree): 9679 9219 files changed, 426329 insertions(+), 170576 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 370 trees (counting Linus' and 103 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 (08ad43d554ba Merge tag 'net-6.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm) Merging mm-hotfixes/mm-hotfixes-unstable (3f85e711d5af mm: introduce arch_has_hw_nonleaf_pmd_young()) Merging kbuild-current/fixes (df1f1ea9569e scripts: add rust in scripts/Makefile.package) Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3) Merging arm-current/fixes (340a982825f7 ARM: 9266/1: mm: fix no-MMU ZERO_PAGE() implementation) Merging arm64-fixes/for-next/fixes (5b47348fc0b1 arm64/mm: fix incorrect file_map_count for non-leaf pmd/pud) Merging arm-soc-fixes/arm/fixes (b10dbd6fbd7d Merge tag 'v6.2-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes) Merging davinci-current/davinci/for-current (9abf2313adc1 Linux 6.1-rc1) Merging drivers-memory-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes) Merging m68k-current/for-linus (dc63a086daee m68k: Rework BI_VIRT_RNG_SEED as BI_RNG_SEED) Merging powerpc-fixes/fixes (eb761a1760bf powerpc: Fix writable sections being moved into the rodata region) Merging s390-fixes/fixes (adba1a9b81d5 MAINTAINERS: add S390 MM section) Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) Merging fscrypt-current/for-stable (ccd30a476f8e fscrypt: fix keyring memory leak on mount failure) Merging net/master (661e5ebbafd2 net: thunderx: Fix the ACPI memory leak) Merging bpf/master (8be602dadb2f selftests/bpf: Make test_bench_attach serial) Merging ipsec/master (40781bfb836e xfrm: Fix ignored return value in xfrm6_init()) Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging ipvs/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging wireless/for-next (0cdfa9e6f091 wifi: wilc1000: validate number of channels) Merging rdma-fixes/for-rc (094226ad94f4 Linux 6.1-rc5) Merging sound-current/for-linus (ecae4c8954a1 Merge tag 'asoc-fix-v6.1-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc-fixes/for-linus (db8f91d424fe ASoC: soc-pcm: Add NULL check in BE reparenting) Merging regmap-fixes/for-linus (84498d1fb35d regmap-irq: Use the new num_config_regs property in regmap_add_irq_chip_fwnode) Merging regulator-fixes/for-linus (0e05f4ca75df Merge remote-tracking branch 'regulator/for-6.0' into regulator-linus) Merging spi-fixes/for-linus (e0833bce6999 Merge remote-tracking branch 'spi/for-6.0' into spi-linus) Merging pci-current/for-linus (ac9ccce8717d MAINTAINERS: Include PCI bindings in host bridge entry) Merging driver-core.current/driver-core-linus (eb7081409f94 Linux 6.1-rc6) Merging tty.current/tty-linus (eb7081409f94 Linux 6.1-rc6) Merging usb.current/usb-linus (7a21b27aafa3 usb: cdnsp: fix issue with ZLP - added TD_SIZE = 1) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (c1547f12df8b USB: serial: option: add u-blox LARA-L6 modem) Merging phy/fixes (819b885cd886 phy: ralink: mt7621-pci: add sentinel to quirks table) Merging staging.current/staging-linus (eb7081409f94 Linux 6.1-rc6) Merging iio-fixes/fixes-togreg (86fdd15e10e4 iio: fix memory leak in iio_device_register_eventset()) Merging counter-current/counter-current (30a0b95b1335 Linux 6.1-rc3) Merging char-misc.current/char-misc-linus (8ac3b5cd3e05 lib/vdso: use "grep -E" instead of "egrep") Merging soundwire-fixes/fixes (49a467310dc4 soundwire: qcom: check for outanding writes before doing a read) Merging thunderbolt-fixes/fixes (eb7081409f94 Linux 6.1-rc6) Merging input-current/for-linus (81cd7e848927 Input: i8042 - fix leaking of platform device on module removal) Merging crypto-current/master (9f6035af06b5 crypto: x86/polyval - Fix crashes when keys are not 16-byte aligned) Merging vfio-fixes/for-linus (e806e223621e vfio/pci: Check the device set open count on reset) Merging kselftest-fixes/fixes (89c1017aac67 selftests/pidfd_test: Remove the erroneous ',') Merging modules-fixes/modules-linus (77d6354bd422 module/decompress: generate sysfs string at compile time) Merging dmaengine-fixes/fixes (c47e6403fa09 dmaengine: at_hdmac: Check return code of dma_async_device_register) Merging backlight-fixes/for-backlight-fixes (6dfad94814c7 dt-bindings: backlight: qcom-wled: Add PMI8950 compatible) Merging mtd-fixes/mtd/fixes (c717b9b7d6de mtd: onenand: omap2: add dependency on GPMC) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (5eef2141776d media: v4l2-dv-timings.c: fix too strict blanking sanity checks) Merging reset-fixes/reset/fixes (ae358d71d462 reset: npcm: fix iprst2 and iprst4 setting) Merging mips-fixes/mips-fixes (094226ad94f4 Linux 6.1-rc5) Merging at91-fixes/at91-fixes (6a3fc8c330d1 ARM: at91: fix build for SAMA5D3 w/o L2 cache) Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) Merging kvm-fixes/master (fe08e36be9ec Merge branch 'kvm-dwmw2-fixes' into HEAD) Merging kvms390-fixes/master (0dd4cdccdab3 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field) Merging hwmon-fixes/hwmon (595fc93c64f8 hwmon: (coretemp) fix pci device refcount leak in nv1a_ram_new()) Merging nvdimm-fixes/libnvdimm-fixes (472faf72b33d device-dax: Fix duplicate 'hmem' device registration) Merging cxl-fixes/fixes (8f401ec1c897 cxl/region: Recycle region ids) Merging btrfs-fixes/next-fixes (e6c556c9e623 Merge branch 'misc-6.1' into next-fixes) Merging vfs-fixes/fixes (406c706c7b7f vfs: vfs_tmpfile: ensure O_EXCL flag is enforced) Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted()) Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging drivers-x86-fixes/fixes (b44fd994e451 platform/x86: ideapad-laptop: Add module parameters to match DMI quirk tables) Merging samsung-krzk-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging pinctrl-samsung-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging devicetree-fixes/dt/linus (60d865bd5a9b of: property: decrement node refcount in of_fwnode_get_reference_args()) Merging dt-krzk-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging scsi-fixes/fixes (f014165faa7b scsi: iscsi: Fix possible memory leak when device_register() failed) Merging drm-fixes/drm-fixes (eb7081409f94 Linux 6.1-rc6) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (14af5d385878 Merge tag 'gvt-fixes-2022-11-11' of https://github.com/intel/gvt-linux into drm-intel-fixes) Merging mmc-fixes/fixes (a3cab1d21324 mmc: sdhci-esdhc-imx: correct CQHCI exit halt state check) Merging rtc-fixes/rtc-fixes (db4e955ae333 rtc: cmos: fix build on non-ACPI platforms) Merging gnss-fixes/gnss-linus (247f34f7b803 Linux 6.1-rc2) Merging hyperv-fixes/hyperv-fixes (25c94b051592 Drivers: hv: vmbus: fix possible memory leak in vmbus_device_register()) Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) Merging risc-v-fixes/fixes (fcae44fd36d0 RISC-V: vdso: Do not add missing symbols to version section in linker script) Merging riscv-dt-fixes/riscv-dt-fixes (9abf2313adc1 Linux 6.1-rc1) Merging riscv-soc-fixes/riscv-soc-fixes (9abf2313adc1 Linux 6.1-rc1) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) Merging fpga-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging spdx/spdx-linus (6cad1ecd4e32 testing: use the copyleft-next-0.3.1 SPDX tag) Merging gpio-brgl-fixes/gpio/for-current (30a0b95b1335 Linux 6.1-rc3) Merging gpio-intel-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging pinctrl-intel-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging erofs-fixes/fixes (37020bbb71d9 erofs: fix missing xas_retry() in fscache mode) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (618887768bb7 kunit: update NULL vs IS_ERR() tests) Merging ubifs-fixes/fixes (7bdd6967fec5 ubi: ensure that VID header offset + VID header size <= alloc, size) Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) Merging cel-fixes/for-rc (ac8db824ead0 NFSD: Fix reads with a non-zero offset that don't end on a page boundary) Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC) Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging perf-current/perf/urgent (94d957ae513f perf tools: Add the include/perf/ directory to .gitignore) Merging efi-fixes/urgent (9b9eaee9828f arm64: efi: Fix handling of misaligned runtime regions and drop warning) Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) Merging battery-fixes/fixes (767e684367e4 power: supply: ab8500: Defer thermal zone probe) Merging uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executable to fix a binutils warning) Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1) Merging iommufd-fixes/for-rc (30a0b95b1335 Linux 6.1-rc3) Merging drm-misc-fixes/for-linux-next-fixes (a6a00d7e8ffd fbcon: Use kzalloc() in fbcon_prepare_logo()) Merging kbuild/for-next (8818039f959b kbuild: add ability to make source rpm buildable using koji) Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) Merging perf/perf/core (0c3852adae83 Merge remote-tracking branch 'torvalds/master' into perf/core) Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attributes: Introduce __access_*() function attribute) Merging dma-mapping/for-next (ffcb75458460 dma-mapping: reject __GFP_COMP in dma_alloc_attrs) CONFLICT (content): Merge conflict in sound/core/memalloc.c Merging asm-generic/master (5e5ff73c2e58 asm-generic/io: Add _RET_IP_ to MMIO trace for more accurate debug info) Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) Merging arm/for-next (a893cdeb4f7c Merge branches 'misc' and 'fixes' into for-next) Merging arm64/for-next/core (4bd41b7b3e6a Merge branches 'for-next/acpi', 'for-next/asm-const', 'for-next/cpufeature', 'for-next/dynamic-scs', 'for-next/errata', 'for-next/fpsimd', 'for-next/insn', 'for-next/kbuild', 'for-next/kdump', 'for-next/mm', 'for-next/perf', 'for-next/selftests', 'for-next/stacks', 'for-next/trivial', 'for-next/uaccess' and 'for-next/undef-traps' into for-next/core) Merging arm-perf/for-next/perf (aaaee7b55c9e docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING) Merging arm-soc/for-next (e377f2aeadda soc: document merges) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (e57e6bb6476d Merge branch 'v6.2/arm64-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (56fed763f6b2 arm64: dts: apple: Add ADMAC resets on t8103/t600x) Merging aspeed/for-next (45c86167adde soc: nuvoton: Add SoC info driver for WPCM450) CONFLICT (content): Merge conflict in arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts Merging at91/at91-next (dff234b3d938 Merge branch 'at91-fixes' into at91-next) Merging broadcom/next (64610429f8de Merge branch 'drivers/next' into next) Merging davinci/davinci/for-next (53ad523ac435 ARM: davinci: fix repeated words in comments) Merging drivers-memory/for-next (8dd7e4af5853 memory: omap-gpmc: fix coverity issue "Control flow issues") Merging imx-mxs/for-next (e114f7b74f59 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) Merging mediatek/for-next (6b6221595e05 Merge branch 'v6.2-tmp/dts64' into for-next) Merging mvebu/for-next (d5c48679d56c Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (6435241fd536 Merge branch 'musb-for-v6.2' into for-next) Merging qcom/for-next (4d2b529bce12 Merge branches 'arm64-defconfig-for-6.2', 'arm64-for-6.2', 'clk-for-6.2', 'defconfig-for-6.2', 'drivers-for-6.2', 'dts-for-6.2' and 'arm64-fixes-for-6.1' into for-next) Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) Merging renesas/next (00841e945654 Merge branch 'renesas-arm-dt-for-v6.2' into renesas-next) Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage") Merging rockchip/for-next (db6c57f2afd5 Merge branch 'v6.2-clock/next' into for-next) Merging samsung-krzk/for-next (5a549e2d0bab Merge branch 'next/clk' into for-next) Merging scmi/for-linux-next (25882cfe4a6b Merge branch 'for-next/juno' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (4cca342b840e ARM: dts: stm32: Rename mdio0 to mdio on DHCOR Testbench board) Merging sunxi/sunxi/for-next (47be7c123211 Merge branch 'sunxi/clk-for-6.2' into sunxi/for-next) Merging tee/next (4a56b125ba20 Merge branch 'fixes' into next) Merging tegra/for-next (d71332dded9d Merge branch for-6.2/arm64/defconfig into for-next) Merging ti/ti-next (6a5ab20fb961 Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (0413dd4d95da ARM: dts: zynq: add QSPI controller node) Merging clk/clk-next (ebb6a9acf2e0 Merge branch 'clk-fixes' into clk-next) Merging clk-imx/for-next (ec689c152985 clk: imx: imxrt1050: add IMXRT1050_CLK_LCDIF_PIX clock gate) Merging clk-renesas/renesas-clk (777bcc85e1fb clk: renesas: r8a779f0: Fix Ethernet Switch clocks) Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) Merging csky/linux-next (7e2004906fb5 Revert "csky: Add support for restartable sequence") Merging loongarch/loongarch-next (247f34f7b803 Linux 6.1-rc2) Merging m68k/for-next (553b20b211c4 m68k: defconfig: Update defconfigs for v6.1-rc1) Merging m68knommu/for-next (094226ad94f4 Linux 6.1-rc5) Merging microblaze/next (493ffd6605b2 Merge tag 'ucount-rlimits-cleanups-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) Merging mips/mips-next (c5ed1fe0801f MIPS: vpe-cmp: fix possible memory leak while module exiting) Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) Merging openrisc/for-next (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc) Merging parisc-hd/for-next (8755b5cf36b4 parisc: Drop double activation of pdc_console for KGDB) Merging powerpc/next (a9ffb8ee7b65 powerpc: Use "grep -E" instead of "egrep") Merging powerpc-objtool/topic/objtool (a39818a3fb2b objtool/powerpc: Implement arch_pc_relative_reloc()) Merging soc-fsl/next (4b0986a3613c Linux 5.18) Merging risc-v/for-next (effae0e3d9e1 riscv: Kconfig: Enable cpufreq kconfig menu) Merging riscv-dt/riscv-dt-for-next (4563db4b7988 Merge branch 'riscv-thead_c9xx' into riscv-dt-for-next) Merging riscv-soc/riscv-soc-for-next (8fbf94fea0b4 soc: sifive: ccache: fix missing of_node_put() in sifive_ccache_init()) Merging s390/for-next (e3d93340dfa6 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/next (193cb8372424 uml: Remove the initialization of statics to 0) Merging xtensa/xtensa-for-next (b8c4f4db2436 xtensa: update config files) Merging pidfd/for-next (6a857ab5b57c Merge branch 'fs.idmapped.overlay.acl' into for-next) Merging vfs-idmapping/for-next (e95f86d0c525 Merge branch 'fs.ovl.setgid' into for-next) Merging fscrypt/master (02aef4225258 fscrypt: pass super_block to fscrypt_put_master_key_activeref()) Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) Merging afs/afs-next (1dd7bb25658d afs: remove afs_cache_netfs and afs_zap_permits() declarations) Merging btrfs/for-next (07d7d9dff0c8 Merge branch 'for-next-next-v6.1-20221123' into for-next-20221123) CONFLICT (content): Merge conflict in fs/btrfs/ctree.h Applying: btrfs: fix up for "fs: pass dentry to set acl method" Merging ceph/master (5bd76b8de5b7 ceph: fix NULL pointer dereference for req->r_session) Merging cifs/for-next (beb6004ff91c Fix path in cifs/usage.rst) Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem()) Merging ecryptfs/next (c1cc2db21607 ecryptfs: keystore: Fix typo 'the the' in comment) Merging erofs/dev (312fe643ad11 erofs: clean up erofs_iget()) Merging exfat/dev (3d0cdf1b32dc exfat: hint the empty entry which at the end of cluster chain) Merging ext3/for_next (9fb3f7709935 Pull inode use-after-free fix.) Merging ext4/dev (4e3c51f4e805 fs: do not update freeing inode i_io_list) Merging f2fs/dev (967eaad1fed5 f2fs: fix to set flush_merge opt and show noflush_merge) Merging fsverity/fsverity (276616fff35d fsverity: stop using PG_error to track error status) Merging fuse/for-next (1b0e94993dbe fuse: optional supplementary group in create requests) Merging gfs2/for-next (288fc8606762 Merge tag 'gfs2-nopid-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) Merging jfs/jfs-next (a60dca73a1a8 jfs: makes diUnmount/diMount in jfs_mount_rw atomic) Merging ksmbd/ksmbd-for-next (5e40d197b564 ksmbd: use F_SETLK when unlocking a file) Merging nfs/linux-next (094226ad94f4 Linux 6.1-rc5) Merging nfs-anna/linux-next (7e8436728e22 nfs4: Fix kmemleak when allocate slot failed) Merging nfsd/for-next (7c3bdf7bd3ba NFSD: add CB_RECALL_ANY tracepoints) Merging ntfs3/master (36963cf225f8 fs/ntfs3: Make if more readable) CONFLICT (content): Merge conflict in fs/ntfs3/bitmap.c CONFLICT (content): Merge conflict in fs/ntfs3/inode.c CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c Applying: fix up for "fs: rename current get acl method" Merging orangefs/for-next (2ad4b6f5e117 Orangefs: change iterate to iterate_shared) Merging overlayfs/overlayfs-next (b337e5ae0e42 ovl: Kconfig: Fix spelling mistake "undelying" -> "underlying") Merging ubifs/next (669d204469c4 ubi: fastmap: Add fastmap control support for 'UBI_IOCATT' ioctl) Merging v9fs/9p-next (391c18cf776e 9p/xen: check logical size for buffer size) Merging xfs/for-next (28b4b0596343 xfs: fix incorrect i_nlink caused by inode racing) Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag) Merging iomap/iomap-for-next (f1bd37a47352 iomap: directly use logical block size) Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap) Merging file-locks/locks-next (0513283941f6 Add process name and pid to locks warning) Merging iversion/iversion-next (2b3319b35573 nfsd: remove fetch_iversion export operation) Merging vfs/for-next (3aca47127a64 fs: drop useless condition from inode_needs_update_time) Merging printk/for-next (11f1e536902b Merge branch 'for-6.2' into for-next) Merging pci/next (0a9dc1e9365b Merge branch 'pci/kbuild') Merging pstore/for-next/pstore (38b91847c314 pstore: Alert on backend write error) Merging hid/for-next (780f0d711574 Merge branch 'for-6.1/upstream-fixes' into for-next) Merging i2c/i2c/for-next (ee98d665b461 Merge branch 'i2c/for-mergewindow' into i2c/for-next) Merging i3c/i3c/next (9abf2313adc1 Linux 6.1-rc1) Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) Merging hwmon-staging/hwmon-next (2c71b3246ec3 hwmon: (gsc-hwmon) Switch to flexible array to simplify code) Merging jc_docs/docs-next (6da1f1e246d0 Merge branch 'docs-mw' into docs-next) Merging v4l-dvb/master (1e284ea984d3 Merge git://linuxtv.org/sailus/media_tree into media_stage) Merging v4l-dvb-next/master (b9fbe29c5906 Merge tag 'br-v6.2d' of git://linuxtv.org/hverkuil/media_tree into media_stage) Merging pm/linux-next (611bfa6eb1e0 Merge branches 'thermal-core' and 'thermal-intel' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (4370232c727b cpufreq: qcom-hw: Add CPU clock provider support) Merging cpupower/cpupower (9abf2313adc1 Linux 6.1-rc1) Merging devfreq/devfreq-next (5fdded844892 PM/devfreq: governor: Add a private governor_data for governor) Merging opp/opp/linux-next (dba79b78ecc1 dt-bindings: opp-v2: Fix clock-latency-ns prop in example) Merging thermal/thermal/linux-next (9d2bc364f677 thermal/drivers/qcom/tsens: Simplify debugfs init function) CONFLICT (content): Merge conflict in drivers/thermal/thermal_sysfs.c $ git merge --abort Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) Merging dlm/next (7a5e9f1f83e3 fs: dlm: fix building without lockdep) Merging rdma/for-next (b4d46c57d2fb RDMA/erdma: Fix a typo in annotation) Merging net-next/master (14e5f71e31ff net: use %pS for kfree_skb tracing event location) CONFLICT (content): Merge conflict in tools/perf/util/stat.c Merging bpf-next/for-next (6099754a1493 Merge branch 'bpf: Add bpf_rcu_read_lock() support') CONFLICT (content): Merge conflict in include/linux/bpf.h CONFLICT (content): Merge conflict in tools/lib/bpf/ringbuf.c Merging ipsec-next/master (cc2bbbfd9a50 xfrm: Remove not-used total variable) Merging mlx5-next/mlx5-next (9abf2313adc1 Linux 6.1-rc1) Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging ipvs-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bluetooth/master (f492d22c0e7f dt-bindings: bluetooth: broadcom: add BCM43430A0 & BCM43430A1) Merging wireless-next/for-next (3b79d4bad3a0 wifi: p54: Replace zero-length array of trailing structs with flex-array) Merging mtd/mtd/next (2399401feee2 mtd: maps: pxa2xx-flash: fix memory leak in probe) Merging nand/nand/next (9c31d6b40c8e mtd: rawnand: Drop obsolete dependencies on COMPILE_TEST) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml CONFLICT (content): Merge conflict in drivers/mtd/nand/onenand/Kconfig Merging spi-nor/spi-nor/next (1799cd8540b6 mtd: spi-nor: add SFDP fixups for Quad Page Program) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml Merging crypto/master (8e96729fc26c crypto: ccree - Make cc_debugfs_global_fini() available for module init function) Merging drm/drm-next (d47f9580839e Backmerge tag 'v6.1-rc6' into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_job.c Merging drm-misc/for-linux-next (b02897e56b4e Revert "drm/fb-helper: Perform damage handling in deferred-I/O helper") Merging amdgpu/drm-next (10d2d1fc05f0 drm/amdgpu: Partially revert "drm/amdgpu: update drm_display_info correctly when the edid is read") Merging drm-intel/for-linux-next (3d335a523b93 Merge tag 'drm-intel-next-2022-11-18' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) Merging drm-tegra/for-next (1eb336ed12cd gpu: host1x: Staticize host1x_syncpt_fence_ops) Merging drm-msm/msm-next (d73b1d02de08 drm/msm: Hangcheck progress detection) Merging drm-msm-lumag/msm-next-lumag (2c039475d5bc Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi' and 'msm-next-lumag-mdp5' into msm-next-lumag) Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) Merging etnaviv/etnaviv/next (a3b4c2f9b039 drm/etnaviv: switch to PFN mappings) Merging fbdev/for-next (652888c46397 fbdev: ep93xx-fb: Add missing clk_disable_unprepare in ep93xxfb_probe()) Merging regmap/for-next (d041845f53bf Merge remote-tracking branch 'regmap/for-6.2' into regmap-next) Merging sound/for-next (cf59e1e4c79b ALSA: seq: fix undefined behavior in bit shift for SNDRV_SEQ_FILTER_USE_EVENT) Merging sound-asoc/for-next (288f75c2e6d4 Merge remote-tracking branch 'asoc/for-6.2' into asoc-next) Merging modules/modules-next (c86a514f5fad kallsyms: Remove unneeded semicolon) Merging input/next (9f4211bf7f81 HID: add mapping for camera access keys) Merging block/for-next (43f3ae1898c9 Merge branch 'for-6.2/writeback' into for-next) Merging device-mapper/for-next (984bf2cc531e dm integrity: clear the journal on suspend) Merging libata/for-next (3d8a3ae3d966 ata: libata: fix commands incorrectly not getting retried during NCQ error) Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver) Merging mmc/next (cb713d1f69ae memstick/ms_block: Add check for alloc_ordered_workqueue) Merging mfd/for-mfd-next (2c9918463543 mfd: tc6393xb: Remove #ifdef guards for PM related functions) Merging backlight/for-backlight-next (e7647de058cb video: backlight: mt6370: Add MediaTek MT6370 support) Merging battery/for-next (955bee204f3d power: supply: z2_battery: Fix possible memleak in z2_batt_probe()) Merging regulator/for-next (24518ea4b811 Merge remote-tracking branch 'regulator/for-6.2' into regulator-next) Merging security/next (572302af1258 reiserfs: Add missing calls to reiserfs_security_free()) CONFLICT (content): Merge conflict in security/commoncap.c Merging apparmor/apparmor-next (4295c60bbe9e apparmor: Fix uninitialized symbol 'array_size' in policy_unpack_test.c) CONFLICT (content): Merge conflict in security/apparmor/domain.c Merging integrity/next-integrity (25369175ce84 ima: Fix misuse of dereference of pointer in template_desc_init_fields()) Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) Merging selinux/next (048be156491f selinux: remove the sidtab context conversion indirect calls) CONFLICT (content): Merge conflict in security/selinux/ss/services.c CONFLICT (content): Merge conflict in security/selinux/ss/sidtab.c CONFLICT (content): Merge conflict in security/selinux/ss/sidtab.h Applying: selinux: fix up for "selinux: enable use of both GFP_KERNEL and GFP_ATOMIC in convert_context()" Merging smack/next (1a3065e92046 smack_lsm: remove unnecessary type casting) Merging tomoyo/master (88ba4e14d341 workqueue: Emit runtime message when flush_scheduled_work() is called) Merging tpmdd/next (fd6628650d1a KEYS: trusted: tee: Make registered shm dependency explicit) Merging watchdog/master (9ec0b7e06835 watchdog: aspeed: Enable pre-timeout interrupt) Merging iommu/next (69a6c7d969f5 Merge branches 'arm/allwinner', 'arm/exynos', 'arm/mediatek', 'arm/rockchip', 'arm/smmu', 'ppc/pamu', 's390', 'x86/vt-d', 'x86/amd' and 'core' into next) Merging audit/next (50979953c0c4 audit: unify audit_filter_{uring(), inode_name(), syscall()}) Merging devicetree/for-next (0bce07c75819 dt-bindings: Move fixed string node names under 'properties') Merging dt-krzk/for-next (043d4036e8ee Merge branch 'next/dt' into for-next) Merging mailbox/mailbox-for-next (b8ae88e1e75e mailbox: qcom-ipcc: flag IRQ NO_THREAD) Merging spi/for-next (7c1a48ce1cf2 Merge remote-tracking branch 'spi/for-6.2' into spi-next) Merging tip/master (08cd7fc80c45 Merge x86/boot into tip/master) CONFLICT (content): Merge conflict in arch/x86/net/bpf_jit_comp.c CONFLICT (modify/delete): drivers/iommu/iommu-sva-lib.c deleted in HEAD and modified in tip/master. Version tip/master of drivers/iommu/iommu-sva-lib.c left in tree. CONFLICT (content): Merge conflict in drivers/pci/controller/Kconfig CONFLICT (content): Merge conflict in drivers/pci/controller/dwc/Kconfig CONFLICT (content): Merge conflict in drivers/pci/controller/mobiveil/Kconfig CONFLICT (content): Merge conflict in tools/objtool/check.c $ git rm -f drivers/iommu/iommu-sva-lib.c Applying: fix up for "iommu: Rename iommu-sva-lib.{c,h}" Merging clockevents/timers/drivers/next (af246cc6d0ed clocksource/drivers/arm_arch_timer: Fix CNTPCT_LO and CNTVCT_LO value) Merging edac/edac-for-next (b998a2babf4e Merge edac-misc into for-next) Merging irqchip/irq/irqchip-next (732d69c80cb0 Merge branch irq/misc-6.1 into irq/irqchip-next) Merging ftrace/for-next (bd604f3db49c ftrace: Avoid needless updates of the ftrace function call) Merging rcu/rcu/next (39035b41bccb tools/memory-model: Use "grep -E" instead of "egrep") Merging kvm/next (d72cf8ffe460 Merge tag 'kvm-s390-master-6.1-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) Merging kvm-arm/next (34afaeadba94 Merge branch kvm-arm64/pmu-unchained into kvmarm-master/next) Merging kvms390/next (bedac519eefa s390/vfio-ap: check TAPQ response code when waiting for queue reset) CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h Merging xen-tip/linux-next (4abb77fc5531 xen/platform-pci: use define instead of literal number) Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) Merging workqueues/for-next (c0feea594e05 workqueue: don't skip lockdep work dependency in cancel_work_sync()) Merging drivers-x86/for-next (e32354bb8fe3 platform/x86/intel/hid: Add module-params for 5 button array + SW_TABLET_MODE reporting) Merging chrome-platform/for-next (f9e510dc92df platform/chrome: cros_ec: Convert to i2c's .probe_new()) Merging hsi/for-next (8acbca3a92b8 headers: Remove some left-over license text in include/uapi/linux/hsi/) Merging leds/for-next (5f52a8ba7e91 dt-bindings: leds: Add 'cpuX' to 'linux,default-trigger') Merging ipmi/for-next (0eb1762f3c77 ipmi/watchdog: Include <linux/kstrtox.h> when appropriate) Merging driver-core/driver-core-next (2613cc29c572 cacheinfo: Remove of_node_put() for fw_token) Merging usb/usb-next (907140462eb5 usb: usb251xb: Convert to i2c's .probe_new()) Merging thunderbolt/next (a5cfc9d65879 thunderbolt: Add wake on connect/disconnect on USB4 ports) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (247f34f7b803 Linux 6.1-rc2) Merging tty/tty-next (6373ab4dfee7 serial: atmel: don't stop the transmitter when doing PIO) Merging char-misc/char-misc-next (02cd3032b154 cxl: fix possible null-ptr-deref in cxl_pci_init_afu|adapter()) CONFLICT (content): Merge conflict in drivers/firmware/raspberrypi.c Merging coresight/next (bd7e9cef2137 coresight: cti: Fix null pointer error on CTI init before ETM) Merging fpga/for-next (ee31d5038c06 dt-bindings: fpga: document Lattice sysCONFIG FPGA manager) Merging icc/icc-next (26e90ec7a840 Merge branch 'icc-sc8280xp-l3' into icc-next) Merging iio/togreg (f84eec02b724 iio: addac: ad74413r: fix blank line after declaration warning) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml Merging phy-next/next (bea3ce759b46 phy: ti: phy-j721e-wiz: add j721s2-wiz-10g module support) Merging soundwire/next (7cbf00bd4142 soundwire: intel: split auxdevice to different file) Merging extcon/extcon-next (de05153ffce5 extcon: usbc-tusb320: Convert to i2c's .probe_new()) Merging gnss/gnss-next (247f34f7b803 Linux 6.1-rc2) Merging vfio/next (2f5d8cef45c3 vfio/mlx5: Fix a typo in mlx5vf_cmd_load_vhca_state()) Merging staging/staging-next (9dadff066244 staging: iio: ade7854: Convert to i2c's .probe_new()) Merging counter-next/counter-next (30a0b95b1335 Linux 6.1-rc3) Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) Merging dmaengine/next (3a0c95b61385 dmaengine: tegra: Add support for dma-channel-mask) Merging cgroup/for-next (674b745e22b3 cgroup: remove rcu_read_lock()/rcu_read_unlock() in critical section of spin_lock_irq()) Merging scsi/for-next (6f1be50a0e3d Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (ae8011fe076d scsi: target: core: Change the way target_xcopy_do_work() sets restiction on max I/O) Merging vhost/linux-next (be8ddea9e75e vdpa/ifcvf: add reviewer) Merging rpmsg/for-next (86747c0093ff Merge branches 'rproc-next' and 'hwspinlock-next' into for-next) Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging gpio-brgl/gpio/for-next (7963ba02b2d1 gpio: pcf857x: Convert to i2c's .probe_new()) CONFLICT (content): Merge conflict in arch/arm64/Kconfig Merging gpio-intel/for-next (8d259847243d gpiolib: cdev: Fix typo in kernel doc for struct line) Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) Merging pinctrl/for-next (06ec38c85f48 Merge branch 'devel' into for-next) CONFLICT (content): Merge conflict in MAINTAINERS Merging pinctrl-intel/for-next (b14ef61314b3 pinctrl: intel: Add Intel Moorefield pin controller support) Merging pinctrl-renesas/renesas-pinctrl (80d34260f36c pinctrl: renesas: gpio: Use dynamic GPIO base if no function GPIOs) Merging pinctrl-samsung/for-next (9abf2313adc1 Linux 6.1-rc1) Merging pwm/for-next (50315945d178 dt-bindings: pwm: renesas,tpu: Add r8a779g0 support) Merging userns/for-next (b5df013cd194 Merge of ucount-rlimits-cleanups-for-v5.19, interrupting_kthread_stop-for-v5.20, signal-for-v5.20, retire_mq_sysctls-for-v5.19, and unpriv-ipc-sysctls-for-v6.2 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 (c93924267fe6 selftests/efivarfs: Add checking of the test return value) Merging kunit/test (9abf2313adc1 Linux 6.1-rc1) Merging kunit-next/kunit (99c8c9276be7 kunit: tool: make --json do nothing if --raw_ouput is set) CONFLICT (content): Merge conflict in lib/kunit/string-stream.c Merging livepatching/for-next (cad81ab73997 Merge branch 'for-6.2/core' into for-next) Merging rtc/rtc-next (a6ceee26fd5e rtc: pcf85063: Fix reading alarm) Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) Merging at24/at24/for-next (9abf2313adc1 Linux 6.1-rc1) Merging ntb/ntb-next (1a3f7484e076 NTB: ntb_transport: fix possible memory leak while device_register() fails) Merging seccomp/for-next/seccomp (4e92863862d1 Merge branch 'for-linus/seccomp' into for-next/seccomp) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get) Merging slimbus/for-next (371fcbd32b26 dt-bindings: slimbus: qcom,slim-ngd: convert to DT schema) Merging nvmem/for-next (18133a57a935 dt-bindings: nvmem: add YAML schema for the ONIE tlv layout) Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated) Merging hyperv/hyperv-next (0b90efa6ca81 clocksource: hyper-v: Add TSC page support for root partition) Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy()) Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) Merging hmm/hmm (094226ad94f4 Linux 6.1-rc5) Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) Merging mhi/mhi-next (5562c6a9657e bus: mhi: host: pci_generic: Add definition for some VIDs) Merging memblock/for-next (80c2fe022ef5 memblock tests: remove completed TODO item) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) Merging cxl/next (3b39fd6cf12c cxl: Replace HDM decoder granularity magic numbers) Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2) Merging efi/next (196dff2712ca efi: random: combine bootloader provided RNG seed with RNG protocol output) CONFLICT (modify/delete): arch/x86/boot/compressed/efi_thunk_64.S deleted in HEAD and modified in efi/next. Version efi/next of arch/x86/boot/compressed/efi_thunk_64.S left in tree. CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/Makefile $ git rm -f arch/x86/boot/compressed/efi_thunk_64.S Applying: fix up for "efi: libstub: Permit mixed mode return types other than efi_status_t" Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) Merging slab/for-next (d5b960e7d2c9 Merge branch 'slub-tiny-v1r4' into slab/for-next) CONFLICT (content): Merge conflict in include/linux/percpu.h $ git reset --hard HEAD^ Merging next-20221123 version of slab CONFLICT (content): Merge conflict in include/linux/percpu.h [master a5c208600eaf] next-20221123/slab Merging random/master (e7b813b32a42 efi: random: refresh non-volatile random seed when RNG is initialized) Merging landlock/next (0b4ab8cd635e Merge tag 'landlock-6.1-rc4' into landlock-next) Merging rust/rust-next (fd9517a1603f init/Kconfig: Specify the interpreter for rust_is_available.sh) Merging sysctl/sysctl-next (0dff89c4488f sched: Move numa_balancing sysctls to its own file) Merging folio/for-next (03b33c09ea22 fs: remove the NULL get_block case in mpage_writepages) CONFLICT (content): Merge conflict in include/linux/migrate.h CONFLICT (content): Merge conflict in mm/migrate.c CONFLICT (content): Merge conflict in mm/migrate_device.c Merging execve/for-next/execve (cd57e443831d exec: Remove FOLL_FORCE for stack setup) Merging bitmap/bitmap-for-next (27bc50fc9064 Merge tag 'mm-stable-2022-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) Merging hte/for-next (9abf2313adc1 Linux 6.1-rc1) Merging kspp/for-next/kspp (d38b7b141afc mm: Make ksize() a reporting-only function) Merging kspp-gustavo/for-next/kspp (0811296c55b7 exportfs: Replace zero-length array with DECLARE_FLEX_ARRAY() helper) Merging unsigned-char/unsigned-char (0445d1bae1cc lib: assume char is unsigned) Merging iommufd/for-next (86f4f88ede4c Merge tag 'v6.1-rc6' into iommufd.git for-next) Merging mm-stable/mm-stable (ea0ffd0c08d0 swap: add a limit for readahead page-cluster value) CONFLICT (content): Merge conflict in mm/hugetlb.c Merging mm-nonmm-stable/mm-nonmm-stable (7b9cbc7701d5 scripts/spelling.txt: add more spellings to spelling.txt) Merging mm/mm-everything (5eb5c2dd309a Merge branch 'mm-nonmm-unstable' into mm-everything) CONFLICT (content): Merge conflict in include/linux/gfp.h CONFLICT (content): Merge conflict in mm/compaction.c CONFLICT (content): Merge conflict in mm/damon/sysfs.c CONFLICT (content): Merge conflict in mm/gup.c CONFLICT (content): Merge conflict in mm/huge_memory.c CONFLICT (content): Merge conflict in mm/khugepaged.c
Attachment:
pgpf7zuqcHaSd.pgp
Description: OpenPGP digital signature
