Hi all, Changes since 20221031: The imx-mxs tree lost its build failure. The btrfs tree gained a conflict against the btrfs-fixes tree. The cgroup tree lost its build failure. The nvmem tree gained a build failure so I used the version from next-20221031. The kunit-next tree gained a conflict against the kunit-fixes tree. The random tree lost its build failure. Non-merge commits (relative to Linus' tree): 3969 4075 files changed, 203967 insertions(+), 111827 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 365 trees (counting Linus' and 101 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 (5aaef24b5c6d Merge tag 'for-6.1-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm) Merging mm-hotfixes/mm-hotfixes-unstable (7016ff3c4f4f mm/mmap: fix memory leak in mmap_region()) Merging kbuild-current/fixes (fb3041d61f68 kbuild: fix SIGPIPE error message for AR=gcc-ar and AR=llvm-ar) Merging arc-current/for-curr (4fd9df10cb7a ARC: mm: fix leakage of memory allocated for PTE) Merging arm-current/fixes (14ca1a469075 ARM: 9247/1: mm: set readonly for MT_MEMORY_RO with ARM_LPAE) Merging arm64-fixes/for-next/fixes (13b056696291 vmlinux.lds.h: CFI: Reduce alignment of jump-table to function alignment) Merging arm-soc-fixes/arm/fixes (bd60aafce5e1 ARM: mmp: Make some symbols static) 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 (65722736c3ba powerpc/64s/interrupt: Fix clear of PACA_IRQS_HARD_DIS when returning to soft-masked context) Merging s390-fixes/fixes (e38de4804421 s390/vfio-ap: Fix memory allocation for mdev_types array) 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 (8bdc2acd420c net: sched: Fix use after free in red_enqueue()) Merging bpf/master (8bdc2acd420c net: sched: Fix use after free in red_enqueue()) Merging ipsec/master (7f57f8165cb6 af_key: Fix send_acquire race with pfkey_register) 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 (69188df5f6e4 wifi: mac80211_hwsim: fix debugfs attribute ps with rc table support) Merging rdma-fixes/for-rc (7a47e077e503 RDMA/qedr: clean up work queue on failure in qedr_alloc_resources()) Merging sound-current/for-linus (46cf1954de3f ALSA: arm: pxa: pxa2xx-ac97-lib: fix return value check of platform_get_irq()) Merging sound-asoc-fixes/for-linus (6f934afa6a98 ASoC: tas2780: Fix set_tdm_slot in case of single slot) Merging regmap-fixes/for-linus (157209ecce2b Merge remote-tracking branch 'regmap/for-6.0' into regmap-linus) Merging regulator-fixes/for-linus (dadd3e7cdcd1 Merge remote-tracking branch 'regulator/for-6.0' into regulator-linus) Merging spi-fixes/for-linus (920e7b6708ad Merge remote-tracking branch 'spi/for-6.0' into spi-linus) Merging pci-current/for-linus (39a654f39efb MAINTAINERS: Add Manivannan Sadhasivam as Qcom PCIe RC maintainer) Merging driver-core.current/driver-core-linus (54de93cd8740 kernel/utsname_sysctl.c: Add missing enum uts_proc value) Merging tty.current/tty-linus (30a0b95b1335 Linux 6.1-rc3) Merging usb.current/usb-linus (30a0b95b1335 Linux 6.1-rc3) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (df3414b0a245 USB: serial: option: add Sierra Wireless EM9191) Merging phy/fixes (04948e757148 phy: qcom-qmp-combo: fix NULL-deref on runtime resume) Merging staging.current/staging-linus (937ec9f7d5f2 staging: rtl8192e: remove bogus ssid character sign test) Merging iio-fixes/fixes-togreg (4751a9f58e4f tools: iio: iio_generic_buffer: Fix read size) Merging counter-current/counter-current (d501d37841d3 counter: 104-quad-8: Fix race getting function mode and direction) Merging char-misc.current/char-misc-linus (30a0b95b1335 Linux 6.1-rc3) Merging soundwire-fixes/fixes (49a467310dc4 soundwire: qcom: check for outanding writes before doing a read) Merging thunderbolt-fixes/fixes (30a0b95b1335 Linux 6.1-rc3) Merging input-current/for-linus (a01aca4b0517 dt-bindings: input: touchscreen: Add compatible for Goodix GT7986U chip) Merging crypto-current/master (9f6035af06b5 crypto: x86/polyval - Fix crashes when keys are not 16-byte aligned) Merging vfio-fixes/for-linus (873aefb376bb vfio/type1: Unpin zero pages) Merging kselftest-fixes/fixes (3d982441308e selftests: pidfd: Fix compling warnings) Merging modules-fixes/modules-linus (77d6354bd422 module/decompress: generate sysfs string at compile time) Merging dmaengine-fixes/fixes (d1ae5c45f654 dmaengine: apple-admac: Fix grabbing of channels in of_xlate) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (05e258c6ec66 mtd: parsers: bcm47xxpart: Fix halfblock reads) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (de547896aac6 media: vivid.rst: loop_video is set on the capture devnode) Merging reset-fixes/reset/fixes (ae358d71d462 reset: npcm: fix iprst2 and iprst4 setting) Merging mips-fixes/mips-fixes (9abf2313adc1 Linux 6.1-rc1) Merging at91-fixes/at91-fixes (0873509ea647 ARM: dts: lan966x: Enable sgpio on pcb8291) Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) Merging kvm-fixes/master (7353633814f6 KVM: x86/xen: Fix eventfd error handling in kvm_xen_eventfd_assign()) Merging kvms390-fixes/master (165dfb55facd KVM: s390: pv: don't allow userspace to set the clock under PV) Merging hwmon-fixes/hwmon (e18a9e894913 hwmon: (scmi) Register explicitly with Thermal Framework) Merging nvdimm-fixes/libnvdimm-fixes (b3bbcc5d1da1 Merge branch 'for-6.0/dax' into libnvdimm-fixes) Merging cxl-fixes/fixes (df4f5aa75d87 cxl/pmem: Use size_add() against integer overflow) Merging btrfs-fixes/next-fixes (738f7a2d84ed Merge branch 'misc-6.1' into next-fixes) Merging vfs-fixes/fixes (7ee47dcfff18 fs: use acquire ordering in __fget_light()) 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 (e9cf4d9b9a6f ACPI: video: Fix missing native backlight on Chromebooks) 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 (917c362b5f8a MAINTAINERS: of: collapse overlay entry into main device tree entry) Merging dt-krzk-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging scsi-fixes/fixes (307539eed463 scsi: ufs: core: Fix typo in comment) Merging drm-fixes/drm-fixes (30a0b95b1335 Linux 6.1-rc3) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (12caf46cf4fc drm/i915/sdvo: Grab mode_config.mutex during LVDS init to avoid WARNs) Merging mmc-fixes/fixes (8d280b1df87e mmc: sdhci_am654: 'select', not 'depends' REGMAP_MMIO) 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 (6c6ae6450682 MAINTAINERS: remove sthemmin) Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) Merging risc-v-fixes/fixes (8bc8824d3019 riscv: dts: sifive unleashed: Add PWM controlled LEDs) Merging risc-v-mc-fixes/dt-fixes (0dec364ffeb6 riscv: dts: microchip: use an mpfs specific l2 compatible) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) Merging fpga-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) Merging spdx/spdx-linus (30a0b95b1335 Linux 6.1-rc3) 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 (ce4b81568657 erofs: protect s_inodes with s_inode_list_lock for fscache) 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 (c18a80c6861f jffs2: correct logic when creating a hole in jffs2_write_begin) Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) Merging cel-fixes/for-rc (30bf340ba9d7 nfsd: fix net-namespace logic in __nfsd_file_cache_purge) 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 (5aaef24b5c6d Merge tag 'for-6.1-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) Merging efi-fixes/urgent (4e1c390e882d arm64: efi: Recover from synchronous exceptions occurring in firmware) Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) Merging battery-fixes/fixes (883babd43dcf power: supply: rk817: Change rk817_chg_cur_to_reg to int) 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 drm-misc-fixes/for-linux-next-fixes (6fdaed8c7988 drm/format-helper: Only advertise supported formats for conversion) Merging kbuild/for-next (2df76606db9d Merge tag 'kbuild-fixes-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) Merging perf/perf/core (940da138b03e 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 (c9cb01369b92 ARM/dma-mapping: remove the dma_coherent member of struct dev_archdata) Merging asm-generic/master (2e21c1575208 alpha: fix marvel_ioread8 build regression) Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) Merging arm/for-next (072132be9f91 Merge branches 'misc' and 'fixes' into for-next) Merging arm64/for-next/core (0e5d5ae837c8 arm64: Add AMPERE1 to the Spectre-BHB affected list) Merging arm-perf/for-next/perf (aaaee7b55c9e docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING) Merging arm-soc/for-next (e46b46e69739 soc: document merges) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (f665c485b1d2 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 (20ebe0f420d6 ARM: dts: aspeed: Remove Mihawk) Merging at91/at91-next (9abf2313adc1 Linux 6.1-rc1) Merging broadcom/next (9abf2313adc1 Linux 6.1-rc1) Merging davinci/davinci/for-next (53ad523ac435 ARM: davinci: fix repeated words in comments) Merging drivers-memory/for-next (de67fa80c669 dt-bindings: memory-controllers: arm,pl353-smc: Extend to support 'arm,pl354' SMC) Merging imx-mxs/for-next (89ca3fade6cb Merge branch 'imx/defconfig' into for-next) Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) Merging mediatek/for-next (cbb1618792e2 Merge branch 'v6.0-next/soc' into for-next) Merging mvebu/for-next (d5c48679d56c Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (8efe5dea6753 Merge branch 'omap-for-v6.1/dt' into for-next) Merging qcom/for-next (0df6c177c8f1 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 (4bff929bc882 Merge branches 'renesas-arm-dt-for-v6.2', 'renesas-arm-soc-for-v6.2' and 'renesas-dt-bindings-for-v6.2' into renesas-next) Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage") Merging rockchip/for-next (7771a384229f Merge branch 'v6.1-armsoc/dtsfixes' into for-next) Merging samsung-krzk/for-next (d70c19499aaf Merge branch 'next/clk' into for-next) Merging scmi/for-linux-next (a072ed416972 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 (7ad436adc788 ARM: multi_v7_defconfig: enable Type-C UCSI and STM32G0 as modules) Merging sunxi/sunxi/for-next (8907a276fec2 ARM: dts: axp22x/axp809: Add GPIO controller nodes) Merging tee/next (bd52407221b4 optee: Add __init/__exit annotations to module init/exit funcs) Merging tegra/for-next (81a9c53ea212 Merge branch for-6.2/arm64/defconfig into for-next) Merging ti/ti-next (f1ffcc9579f6 Merge branches 'ti-keystone-next', 'ti-k3-dts-next' and 'ti-drivers-soc-next' into ti-next) Merging xilinx/for-next (0413dd4d95da ARM: dts: zynq: add QSPI controller node) Merging clk/clk-next (96beb9fd1d90 Merge branch 'clk-fixes' into clk-next) Merging clk-imx/for-next (9abf2313adc1 Linux 6.1-rc1) Merging clk-renesas/renesas-clk (c82009584edb clk: renesas: rzg2l: Fix typo in struct rzg2l_cpg_priv kerneldoc) Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) Merging csky/linux-next (ce0ba954805e csky: Kconfig: Fix spelling mistake "Meory" -> "Memory") Merging loongarch/loongarch-next (247f34f7b803 Linux 6.1-rc2) Merging m68k/for-next (dc63a086daee m68k: Rework BI_VIRT_RNG_SEED as BI_RNG_SEED) Merging m68knommu/for-next (30a0b95b1335 Linux 6.1-rc3) 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 (9abf2313adc1 Linux 6.1-rc1) 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 (2b6ae0962b42 parisc: Avoid printing the hardware path twice) Merging powerpc/next (247f34f7b803 Linux 6.1-rc2) Merging soc-fsl/next (4b0986a3613c Linux 5.18) Merging risc-v/for-next (be79afc740b5 riscv: Enable HAVE_ARCH_HUGE_VMALLOC for 64BIT) Merging risc-v-mc/dt-for-next (d6105a8b7c16 riscv: dts: microchip: fix memory node unit address for icicle) Merging s390/for-next (c9c4220a9132 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 (7c83e6287eb4 Merge branch 'fs.idmapped.mnt_idmap' into for-next) Merging fscrypt/master (0e91fc1e0f5c fscrypt: work on block_devices instead of request_queues) 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 (26291c54e111 Linux 5.17-rc2) Merging btrfs/for-next (31bf1af75b06 Merge branch 'for-next-next-v6.1-20221027' into for-next-20221027) CONFLICT (content): Merge conflict in fs/btrfs/ctree.h Applying: btrfs: fix up for "fs: pass dentry to set acl method" Applying: fix up for "btrfs: fix lost file sync on direct IO write with nowait and dsync iocb" Merging ceph/master (ffc4d66a34bb ceph: fix a NULL vs IS_ERR() check when calling ceph_lookup_inode()) Merging cifs/for-next (8d98ed3c3180 cifs: always iterate smb sessions using primary channel) 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 (2e9ceb6728f1 exfat: fix overflow for large capacity partition) Merging ext3/for_next (ab7720a2b117 maintainers: Add ISOFS entry) Merging ext4/dev (1b45cc5c7b92 ext4: fix potential out of bound read in ext4_fc_replay_scan()) Merging f2fs/dev (35803e88eb9b f2fs: replace gc_urgent_high_remaining with gc_remaining_trials) Merging fsverity/fsverity (8377e8a24bba fs-verity: use kmap_local_page() instead of kmap()) Merging fuse/for-next (cbed990fb813 fuse: Rearrange fuse_allow_current_process checks) 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 (25e70c6162f2 fs: jfs: fix shift-out-of-bounds in dbDiscardAG) Merging ksmbd/ksmbd-for-next (f5ba1cdaf5eb ksmbd: validate share name from share config response) Merging nfs/linux-next (4fe89d07dcc2 Linux 6.0) Merging nfs-anna/linux-next (7e8436728e22 nfs4: Fix kmemleak when allocate slot failed) Merging nfsd/for-next (a6c38c8c6ff2 MAINTAINERS: NFSD should be responsible for fs/exportfs) Merging ntfs3/master (0d6d7c61ffee fs/ntfs3: Don't use uni1 uninitialized in ntfs_d_compare()) CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c 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 (a8e633c60447 net/9p: clarify trans_fd parse_opt failure handling) Merging xfs/for-next (9f187ba0d517 Merge tag 'fix-log-recovery-misuse-6.1_2022-10-31' of git://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux into xfs-6.1-fixes) Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag) Merging iomap/iomap-for-next (adc9c2e5a723 iomap: add a tracepoint for mappings returned by map_blocks) Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap) Merging file-locks/locks-next (072e51356cd5 Merge tag 'nfs-for-5.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) 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 (dd283899b31c Merge branch 'for-6.2' into for-next) Merging pci/next (652ce11a7604 Merge branch 'remotes/lorenzo/pci/tegra') Merging pstore/for-next/pstore (38b91847c314 pstore: Alert on backend write error) Merging hid/for-next (914abae32bd2 Merge branch 'for-6.2/hyperv' into for-next) Merging i2c/i2c/for-next (fd142e074e89 Merge branch 'i2c/for-current-fixed' 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 (6b780408be03 hwmon: (pmbus/ltc2978) add support for LTC7132) Merging jc_docs/docs-next (0b7c7bfd93f9 Merge branch 'docs-mw' into docs-next) Merging v4l-dvb/master (247f34f7b803 Linux 6.1-rc2) Merging v4l-dvb-next/master (de547896aac6 media: vivid.rst: loop_video is set on the capture devnode) Merging pm/linux-next (111ae903a8e6 Merge branches 'acpi-scan', 'acpi-resource' and 'acpi-pcc' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (889a50aedcd2 cpufreq: sun50i: Switch to use dev_err_probe() helper) Merging cpupower/cpupower (9abf2313adc1 Linux 6.1-rc1) Merging devfreq/devfreq-next (9abf2313adc1 Linux 6.1-rc1) Merging opp/opp/linux-next (c7e31e36d8a2 dt-bindings: opp: Add missing (unevaluated|additional)Properties on child nodes) Merging thermal/thermal/linux-next (9d2bc364f677 thermal/drivers/qcom/tsens: Simplify debugfs init function) Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) Merging dlm/next (3b7610302a75 fs: dlm: fix possible use after free if tracing) Merging rdma/for-next (4508d32ccced RDMA/core: Fix order of nldev_exit call) Merging net-next/master (0cf9deb3005f net: mvneta: Remove unused variable i) Merging bpf-next/for-next (97c4090badca bpf: Remove the obsolte u64_stats_fetch_*_irq() users.) 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 (214c507d87cc Bluetooth: Use kzalloc instead of kmalloc/memset) Merging wireless-next/for-next (a9501019f2de Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging mtd/mtd/next (aec4d5f5ffd0 mtd: parsers: add TP-Link SafeLoader partitions table parser) CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c Merging nand/nand/next (7c3fc99819fd mtd: rawnand: cadence: support 64-bit slave dma interface) Merging spi-nor/spi-nor/next (bb0e9c600ce2 mtd: spi-nor: core: Add an error message when failing to exit the 4-byte address mode) Merging crypto/master (d6e9aa6e1ea8 crypto: octeontx - fix repeated words in comments) Merging drm/drm-next (7f7a942c0a33 Merge tag 'drm-next-20221025' of git://linuxtv.org/pinchartl/media into drm-next) Merging drm-misc/for-linux-next (da7ffb9660c9 drm/vmwgfx: Cleanup the cursor snooping code) Merging amdgpu/drm-next (e826963353c0 drm/amdgpu: force read discovery file if set discovery=2) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_crat.c Applying: fixup for bad merge of "drm/amd: Add IMU fw version to fw version queries" Merging drm-intel/for-linux-next (a6ebd538364b drm/i915/sdvo: Fix debug print) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_power_well.c CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i915/display/intel_dkl_phy.c CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i915/display/intel_dkl_phy.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dpll_mgr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_lvds.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_sdvo.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/skl_watermark.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_driver.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h Merging drm-tegra/for-next (778bed334508 gpu: host1x: Update host1x_memory_context_alloc() !IOMMU_API stub) Merging drm-msm/msm-next (e8b595f7b058 drm/msm/hdmi: make hdmi_phy_8996 OF clk provider) Merging drm-msm-lumag/msm-next-lumag (e8b595f7b058 drm/msm/hdmi: make hdmi_phy_8996 OF clk provider) Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) Merging etnaviv/etnaviv/next (4bce24427251 drm/etnaviv: disable tx clock gating for GC7000 rev6203) Merging fbdev/for-next (30a0b95b1335 Linux 6.1-rc3) Merging regmap/for-next (7c7aa42243cb Merge branch 'regmap-linus' into regmap-next) Merging sound/for-next (2b4e275b92b8 ALSA: asihpi: remove variable loops) Merging sound-asoc/for-next (efe2164f265d Merge remote-tracking branch 'asoc/for-6.2' into asoc-next) Merging modules/modules-next (dd0338eef0d4 kernel/params.c: defer most of param_sysfs_init() to late_initcall time) Merging input/next (d444b9e06e01 Input: Add driver for Cypress Generation 5 touchscreen) Merging block/for-next (ac88ca6d27df Merge branch 'for-6.2/block' into for-next) Merging device-mapper/for-next (5434ee8d2857 dm clone: Fix typo in block_device format specifier) Merging libata/for-next (de58fd3d80f8 ata: sata_dwc_460ex: remove variable num_processed) Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver) Merging mmc/next (1537fb63f79e mmc: mediatek: add support for MT7986 SoC) Merging mfd/for-mfd-next (df3a88e60ec1 dt-bindings: mfd: qcom,tcsr: Add sc8280xp binding) Merging backlight/for-backlight-next (e7647de058cb video: backlight: mt6370: Add MediaTek MT6370 support) Merging battery/for-next (eae063f64714 power: supply: mt6360: Use LINEAR_RANGE_IDX()) Merging regulator/for-next (98e2892aebdf Merge branch 'regulator-linus' into regulator-next) Merging security/next (610b17b05c5c audit: Fix some kernel-doc warnings) Merging apparmor/apparmor-next (3265949f7cd3 apparmor: Fix memleak issue in unpack_profile()) Merging integrity/next-integrity (5adedd42245a KEYS: encrypted: fix key instantiation with user-provided data) 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 (e0d8259355cb selinux: increase the deprecation sleep for checkreqprot and runtime disable) Merging smack/next (f393b3fd2a4b smack: cleanup obsolete mount option flags) Merging tomoyo/master (9abf2313adc1 Linux 6.1-rc1) Merging tpmdd/next (2d869f0b4585 selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle) Merging watchdog/master (82ebbe65d781 drivers: watchdog: exar_wdt.c fix use after free) Merging iommu/next (620bf9f98136 iommu/vt-d: Clean up si_domain in the init_dmars() error path) Merging audit/next (50979953c0c4 audit: unify audit_filter_{uring(), inode_name(), syscall()}) Merging devicetree/for-next (c2741cbe7f8a dt-bindings: media: st,stmipid02: Convert the text bindings to YAML) Merging dt-krzk/for-next (455087308947 Merge branch 'next/qcom-pinctrl' into for-next) Merging mailbox/mailbox-for-next (b8ae88e1e75e mailbox: qcom-ipcc: flag IRQ NO_THREAD) Merging spi/for-next (c03c8295439c Merge remote-tracking branch 'spi/for-6.2' into spi-next) Merging tip/master (b8cc3fc13619 Merge branch into tip/master: 'x86/sev') CONFLICT (content): Merge conflict in arch/x86/net/bpf_jit_comp.c 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 (0934ae9977c2 tracing: Fix reading strings from synthetic events) Merging rcu/rcu/next (ffb4efcd9d61 locking/memory-barriers.txt: Improve documentation for writel() example) Merging kvm/next (7353633814f6 KVM: x86/xen: Fix eventfd error handling in kvm_xen_eventfd_assign()) Merging kvm-arm/next (b302ca52ba82 Merge branch kvm-arm64/misc-6.1 into kvmarm-master/next) Merging kvms390/next (c8a0273ac80d KVM: s390: Pass initialized arg even if unused) Merging xen-tip/linux-next (a383dcb1cca8 xen/virtio: Convert PAGE_SIZE/PAGE_SHIFT/PFN_UP to Xen counterparts) Merging percpu/for-next (a111daf0c53a Linux 5.19-rc3) Merging workqueues/for-next (c0feea594e05 workqueue: don't skip lockdep work dependency in cancel_work_sync()) Merging drivers-x86/for-next (225469d4acbc platform/x86: huawei-wmi: remove unnecessary member) Merging chrome-platform/for-next (e068bc0b01cf dt-bindings: cros-ec: Add ChromeOS fingerprint binding) Merging hsi/for-next (9abf2313adc1 Linux 6.1-rc1) Merging leds/for-next (5f52a8ba7e91 dt-bindings: leds: Add 'cpuX' to 'linux,default-trigger') Merging ipmi/for-next (cad3fe56d03e ipmi: Fix some kernel-doc warnings) Merging driver-core/driver-core-next (1662cea4623f kset: fix memory leak when kset_register() returns error) Merging usb/usb-next (8527e9421690 Merge 6.1-rc3 into usb-next) Merging thunderbolt/next (2ae18cc2269f thunderbolt: ACPI: Use the helper fwnode_find_reference()) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (247f34f7b803 Linux 6.1-rc2) Merging tty/tty-next (30a0b95b1335 Linux 6.1-rc3) Merging char-misc/char-misc-next (30a0b95b1335 Linux 6.1-rc3) Merging coresight/next (30a0b95b1335 Linux 6.1-rc3) Merging fpga/for-next (ee31d5038c06 dt-bindings: fpga: document Lattice sysCONFIG FPGA manager) Merging icc/icc-next (9abf2313adc1 Linux 6.1-rc1) Merging iio/togreg (6d965885f4ea iio: adc: mcp3911: add support for oversampling ratio) Merging phy-next/next (25dcaf94448f Merge branch 'fixes' into next) Merging soundwire/next (cf43cd33b67a soundwire: qcom: add support for v1.7 Soundwire Controller) Merging extcon/extcon-next (9abf2313adc1 Linux 6.1-rc1) Merging gnss/gnss-next (247f34f7b803 Linux 6.1-rc2) Merging vfio/next (b1b8132a651c vfio: More vfio_file_is_group() use cases) Merging staging/staging-next (8cd75652300f staging: r8188eu: remove unused macros from wifi.h) Merging counter-next/counter-next (9abf2313adc1 Linux 6.1-rc1) Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) Merging dmaengine/next (cd0ab43ec91a dmaengine: remove iop-adma driver) Merging cgroup/for-next (79a7f41f7f5a cgroup: cgroup refcnt functions should be exported when CONFIG_DEBUG_CGROUP_REF) Merging scsi/for-next (c8d0d0a1110f Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (e6629dcb00ad scsi: MAINTAINERS: Make Xiang Chen HiSilicon SAS controller driver maintainer) Merging vhost/linux-next (be8ddea9e75e vdpa/ifcvf: add reviewer) Merging rpmsg/for-next (1b09681fdc30 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 (fbb19fe17eae gpio: pca9570: add slg7xl45106 support) 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 (bfe66c8bb35c Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (98e63c1140a4 pinctrl: intel: Use str_enable_disable() helper) Merging pinctrl-renesas/renesas-pinctrl (96355be8f0a2 dt-bindings: pinctrl: renesas: Document RZ/Five SoC) Merging pinctrl-samsung/for-next (9abf2313adc1 Linux 6.1-rc1) Merging pwm/for-next (4709f9ea338d pwm: sysfs: Replace sprintf() with sysfs_emit()) 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 (94fea664ae4e selftests/ftrace: Convert tracer tests to use 'requires' to specify program dependency) Merging livepatching/for-next (cad81ab73997 Merge branch 'for-6.2/core' into for-next) Merging rtc/rtc-next (9abf2313adc1 Linux 6.1-rc1) 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 (568035b01cfb Linux 6.0-rc1) 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 (c3174a51dc36 slimbus: qcom-ngd-ctrl: reinit the reconf completion flag) Merging nvmem/for-next (f34c056295b0 nvmem: stm32: fix spelling typo in comment) $ git reset --hard HEAD^ Merging next-20221031 version of nvmem Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated) Merging hyperv/hyperv-next (434243e8e739 hv_balloon: Add support for configurable order free page reporting) 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 (9abf2313adc1 Linux 6.1-rc1) Merging kunit/test (9abf2313adc1 Linux 6.1-rc1) Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) Merging kunit-next/kunit (29ad37f740d3 kunit: alloc_string_stream_fragment error handling bug fix) CONFLICT (content): Merge conflict in lib/kunit/string-stream.c Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) Merging mhi/mhi-next (1d96c542b291 MAINTAINERS: Remove Hemant from MHI bus) Merging memblock/for-next (3f82c9c4ac37 memblock: don't run loop in memblock_add_range() twice) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) Merging cxl/next (9abf2313adc1 Linux 6.1-rc1) 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 (53ec9ccd138f MAINTAINERS: adjust entry after arm64 efi-entry.S file movement) Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) Merging slab/for-next (938c9dbd50d4 Merge branch 'slab/for-6.2/fit_rcu_head' into slab/for-next) Merging random/master (394867c2471c random: remove early archrandom abstraction) Merging landlock/next (4bc90a766ea5 Merge branch 'landlock-test-build-fix' into landlock-next) Merging rust/rust-next (fd9517a1603f init/Kconfig: Specify the interpreter for rust_is_available.sh) Merging sysctl/sysctl-next (c06a17fe056b kernel/sysctl-test: use SYSCTL_{ZERO/ONE_HUNDRED} instead of i_{zero/one_hundred}) 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 (ef20c5139c31 binfmt_elf: simplify error handling in load_elf_phdrs()) 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 (cd1776b5b971 tpm: Avoid function type cast of put_device()) Merging kspp-gustavo/for-next/kspp (0811296c55b7 exportfs: Replace zero-length array with DECLARE_FLEX_ARRAY() helper) Merging unsigned-char/unsigned-char (60881f525a34 ipvs: use explicitly signed chars) Merging mm-stable/mm-stable (30a0b95b1335 Linux 6.1-rc3) Merging mm-nonmm-stable/mm-nonmm-stable (30a0b95b1335 Linux 6.1-rc3) Merging mm/mm-everything (192b49449de2 Merge branch 'mm-nonmm-unstable' into mm-everything) CONFLICT (content): Merge conflict in tools/testing/radix-tree/maple.c
Attachment:
pgpkJyojK7G_u.pgp
Description: OpenPGP digital signature
