Hi all, Changes since 20230214: The mmc tree gained conflicts against the arm-soc, crypto trees. The tip tree gained a conflict against Linus' tree. The ftrace tree gained a conflict against the jc_docs tree. The mm tree gained a conflict against the bpf-next tree. Non-merge commits (relative to Linus' tree): 11912 12209 files changed, 547890 insertions(+), 412309 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 356 trees (counting Linus' and 100 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 (e1c04510f521 Merge tag 'pm-6.2-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm) Merging mm-hotfixes/mm-hotfixes-unstable (1a520a4425b0 mm/page_alloc.c: fix page corruption caused by racy check in __free_pages) Merging kbuild-current/fixes (22e46f6480e8 kbuild: modinst: Fix build error when CONFIG_MODULE_SIG_KEY is a PKCS#11 URI) Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3) Merging arm-current/fixes (2f62847cf6ae ARM: 9287/1: Reduce __thumb2__ definition to crypto files that require it) Merging arm64-fixes/for-next/fixes (a428eb4b99ab Partially revert "perf/arm-cmn: Optimise DTC counter accesses") Merging arm-soc-fixes/arm/fixes (bc6772bbab9a Merge tag 'amlogic-fixes-v6.2-rc-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/fixes) Merging davinci-current/davinci/for-current (1b929c02afd3 Linux 6.2-rc1) Merging drivers-memory-fixes/fixes (cb8fd6f75775 memory: mvebu-devbus: Fix missing clk_disable_unprepare in mvebu_devbus_probe()) Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) Merging m68k-current/for-linus (553b20b211c4 m68k: defconfig: Update defconfigs for v6.1-rc1) Merging powerpc-fixes/fixes (2ea31e2e62bb powerpc/64s/interrupt: Fix interrupt exit race with security mitigation switch) Merging s390-fixes/fixes (7ab41c2c08a3 s390/decompressor: specify __decompress() buf len to avoid overflow) Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) Merging fscrypt-current/for-current (31e1be62abde MAINTAINERS: update fscrypt git repo) Merging fsverity-current/for-current (ef7592e466ef MAINTAINERS: update fsverity git repo, list, and patchwork) Merging net/master (05d7623a892a net: stmmac: Restrict warning on disabling DMA store and fwd mode) Merging bpf/master (b963d9d5b943 selftests: Fix failing VXLAN VNI filtering test) Merging ipsec/master (8222d5910dae xfrm: Zero padding when dumping algos and encap) 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 (92f3e96d642f netfilter: nf_tables: allow to fetch set elements when table has an owner) Merging wireless/for-next (80f8a66dede0 Revert "wifi: mac80211: fix memory leak in ieee80211_if_add()") Merging rdma-fixes/for-rc (ceaa837f96ad Linux 6.2-rc8) Merging sound-current/for-linus (9251584af092 ALSA: hda/realtek: Enable mute/micmute LEDs and speaker support for HP Laptops) Merging sound-asoc-fixes/for-linus (5afc7eefe416 ASoC: SOF: ops: refine parameters order in function snd_sof_dsp_update8) Merging regmap-fixes/for-linus (697c3892d825 regmap: apply reg_base and reg_downshift for single register ops) Merging regulator-fixes/for-linus (4bb3d82a1820 regulator: dt-bindings: samsung,s2mps14: add lost samsung,ext-control-gpios) Merging spi-fixes/for-linus (35bba23e6732 Merge remote-tracking branch 'spi/for-6.2' into spi-6.2) Merging pci-current/for-linus (1b929c02afd3 Linux 6.2-rc1) Merging driver-core.current/driver-core-linus (2241ab53cbb5 Linux 6.2-rc5) Merging tty.current/tty-linus (4ec5183ec486 Linux 6.2-rc7) Merging usb.current/usb-linus (ceaa837f96ad Linux 6.2-rc8) Merging usb-serial-fixes/usb-linus (4ec5183ec486 Linux 6.2-rc7) Merging phy/fixes (49ebb0024bb3 phy: rockchip-typec: fix tcphy_get_mode error case) Merging staging.current/staging-linus (2241ab53cbb5 Linux 6.2-rc5) Merging iio-fixes/fixes-togreg (42ec40b0883c iio: light: vcnl4000: Fix WARN_ON on uninitialized lock) Merging counter-current/counter-current (1b929c02afd3 Linux 6.2-rc1) Merging char-misc.current/char-misc-linus (4ec5183ec486 Linux 6.2-rc7) Merging soundwire-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) Merging thunderbolt-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) Merging input-current/for-linus (9c445d2637c9 Input: i8042 - add Clevo PCX0DX to i8042 quirk table) Merging crypto-current/master (736f88689c69 crypto: arm64/sm4 - fix possible crash with CFI enabled) Merging vfio-fixes/for-linus (51cdc8bc120e kvm/vfio: Fix potential deadlock on vfio group_lock) Merging kselftest-fixes/fixes (a49fb7218ed8 selftests: amd-pstate: Don't delete source files via Makefile) Merging modules-fixes/modules-linus (0254127ab977 module: Don't wait for GOING modules) Merging dmaengine-fixes/fixes (0a60cc31858f dmaengine: ptdma: check for null desc before calling pt_cmd_callback) Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) Merging mtd-fixes/mtd/fixes (c0f7ae27539f MAINTAINERS: Update email of Tudor Ambarus) Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) Merging v4l-dvb-fixes/fixes (89c08aef8f8d media: videobuf2: set q->streaming later) Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref) Merging mips-fixes/mips-fixes (88603b6dc419 Linux 6.2-rc2) Merging at91-fixes/at91-fixes (9bfa2544dbd1 ARM: dts: at91: sam9x60: fix the ddr clock for sam9x60) Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) Merging kvm-fixes/master (c2c46b10d526 KVM: selftests: Make reclaim_period_ms input always be positive) Merging kvms390-fixes/master (0dd4cdccdab3 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field) Merging hwmon-fixes/hwmon (e2de0e6abd91 hwmon: (asus-ec-sensors) add missing mutex path) Merging nvdimm-fixes/libnvdimm-fixes (c91d71363084 nvdimm: Support sizeof(struct page) > MAX_STRUCT_PAGE_SIZE) Merging cxl-fixes/fixes (711442e29f16 cxl/region: Fix passthrough-decoder detection) Merging btrfs-fixes/next-fixes (000f66519f1a Merge branch 'misc-6.2' into next-fixes) Merging vfs-fixes/fixes (9c7417b5ec44 coredump: Move dump_emit_page() to kill unused warning) Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted()) Merging drivers-x86-fixes/fixes (eb4b55f2f26f platform/x86/intel/vsec: Add support for Meteor Lake) Merging samsung-krzk-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) Merging pinctrl-samsung-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) Merging devicetree-fixes/dt/linus (707344c8a188 dt-bindings: interrupt-controller: arm,gic-v3: Fix typo in description of msi-controller property) Merging dt-krzk-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) Merging scsi-fixes/fixes (15600159bcc6 scsi: Revert "scsi: core: map PQ=1, PDT=other values to SCSI_SCAN_TARGET_PRESENT") Merging drm-fixes/drm-fixes (ceaa837f96ad Linux 6.2-rc8) Merging drm-intel-fixes/for-linux-next-fixes (d5a1224aa68c drm/i915/gen11: Wa_1408615072/Wa_1407596294 should be on GT list) Merging mmc-fixes/fixes (3f18c5046e63 mmc: jz4740: Work around bug on JZ4760(B)) Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) Merging gnss-fixes/gnss-linus (1b929c02afd3 Linux 6.2-rc1) 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 (950b879b7f02 riscv: Fixup race condition on PG_dcache_clean in flush_icache_pte) Merging riscv-dt-fixes/riscv-dt-fixes (43d5f5d63699 riscv: dts: sifive: fu740: fix size of pcie 32bit memory) Merging riscv-soc-fixes/riscv-soc-fixes (730892135b7d soc: microchip: mpfs: handle failed system service requests) Merging fpga-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) Merging spdx/spdx-linus (5dc4c995db9e Linux 6.2-rc4) Merging gpio-brgl-fixes/gpio/for-current (6d796c50f84c Linux 6.2-rc6) Merging gpio-intel-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) Merging pinctrl-intel-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) Merging erofs-fixes/fixes (e02ac3e7329f erofs: clean up parsing of fscache related options) Merging kunit-fixes/kunit-fixes (254c71374a70 kunit: fix kunit_test_init_section_suites(...)) Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) Merging memblock-fixes/fixes (647037adcad0 Revert "mm: Always release pages to the buddy allocator in memblock_free_late().") Merging nfsd-fixes/nfsd-fixes (4102db175b5d nfsd: don't destroy global nfs4_file table in per-net shutdown) 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 (f883675bf652 Merge tag 'gpio-fixes-for-v6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux) Merging efi-fixes/urgent (190233164cd7 arm64: efi: Force the use of SetVirtualAddressMap() on eMAG and Altra Max machines) Merging zstd-fixes/zstd-linus (0a2cbd1f53f3 lib: zstd: Fix -Wstringop-overflow warning) Merging battery-fixes/fixes (d137900f237a power: supply: axp288_fuel_gauge: Added check for negative values) 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 (88603b6dc419 Linux 6.2-rc2) Merging rust-fixes/rust-fixes (6618d69aa129 rust: print: avoid evaluating arguments in `pr_*` macros in `unsafe` blocks) Merging drm-misc-fixes/for-linux-next-fixes (bb2ff6c27bc9 drm: Disable dynamic debug as broken) Merging kbuild/for-next (0aee6bec0f44 Documentation/llvm: add Chimera Linux, Google and Meta datacenters) Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) Merging perf/perf/core (6a5558f11664 perf tools: Fix perf tool build error in util/pfm.c) Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attributes: Introduce __access_*() function attribute) Merging dma-mapping/for-next (3622b86f49f8 dma-mapping: reject GFP_COMP for noncoherent allocations) Merging asm-generic/master (a13408c20526 char/agp: introduce asm-generic/agp.h) Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) Merging arm/for-next (ba07b4efc989 Merge branches 'misc' and 'fixes' into for-next) Merging arm64/for-next/core (ad4a4d3aff21 Merge branch 'for-next/signal' into for-next/core) CONFLICT (content): Merge conflict in arch/arm64/Kconfig Merging arm-perf/for-next/perf (e8a709dc2a91 perf: arm_spe: Print the version of SPE detected) Merging arm-soc/for-next (954ca45433dc Merge branch 'soc/drivers' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-s3c/Makefile Merging amlogic/for-next (b6520fc7ee57 Merge branch 'v6.2/fixes' into for-next) Merging asahi-soc/asahi-soc/for-next (22991d8d5725 soc: apple: rtkit: Add register dump decoding to crashlog) Merging aspeed/for-next (af06aa236dd7 ARM: Add wpcm450_defconfig for Nuvoton WPCM450) Merging at91/at91-next (05ccf9c9c2fc Merge branch 'at91-dt' into at91-next) Merging broadcom/next (b691373a1bec Merge branch 'devicetree/next' into next) Merging davinci/davinci/for-next (eaafab7e8e26 MAINTAINERS: make me the maintainer of DaVinci platforms) Merging drivers-memory/for-next (957b573ea840 Merge branch 'mem-ctrl-next' into for-next) Merging imx-mxs/for-next (fd5368f6f08b Merge branch 'imx/defconfig' into for-next) Merging mediatek/for-next (74ba8bb2bfb2 Merge branch 'v6.2-next/soc' into for-next) Merging mvebu/for-next (b80b042da860 Merge branch 'mvebu/fixes' into mvebu/for-next) Merging omap/for-next (f68a6fc58073 Merge branch 'omap-for-v6.3/cleanup' into for-next) Merging qcom/for-next (b836adb6d62d Merge branches 'arm64-defconfig-for-6.3', 'arm64-for-6.3', 'clk-for-6.3', 'drivers-for-6.3' and 'dts-for-6.3' into for-next) Merging renesas/next (8dd3dae1705b Merge branches 'renesas-arm-defconfig-for-v6.3', 'renesas-drivers-for-v6.3', 'renesas-dt-bindings-for-v6.3' and 'renesas-dts-for-v6.3' into renesas-next) Merging reset/reset/next (1b929c02afd3 Linux 6.2-rc1) Merging rockchip/for-next (cc2b5be472c0 Merge branch 'v6.3-armsoc/dts32' into for-next) Merging samsung-krzk/for-next (da8d67f035b7 Merge branch 'next/dt' into for-next) Merging scmi/for-linux-next (6d796c50f84c Linux 6.2-rc6) Merging stm32/stm32-next (4e74ad9f3af6 ARM: configs: multi_v7: enable NVMEM driver for STM32) Merging sunxi/sunxi/for-next (caea0128c038 Merge branch 'sunxi/dt-for-6.3' into sunxi/for-next) Merging tee/next (816477edfba6 mm: Remove get_kernel_pages()) Merging tegra/for-next (de98d45290c7 Merge branch for-6.3/arm64/dt into for-next) Merging ti/ti-next (47d72bbb6c0f arm64: dts: ti: Makefile: Rearrange entries alphabetically) Merging xilinx/for-next (a18426505c2b Merge remote-tracking branch 'git/zynqmp/dt' into for-next) Merging clk/clk-next (83b105adf3a2 Merge branch 'clk-cleanup' into clk-next) Merging clk-imx/for-next (4e197ee880c2 clk: imx6ul: add ethernet refclock mux support) Merging clk-renesas/renesas-clk (b1dec4e78599 clk: renesas: rcar-gen3: Disable R-Car H3 ES1.*) Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) Merging csky/linux-next (4a3ec00957fd csky: delay: Add function alignment) Merging loongarch/loongarch-next (2d94a107d041 selftests/ftrace: Add LoongArch kprobe args string tests support) Merging m68k/for-next (1e5b5df65af9 m68k: /proc/hardware should depend on PROC_FS) Merging m68knommu/for-next (5aa52ccf692b m68k: nommu: Fix misspellings of "DragonEngine") Merging microblaze/next (1b929c02afd3 Linux 6.2-rc1) Merging mips/mips-next (159c610af8cd MIPS: ralink: Use devm_platform_get_and_ioremap_resource()) Merging openrisc/for-next (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc) Merging parisc-hd/for-next (3125e3b8f24c parisc: update kbuild doc. aliases for parisc64) Merging powerpc/next (08273c9f619c powerpc/rtas: arch-wide function token lookup conversions) Merging powerpc-objtool/topic/objtool (1b929c02afd3 Linux 6.2-rc1) Merging soc-fsl/next (4b0986a3613c Linux 5.18) Merging risc-v/for-next (9daca9a5b9ac Merge patch series "riscv: improve boot time isa extensions handling") CONFLICT (content): Merge conflict in arch/riscv/include/asm/hwcap.h CONFLICT (content): Merge conflict in arch/riscv/include/asm/vdso/processor.h CONFLICT (content): Merge conflict in arch/riscv/kernel/probes/simulate-insn.h Merging riscv-dt/riscv-dt-for-next (d9c36d016f61 Merge patch series "Add a devicetree for the Aldec PolarFire SoC TySoM") Merging riscv-soc/riscv-soc-for-next (f3460326e38d Merge patch series "JH7110 PMU Support") Merging s390/for-next (58c3bf44c273 Merge branch 'features' into for-next) Merging uml/next (04df97e150c8 Documentation: rust: Fix arch support table) Merging xtensa/xtensa-for-next (4414c1f5c7a3 xtensa: drop unused members of struct thread_struct) Merging pidfd/for-next (2372745ea25a selftests: add tests for prctl(SET_HIDE_SELF_EXE)) Merging vfs-idmapping/for-next (9db35c4c2bc4 Merge branch 'fs.misc' into for-next) CONFLICT (content): Merge conflict in fs/btrfs/inode.c CONFLICT (content): Merge conflict in fs/fuse/acl.c CONFLICT (content): Merge conflict in fs/fuse/fuse_i.h CONFLICT (content): Merge conflict in fs/fuse/xattr.c Merging fscrypt/for-next (097d7c1fcb8d fscrypt: clean up fscrypt_add_test_dummy_key()) 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 (a9eb558a5bea afs: Stop implementing ->writepage()) Merging btrfs/for-next (6fa9d725f5b2 Merge branch 'for-next-next-v6.2-20230210' into for-next-20230210) Merging ceph/master (e7d84c6a1296 ceph: flush cap releases when the session is flushed) Merging cifs/for-next (a58a6426f648 cifs: remove unneeded 2bytes of padding from smb2 tree connect) Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items) Merging ecryptfs/next (c1cc2db21607 ecryptfs: keystore: Fix typo 'the the' in comment) Merging erofs/dev (944e4bd7beeb erofs: unify anonymous inodes for blob) Merging exfat/dev (5742d6a467d1 exfat: handle unreconized benign secondary entries) Merging ext3/for_next (90e4f9e49826 Pull udf fixup for syzbot allocation failure handling bug.) Merging ext4/dev (1da18e38cb97 ext4: fix reserved cluster accounting in __es_remove_extent()) Merging f2fs/dev (a46bebd502fe f2fs: synchronize atomic write aborts) CONFLICT (content): Merge conflict in fs/f2fs/file.c CONFLICT (content): Merge conflict in fs/f2fs/namei.c Merging fsverity/for-next (51e4e3153ebc fscrypt: support decrypting data from large folios) Merging fuse/for-next (1cc4606d19e3 fuse: add inode/permission checks to fileattr_get/fileattr_set) Merging gfs2/for-next (b66f723bb552 gfs2: Improve gfs2_make_fs_rw error handling) Merging jfs/jfs-next (a60dca73a1a8 jfs: makes diUnmount/diMount in jfs_mount_rw atomic) Merging ksmbd/ksmbd-for-next (7a17c61ee3b2 ksmbd: Fix spelling mistake "excceed" -> "exceeded") Merging nfs/linux-next (2241ab53cbb5 Linux 6.2-rc5) Merging nfs-anna/linux-next (7e8436728e22 nfs4: Fix kmemleak when allocate slot failed) Merging nfsd/nfsd-next (edba207d2781 NFSD: Clean up nfsd_symlink()) Merging ntfs3/master (57c94236401b fs/ntfs3: Refactoring of various minor issues) Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) Merging overlayfs/overlayfs-next (4f11ada10d0a ovl: fail on invalid uid/gid mapping at copy up) Merging ubifs/next (8fcf2d012c86 ubi: block: Fix a possible use-after-free bug in ubiblock_create()) Merging v9fs/9p-next (2ce10bad1e96 9p/rdma: unmap receive dma buffer in rdma_request()/post_recv()) Merging v9fs-ericvh/ericvh/for-next (291ca06aad93 fs/9p: Fix revalidate) CONFLICT (content): Merge conflict in fs/9p/vfs_inode.c CONFLICT (content): Merge conflict in fs/9p/vfs_inode_dotl.c Merging xfs/for-next (dd07bb8b6baf xfs: revert commit 8954c44ff477) Merging zonefs/for-next (2b188a2cfc4d zonefs: make kobj_type structure constant) CONFLICT (content): Merge conflict in fs/zonefs/super.c Merging iomap/iomap-for-next (471859f57d42 iomap: Rename page_ops to folio_ops) Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request) Merging file-locks/locks-next (c65454a94726 fs: remove locks_inode) CONFLICT (content): Merge conflict in fs/fuse/file.c Merging iversion/iversion-next (58a033c9a3e0 nfsd: remove fetch_iversion export operation) CONFLICT (content): Merge conflict in fs/stat.c Merging vfs/for-next (e9f33f8668ab Merge branches 'work.misc', 'work.namespace', 'work.alpha', 'work.minix' and 'work.sysv' into for-next) Merging printk/for-next (89cbb0fd271f Merge branch 'for-6.3' into for-next) Merging pci/next (34d61afab691 Merge branch 'pci/misc') Merging pstore/for-next/pstore (88603b6dc419 Linux 6.2-rc2) Merging hid/for-next (760f504ec490 Merge branch 'for-6.3/logitech' into for-next) Merging i2c/i2c/for-next (ddc1acad4fe3 Merge branch 'i2c/for-mergewindow' into i2c/for-next) Merging i3c/i3c/next (e826acc18bc7 i3c: transfer pid from boardinfo to device info) Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) Merging hwmon-staging/hwmon-next (a1ffd3c46267 hwmon: (mlxreg-fan) Return zero speed for broken fan) Merging jc_docs/docs-next (e076f253283c Merge branch 'docs-mw' into docs-next) CONFLICT (content): Merge conflict in Documentation/hwmon/index.rst Merging v4l-dvb/master (94817983fb2c Merge tag 'v6.2-rc7' into media_tree) CONFLICT (content): Merge conflict in drivers/staging/media/Kconfig CONFLICT (content): Merge conflict in drivers/staging/media/Makefile Merging v4l-dvb-next/master (05165248df65 media: v4l2-ctrls-api.c: move ctrl->is_new = 1 to the correct line) CONFLICT (modify/delete): drivers/media/platform/ti/davinci/vpbe_display.c deleted in HEAD and modified in v4l-dvb-next/master. Version v4l-dvb-next/master of drivers/media/platform/ti/davinci/vpbe_display.c left in tree. CONFLICT (modify/delete): drivers/media/platform/ti/davinci/vpbe_osd.c deleted in HEAD and modified in v4l-dvb-next/master. Version v4l-dvb-next/master of drivers/media/platform/ti/davinci/vpbe_osd.c left in tree. CONFLICT (modify/delete): drivers/media/platform/ti/davinci/vpbe_venc.c deleted in HEAD and modified in v4l-dvb-next/master. Version v4l-dvb-next/master of drivers/media/platform/ti/davinci/vpbe_venc.c left in tree. $ git rm -f drivers/media/platform/ti/davinci/vpbe_display.c drivers/media/platform/ti/davinci/vpbe_osd.c drivers/media/platform/ti/davinci/vpbe_venc.c Merging pm/linux-next (dfe08e56df2e Merge branch 'thermal' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (ba38f3cbe7db dt-bindings: opp: opp-v2-kryo-cpu: enlarge opp-supported-hw maximum) Merging cpupower/cpupower (1b929c02afd3 Linux 6.2-rc1) Merging devfreq/devfreq-next (497e92ab8c8e PM / devfreq: Remove "select SRCU") Merging opp/opp/linux-next (eca4c0eea534 OPP: fix error checking in opp_migrate_dentry()) Merging thermal/thermal/linux-next (a2c81dc59d41 Merge back thermal control material for 6.3.) Merging dlm/next (723b197bbdf1 fs: dlm: remove unnecessary waker_up() calls) Merging rdma/for-next (9cd9842c4699 RDMA/irdma: Cap MSIX used to online CPUs + 1) Merging net-next/master (2edd92570441 devlink: don't allow to change net namespace for FW_ACTIVATE reload action) CONFLICT (modify/delete): Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst deleted in net-next/master and modified in HEAD. Version HEAD of Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst left in tree. CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/ice/ice_xsk.c $ git rm -f Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst Applying: fixup for "net/mlx5: Separate mlx5 driver documentation into multiple pages" Merging bpf-next/for-next (1f5dfcc78ab4 Revert "bpf: Add --skip_encoding_btf_inconsistent_proto, --btf_gen_optimized to pahole flags for v1.25") Merging ipsec-next/master (75da437a2f17 Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) Merging mlx5-next/mlx5-next (dca55da0a157 RDMA/mlx5: Track netdev to avoid deadlock during netdev notifier unregister) Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging ipvs-next/master (46b5be95b5cb netfilter: let reset rules clean out conntrack entries) Merging bluetooth/master (dbf27f4a6adb Bluetooth: btusb: Do not require hardcoded interface numbers) Merging wireless-next/for-next (cf08e29db760 wifi: mac80211: fix off-by-one link setting) Merging mtd/mtd/next (84549c816dc3 mtd: parsers: ofpart: add workaround for #size-cells 0) Merging nand/nand/next (ef3e6327ff04 mtd: rawnand: sunxi: Precompute the ECC_CTL register value) Merging spi-nor/spi-nor/next (f047382519ca Merge tag 'mtd/fixes-for-6.2-rc4' into spi-nor/next) Merging crypto/master (8b8447531864 crypto: x86/aria-avx - Do not use avx2 instructions) CONFLICT (content): Merge conflict in MAINTAINERS Merging drm/drm-next (48075a66fca6 Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next) CONFLICT (content): Merge conflict in Documentation/accel/introduction.rst CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/soc21.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gpu_error.c Merging drm-misc/for-linux-next (eb50912ec931 drm/i915/dp_mst: Fix payload removal during output disabling) Merging amdgpu/drm-next (35f33086b1b9 drm/amd/display: Add support for multiple overlay planes) Merging drm-intel/for-linux-next (155c6b16eec2 Merge tag 'amd-drm-next-6.3-2023-01-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) Merging drm-tegra/for-next (b9930311641c gpu: host1x: Fix uninitialized variable use) Merging drm-msm/msm-next (dbd7a2a941b8 PM / devfreq: Fix build issues with devfreq disabled) Merging drm-msm-lumag/msm-next-lumag (1d233b1cb149 drm/msm/dpu: set pdpu->is_rt_pipe early in dpu_plane_sspp_atomic_update()) Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) Merging etnaviv/etnaviv/next (4c22c61e429f drm/etnaviv: show number of NN cores in GPU debugfs info) Merging fbdev/for-next (4ec5183ec486 Linux 6.2-rc7) Merging regmap/for-next (76f52deacb3d Merge remote-tracking branch 'regmap/for-6.3' into regmap-next) Merging sound/for-next (5791c7699ff1 ALSA: hda: cs35l41: Enable Amp High Pass Filter) Merging sound-asoc/for-next (d98e2e206a20 Merge remote-tracking branch 'asoc/for-6.3' into asoc-next) CONFLICT (modify/delete): sound/soc/cirrus/ep93xx-ac97.c deleted in HEAD and modified in sound-asoc/for-next. Version sound-asoc/for-next of sound/soc/cirrus/ep93xx-ac97.c left in tree. CONFLICT (modify/delete): sound/soc/pxa/e740_wm9705.c deleted in HEAD and modified in sound-asoc/for-next. Version sound-asoc/for-next of sound/soc/pxa/e740_wm9705.c left in tree. CONFLICT (modify/delete): sound/soc/pxa/e750_wm9705.c deleted in HEAD and modified in sound-asoc/for-next. Version sound-asoc/for-next of sound/soc/pxa/e750_wm9705.c left in tree. CONFLICT (modify/delete): sound/soc/pxa/e800_wm9712.c deleted in HEAD and modified in sound-asoc/for-next. Version sound-asoc/for-next of sound/soc/pxa/e800_wm9712.c left in tree. CONFLICT (modify/delete): sound/soc/ti/davinci-vcif.c deleted in HEAD and modified in sound-asoc/for-next. Version sound-asoc/for-next of sound/soc/ti/davinci-vcif.c left in tree. $ git rm -f sound/soc/pxa/e740_wm9705.c sound/soc/pxa/e750_wm9705.c sound/soc/pxa/e800_wm9712.c sound/soc/cirrus/ep93xx-ac97.c sound/soc/ti/davinci-vcif.c Merging modules/modules-next (2ece476a2346 module: replace module_layout with module_memory) Merging input/next (04f8b4ea20c8 Input: pmic8xxx-keypad - fix a Kconfig spelling mistake & hyphenation) CONFLICT (modify/delete): drivers/input/touchscreen/ucb1400_ts.c deleted in HEAD and modified in input/next. Version input/next of drivers/input/touchscreen/ucb1400_ts.c left in tree. $ git rm -f drivers/input/touchscreen/ucb1400_ts.c Merging block/for-next (6bea9ac7c648 Merge branch 'for-6.3/iov-extract' into for-next) CONFLICT (content): Merge conflict in mm/filemap.c Applying: fixup for "ublk_drv: add mechanism for supporting unprivileged ublk device" Merging device-mapper/for-next (b0bbd86a288a dm sysfs: make kobj_type structure constant) CONFLICT (content): Merge conflict in drivers/md/dm-integrity.c Merging libata/for-next (8844f0aa8dc4 ata: pata_parport: Fix ida_alloc return value error check) Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver) Merging mmc/next (a5ed30b7ce67 dt-bindings: mmc: sdhci-msm: Allow 1 icc path) CONFLICT (content): Merge conflict in MAINTAINERS Merging mfd/for-mfd-next (a5f31a668da1 dt-bindings: mfd: qcom,tcsr: Add compatible for IPQ5332) Merging backlight/for-backlight-next (718c35c8d594 backlight: ktz8866: Add support for Kinetic KTZ8866 backlight) Merging battery/for-next (cec3b46b8bda power: reset: add Odroid Go Ultra poweroff driver) CONFLICT (content): Merge conflict in drivers/power/supply/Makefile Merging regulator/for-next (ea3efd52e962 Merge remote-tracking branch 'regulator/for-6.3' into regulator-next) Merging security/next (88603b6dc419 Linux 6.2-rc2) Merging apparmor/apparmor-next (cb60752f0c37 apparmor: fix use of strcpy in policy_unpack_test) Merging integrity/next-integrity (4958db3245fa ima: Introduce MMAP_CHECK_REQPROT hook) Applying: fixup for "ima: Introduce MMAP_CHECK_REQPROT hook" 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 (88603b6dc419 Linux 6.2-rc2) Merging smack/next (c0e48d3f7722 smackfs: Added check catlen) Merging tomoyo/master (5fc44ba8be52 workqueue: Emit runtime message when flush_scheduled_work() is called) Merging tpmdd/next (85b93bbd1c97 tpm: add vendor flag to command code validation) Merging watchdog/master (00bdbc9a8601 watchdog: wdat_wdt: Avoid unimplemented get_timeleft) Merging iommu/next (7eab5ffd59e6 Merge branches 'apple/dart', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next) CONFLICT (content): Merge conflict in drivers/infiniband/hw/usnic/usnic_uiom.c CONFLICT (content): Merge conflict in drivers/vfio/vfio_iommu_type1.c Merging audit/next (6c6cd913accd audit: update the mailing list in MAINTAINERS) Merging devicetree/for-next (0c559bc8abfb dt-bindings: serial: restrict possible child node names) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml Merging dt-krzk/for-next (825475539974 Merge branch 'next/qcom-pinctrl' into for-next) Merging mailbox/mailbox-for-next (53c60d100427 dt-bindings: mailbox: qcom-ipcc: Add compatible for SM8550) Merging spi/for-next (1dd46599f83a spi: xilinx: add force_irq for QSPI mode) Merging tip/master (5c2f8b5bf155 Merge branch into tip/master: 'x86/urgent') CONFLICT (modify/delete): arch/arm/mach-omap2/pm24xx.c deleted in HEAD and modified in tip/master. Version tip/master of arch/arm/mach-omap2/pm24xx.c left in tree. CONFLICT (content): Merge conflict in arch/s390/kernel/idle.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/common.c $ git rm -f arch/arm/mach-omap2/pm24xx.c Merging clockevents/timers/drivers/next (e09903cea09e clocksource/drivers/riscv: Get rid of clocksource_arch_init() callback) CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig Merging edac/edac-for-next (feac08675023 Merge ras/edac-drivers into for-next) Merging irqchip/irq/irqchip-next (7135b35fc959 Merge branch irq/irqdomain-locking into irq/irqchip-next) CONFLICT (content): Merge conflict in drivers/irqchip/irq-apple-aic.c Merging ftrace/for-next (22916110bfa3 Merge branch 'trace/tools/for-next' into trace/for-next) CONFLICT (content): Merge conflict in Documentation/trace/histogram.rst CONFLICT (content): Merge conflict in Documentation/trace/kprobetrace.rst Merging rcu/rcu/next (cdd4b92e382b tools/memory-model: Provide exact SRCU semantics) Merging kvm/next (7cb79f433e75 KVM: PPC: Fix refactoring goof in kvmppc_e500mc_init()) CONFLICT (content): Merge conflict in arch/x86/kvm/reverse_cpuid.h Merging kvm-arm/next (7121a2e1d107 Merge branch kvm-arm64/nv-prefix into kvmarm/next) Merging kvms390/next (5fc5b94a2736 s390/virtio: sort out physical vs virtual pointers usage) Merging kvm-x86/next (9fa259abdb42 KVM: x86: Assert that emulate doesn't load CS with garbage in !RM) CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h Merging xen-tip/linux-next (9a0450ada86e xen: Replace one-element array with flexible-array member) Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) Merging workqueues/for-next (c63a2e52d5e0 workqueue: Fold rebind_worker() within rebind_workers()) Merging drivers-x86/for-next (3004e8d2a0a9 platform/x86/amd/pmf: Add depends on CONFIG_POWER_SUPPLY) Merging chrome-platform/for-next (b0d8a67715da platform/chrome: cros_ec_typec: Fix spelling mistake) Merging hsi/for-next (1b929c02afd3 Linux 6.2-rc1) Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1) Merging leds-lj/for-leds-next (4aea8f30475f Documentation: leds: Correct spelling) Merging ipmi/for-next (befb28f2676a ipmi: ipmb: Fix the MODULE_PARM_DESC associated to 'retry_time_ms') Merging driver-core/driver-core-next (17c45768fdf9 Revert "driver core: add error handling for devtmpfs_create_node()") CONFLICT (content): Merge conflict in drivers/base/core.c CONFLICT (content): Merge conflict in include/linux/acpi.h Merging usb/usb-next (c4a07e264d38 Merge 6.2-rc8 into usb-next) CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig Merging thunderbolt/next (06cbcbfaa651 thunderbolt: Add missing kernel-doc comment to tb_tunnel_maximum_bandwidth()) Merging usb-serial/usb-next (617c331d9107 USB: serial: option: add support for VW/Skoda "Carstick LTE") Merging tty/tty-next (370f696e4474 dt-bindings: serial: snps-dw-apb-uart: add dma & dma-names properties) Merging char-misc/char-misc-next (e42af72223fd firmware: coreboot: Remove GOOGLE_COREBOOT_TABLE_ACPI/OF Kconfig entries) CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in drivers/fpga/dfl.c CONFLICT (content): Merge conflict in drivers/fpga/dfl.h Merging accel/habanalabs-next (3315cc6cbe14 habanalabs: don't trace cpu accessible dma alloc/free) Merging coresight/next (669c4614236a coresight: tmc: Don't enable TMC when it's not ready.) Merging fpga/for-next (ffa562d00072 fpga: bridge: return errors in the show() method of the "state" attribute) CONFLICT (content): Merge conflict in drivers/fpga/dfl.h Merging icc/icc-next (7bf0008a5293 Merge branch 'icc-dt' into icc-next) Merging iio/togreg (91ba2700aa75 staging: iio: meter: Drop ade7854 driver) Merging phy-next/next (037d05af382e phy: qcom: snps-eusb2: Add missing headers) Merging soundwire/next (66f95de7c13b soundwire: cadence: further simplify low-level xfer_msg_defer() callback) Merging extcon/extcon-next (2e85d0a0201d extcon: qcom-spmi: Switch to platform_get_irq_byname_optional) Merging gnss/gnss-next (1b929c02afd3 Linux 6.2-rc1) Merging vfio/next (c55365a09302 docs: vfio: Update vfio.rst per latest interfaces) Merging staging/staging-next (eec8ccab1b57 most: add maintainer entry) CONFLICT (content): Merge conflict in MAINTAINERS Merging counter-next/counter-next (01f714ee022e counter: fix dependency references for config MICROCHIP_TCB_CAPTURE) Merging mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on COMPILE_TEST) Merging dmaengine/next (1f6484614d74 dmaengine: idma64: Update bytes_transferred field) Merging cgroup/for-next (14fffd51f902 Merge branch 'for-6.2-fixes' into for-next) Merging scsi/for-next (1a10df75c93f Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (833f7d4819a8 scsi: ufs: core: Fix an error handling path in ufshcd_read_desc_param()) Merging vhost/linux-next (1713a5212af5 vhost/vdpa: Add MSI translation tables to iommu for software-managed MSI) Merging rpmsg/for-next (9b29257a9628 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Applying: remoteproc: fix for "iommu: Add a gfp parameter to iommu_map()" Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging gpio-brgl/gpio/for-next (4827aae06133 gpio: sim: Use %pfwP specifier instead of calling fwnode API directly) Merging gpio-intel/for-next (1b929c02afd3 Linux 6.2-rc1) Merging pinctrl/for-next (099f37a539e6 pinctrl: qcom: Add support for i2c specific pull feature) Merging pinctrl-intel/for-next (88f8ac47bddc pinctrl: Proofreading and updating the documentation (part 2)) Merging pinctrl-renesas/renesas-pinctrl (698485cd875b pinctrl: renesas: r8a77950: Add VIN[45] pins, groups, and functions) Merging pinctrl-samsung/for-next (1b929c02afd3 Linux 6.2-rc1) Merging pwm/for-next (2781f8e92036 pwm: lp3943: Drop unused i2c include) Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next) Merging ktest/for-next (bbf45b2ab467 ktest: Restore stty setting at first in dodie) Merging kselftest/next (0eb15a47bf43 selftests/user_events: add a note about user_events.h dependency) Merging kunit/test (1b929c02afd3 Linux 6.2-rc1) Merging kunit-next/kunit (82649c7c0da4 kunit: Add printf attribute to fail_current_test_impl) Merging livepatching/for-next (b2e118419db3 Merge branch 'for-6.3/cleanup-relocations' into for-next) Merging rtc/rtc-next (e8c9efd5d52f dt-bindings: rtc: moxart: use proper names for gpio properties) Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) Merging at24/at24/for-next (1b929c02afd3 Linux 6.2-rc1) Merging ntb/ntb-next (0310a30a9395 NTB: ntb_transport: fix possible memory leak while device_register() fails) Merging seccomp/for-next/seccomp (0fb0624b15d2 seccomp: fix kernel-doc function name warning) Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get) Merging slimbus/for-next (1b929c02afd3 Linux 6.2-rc1) Merging nvmem/for-next (fa7876365ad2 nvmem: stm32: fix OPTEE dependency) Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated) Merging hyperv/hyperv-next (96ec2939620c Drivers: hv: Make remove callback of hyperv driver void returned) Merging auxdisplay/auxdisplay (ddf75a86aba2 auxdisplay: hd44780: Fix potential memory leak in hd44780_remove()) Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) Merging hmm/hmm (1b929c02afd3 Linux 6.2-rc1) Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) Merging mhi/mhi-next (3c54a3ff0a2c bus: mhi: ep: Fix off by one in mhi_ep_process_cmd_ring()) Merging memblock/for-next (2fe03412e2e1 memblock: Avoid useless checks in memblock_merge_regions().) Merging cxl/next (b8b9ffced017 Merge branch 'for-6.3/cxl-ram-region' into cxl/next) Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2) Merging efi/next (45d5165426ae efi: Add mixed-mode thunk recipe for GetMemoryAttributes) Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) Merging slab/for-next (603c592a005a Merge branch 'slab/for-6.3/fixes' into slab/for-next) Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging landlock/next (1c1ea1c3e21d MAINTAINERS: Update Landlock repository) Merging rust/rust-next (7ea01d3169a2 rust: delete rust-project.json when running make clean) Merging sysctl/sysctl-next (0dff89c4488f sched: Move numa_balancing sysctls to its own file) Merging execve/for-next/execve (88603b6dc419 Linux 6.2-rc2) Merging bitmap/bitmap-for-next (18e93f4dc099 bitmap: switch from inline to __always_inline) Merging hte/for-next (1b929c02afd3 Linux 6.2-rc1) Merging kspp/for-next/kspp (78f7a3fd6dc6 randstruct: disable Clang 15 support) Merging kspp-gustavo/for-next/kspp (b942a520d9e4 bcache: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper) Merging iommufd/for-next (b3551ead6163 iommufd: Make sure to zero vfio_iommu_type1_info before copying to user) Merging mm-stable/mm-stable (6bdfc60cf0f9 mm: fix typo in __vm_enough_memory warning) CONFLICT (content): Merge conflict in Documentation/admin-guide/cgroup-v1/memory.rst CONFLICT (content): Merge conflict in Documentation/admin-guide/mm/numaperf.rst CONFLICT (modify/delete): drivers/gpu/drm/i810/i810_dma.c deleted in HEAD and modified in mm-stable/mm-stable. Version mm-stable/mm-stable of drivers/gpu/drm/i810/i810_dma.c left in tree. CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/file_ops.c CONFLICT (modify/delete): drivers/staging/media/deprecated/meye/meye.c deleted in HEAD and modified in mm-stable/mm-stable. Version mm-stable/mm-stable of drivers/staging/media/deprecated/meye/meye.c left in tree. CONFLICT (modify/delete): drivers/staging/media/deprecated/stkwebcam/stk-webcam.c deleted in HEAD and modified in mm-stable/mm-stable. Version mm-stable/mm-stable of drivers/staging/media/deprecated/stkwebcam/stk-webcam.c left in tree. CONFLICT (content): Merge conflict in fs/buffer.c $ git rm -f drivers/gpu/drm/i810/i810_dma.c drivers/staging/media/deprecated/meye/meye.c drivers/staging/media/deprecated/stkwebcam/stk-webcam.c Applying: accel/ivpu: fix up for "mm: introduce vma->vm_flags wrapper functions" Applying: udf: fix up for "fs: convert writepage_t callback to pass a folio" Applying: mm: fixup for "mm: implement memory-deny-write-execute as a prctl" Applying: gfs2: fix up for "fs: convert writepage_t callback to pass a folio" Merging mm-nonmm-stable/mm-nonmm-stable (817013880a68 Update CREDITS file entry for Jesper Juhl) Merging mm/mm-everything (780d9f40d599 Merge branch 'mm-nonmm-unstable' into mm-everything) CONFLICT (content): Merge conflict in Documentation/translations/zh_CN/accounting/delay-accounting.rst CONFLICT (content): Merge conflict in include/linux/memcontrol.h CONFLICT (content): Merge conflict in mm/filemap.c CONFLICT (content): Merge conflict in mm/memcontrol.c
Attachment:
pgpFYGiQUqDYq.pgp
Description: OpenPGP digital signature
