From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 078C1C54EAA for ; Fri, 27 Jan 2023 07:20:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231853AbjA0HUI (ORCPT ); Fri, 27 Jan 2023 02:20:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231572AbjA0HUF (ORCPT ); Fri, 27 Jan 2023 02:20:05 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C697113F8; Thu, 26 Jan 2023 23:20:01 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4P389C5DDRz4x1D; Fri, 27 Jan 2023 18:19:59 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1674803999; bh=xKoCFWS1jyk2o1bVprtPt8StiyucbJTx5A7njkurBOg=; h=Date:From:To:Cc:Subject:From; b=cEGxtOheq3sxLUBYSPassFcAJPKEgMpvKGEwU/JhKrinQklCn6mhdGZrpmAnJfKJp xNNRfAEomilLH4SUMU0hUybsoBRh4jAd+R9FEw5GZgdOmvNfoVpjTrxflB0mCoCd6o I4p3/bgKnNwmWdHO14aDF68jm+pJFqg26GAs/0PSxYHAmWVu1XxykpxKJOrG1EqfTp z1cLVxaembU6G8WvSvOvp2rXf8EdHNfupag7iO7efYLjOcpmqdjNYvgBrkxy5KspXO 1xmpC7I0xZeHplo0MDiYfhsZHc1jzHiLSTABzdNsAf+haYJg0Wr/kBifJol0pdVH22 c9oEBdfDvqyng== Date: Fri, 27 Jan 2023 18:19:58 +1100 From: Stephen Rothwell To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Jan 27 Message-ID: <20230127181958.4823e2d1@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/B/5KWR2+uPQrYw41d=Ume2a"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/B/5KWR2+uPQrYw41d=Ume2a Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20230125: Refreshed trees: fscrypt-current, fscrypt, fsverity New trees: fsverity-current, v9fs-ericvh The v9fs-ericvh tree gained a conflict against the vfs-idmapping tree. The file-locks tree gained a conflict against the fuse tree. The hwmon-staging tree lost its build failure. The net-next tree gained conflicts against the net tree. The drm-misc tree gained a conflict against the drm-misc-fixes tree. The iommu tree gained a conflict against Linus' tree. The rpmsg tree gained a semantic conflict against the iommu tree. The kspp tree gained a conflict against the tty tree. The mm tree lost its build failure, but gained conflicts against the rdma and v4l-dvb-next trees and semantic conflicts against the ext3 and drm trees. Non-merge commits (relative to Linus' tree): 7881 8696 files changed, 331342 insertions(+), 333273 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. --=20 Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (7c46948a6e9c Merge tag 'fs.fuse.acl.v6.2-rc6' of git= ://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping) Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://= anongit.freedesktop.org/drm/drm) Merging mm-hotfixes/mm-hotfixes-unstable (45bbaf86ccec lib: parser: optimiz= e match_NUMBER apis to use local array) Merging kbuild-current/fixes (2241ab53cbb5 Linux 6.2-rc5) Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3) Merging arm-current/fixes (2f62847cf6ae ARM: 9287/1: Reduce __thumb2__ defi= nition 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 (d9b6c322fd33 ARM: dts: aspeed: Fix pca9849= compatible) 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 (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for= _v5.18' into fixes) Merging m68k-current/for-linus (553b20b211c4 m68k: defconfig: Update defcon= figs for v6.1-rc1) Merging powerpc-fixes/fixes (f12cd06109f4 powerpc/64s/hash: Make stress_hpt= _timer_fn() static) Merging s390-fixes/fixes (41e1992665a2 s390: workaround invalid gcc-11 out = of bounds read warning) Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) Merging fscrypt-current/for-current (31e1be62abde MAINTAINERS: update fscry= pt git repo) Merging fsverity-current/for-current (ef7592e466ef MAINTAINERS: update fsve= rity git repo, list, and patchwork) Merging net/master (7083df59abbc net: mdio-mux-meson-g12a: force internal P= HY off on mux switch) Merging bpf/master (e8c8fd9b8393 Merge branch 'bpf, sockmap: Fix infinite r= ecursion in sock_map_close') Merging ipsec/master (b6ee89638538 xfrm/compat: prevent potential spectre v= 1 gadget in xfrm_xlate32_attr()) Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of gi= t://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging ipvs/master (f2b0b5210f67 net/x25: Fix to not accept on connected s= ocket) Merging wireless/for-next (80f8a66dede0 Revert "wifi: mac80211: fix memory = leak in ieee80211_if_add()") Merging rdma-fixes/for-rc (6601fc0d15ff IB/hfi1: Restore allocated resource= s on failed copyout) Merging sound-current/for-linus (6a28a25d3580 ALSA: hda/realtek: Add Acer P= redator PH315-54) Merging sound-asoc-fixes/for-linus (e18c6da62edc ASoC: cs42l56: fix DT prob= e) Merging regmap-fixes/for-linus (1b929c02afd3 Linux 6.2-rc1) Merging regulator-fixes/for-linus (4bb3d82a1820 regulator: dt-bindings: sam= sung,s2mps14: add lost samsung,ext-control-gpios) Merging spi-fixes/for-linus (9bab63a3e949 spi: spidev: fix a recursive lock= ing error) 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 (2241ab53cbb5 Linux 6.2-rc5) Merging usb.current/usb-linus (2fa89458af99 usb: gadget: f_uac2: Fix incorr= ect increment of bNumEndpoints) Merging usb-serial-fixes/usb-linus (71dfd381a7c0 USB: serial: option: add Q= uectel EM05CN modem) Merging phy/fixes (2241ab53cbb5 Linux 6.2-rc5) Merging staging.current/staging-linus (2241ab53cbb5 Linux 6.2-rc5) Merging iio-fixes/fixes-togreg (eb50cd5bfdac iio: hid: fix the retval in gy= ro_3d_capture_sample) Merging counter-current/counter-current (1b929c02afd3 Linux 6.2-rc1) Merging char-misc.current/char-misc-linus (2241ab53cbb5 Linux 6.2-rc5) Merging soundwire-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) Merging thunderbolt-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) Merging input-current/for-linus (9c445d2637c9 Input: i8042 - add Clevo PCX0= DX to i8042 quirk table) Merging crypto-current/master (736f88689c69 crypto: arm64/sm4 - fix possibl= e 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 de= lete source files via Makefile) Merging modules-fixes/modules-linus (0254127ab977 module: Don't wait for GO= ING modules) Merging dmaengine-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) Merging mtd-fixes/mtd/fixes (c0f7ae27539f MAINTAINERS: Update email of Tudo= r Ambarus) Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) Merging v4l-dvb-fixes/fixes (89c08aef8f8d media: videobuf2: set q->streamin= g later) Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix pos= sible null-ptr-deref) Merging mips-fixes/mips-fixes (88603b6dc419 Linux 6.2-rc2) Merging at91-fixes/at91-fixes (9bfa2544dbd1 ARM: dts: at91: sam9x60: fix th= e 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 initial= ization of the epoch extension (epdx) field) Merging hwmon-fixes/hwmon (2fbb848b65cd hwmon: (nct6775) Fix incorrect pare= nthesization in nct6775_write_fan_div()) Merging nvdimm-fixes/libnvdimm-fixes (472faf72b33d device-dax: Fix duplicat= e 'hmem' device registration) Merging cxl-fixes/fixes (19398821b25a cxl/pmem: Fix nvdimm unregistration w= hen cxl_pmem driver is absent) Merging btrfs-fixes/next-fixes (e7757c1bc30e Merge branch 'misc-6.2' into n= ext-fixes) Merging vfs-fixes/fixes (9c7417b5ec44 coredump: Move dump_emit_page() to ki= ll unused warning) Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the corre= ct size for dma_set_encrypted()) Merging drivers-x86-fixes/fixes (1bc5d819f0b9 platform/x86: thinkpad_acpi: = Fix profile modes on Intel platforms) 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 (064e32dc5b03 of: fdt: Honor CONFIG_CMDLI= NE* even without /chosen node, take 2) Merging dt-krzk-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) Merging scsi-fixes/fixes (0bfe63d07578 scsi: device_handler: alua: Remove a= might_sleep() annotation) Merging drm-fixes/drm-fixes (3f30a6e67ce4 Merge tag 'amd-drm-fixes-6.2-2023= -01-19' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (2255bbcdc39d drm/i915/selftes= t: fix intel_selftest_modify_policy argument types) Merging mmc-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string f= or printing resource) Merging gnss-fixes/gnss-linus (1b929c02afd3 Linux 6.2-rc1) Merging hyperv-fixes/hyperv-fixes (25c94b051592 Drivers: hv: vmbus: fix pos= sible memory leak in vmbus_device_register()) Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) Merging risc-v-fixes/fixes (c1d610586946 riscv: Move call to init_cpu_topol= ogy() to later initialization stage) Merging riscv-dt-fixes/riscv-dt-fixes (43d5f5d63699 riscv: dts: sifive: fu7= 40: 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 (216f37366e86 gpio: ep93xx: Make i= rqchip immutable) Merging gpio-intel-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) Merging pinctrl-intel-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) Merging erofs-fixes/fixes (e02ac3e7329f erofs: clean up parsing of fscache = related options) Merging kunit-fixes/kunit-fixes (db105c37a4d6 kunit: Export kunit_running()) Merging ubifs-fixes/fixes (7bdd6967fec5 ubi: ensure that VID header offset = + VID header size <=3D alloc, size) Merging memblock-fixes/fixes (115d9d77bb0f mm: Always release pages to the = buddy allocator in memblock_free_late().) Merging nfsd-fixes/nfsd-fixes (4bdbba54e9b1 nfsd: don't free files uncondit= ionally in __nfsd_file_cache_purge) Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI s= hould depend on ARCH_MXC) Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fi= x 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 (e1fabbc83cb1 efi: Remove Matthew Garrett as efiva= rfs maintainer) Merging zstd-fixes/zstd-linus (0a2cbd1f53f3 lib: zstd: Fix -Wstringop-overf= low 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-executab= le 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 a= rguments in `pr_*` macros in `unsafe` blocks) Merging drm-misc-fixes/for-linux-next-fixes (343c70048098 drm/ssd130x: Init= display before the SSD130X_DISPLAY_ON command) Merging kbuild/for-next (fd43a7525d80 kbuild: fix trivial typo in comment) Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space aft= er for_each macros) Merging perf/perf/core (5670ebf54bd2 perf cs-etm: Ensure that Coresight tim= estamps don't go backwards) Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attr= ibutes: Introduce __access_*() function attribute) Merging dma-mapping/for-next (3622b86f49f8 dma-mapping: reject GFP_COMP for= noncoherent allocations) Merging asm-generic/master (32975c491ee4 uapi: Add missing _UAPI prefix to = include guard) Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) Merging arm/for-next (c6b7e9e37e3d Merge branches 'misc' and 'fixes' into f= or-next) Merging arm64/for-next/core (f2c8f3ff5aa6 Merge branches 'for-next/sysreg',= 'for-next/sme', 'for-next/kselftest', 'for-next/misc', 'for-next/sme2', 'f= or-next/tpidr2', 'for-next/scs', 'for-next/compat-hwcap', 'for-next/ftrace'= and 'for-next/efi-boot-mmu-on' into for-next/core) CONFLICT (content): Merge conflict in arch/arm64/Kconfig Merging arm-perf/for-next/perf (4998897b1e96 perf: arm_spe: Support new SPE= v1.2/v8.7 'not taken' event) Merging arm-soc/for-next (822f49f2891e Merge branch 'arm/dt' into for-next) Merging amlogic/for-next (46b1c99fb30c Merge branch 'v6.3/arm64-dt' into fo= r-next) Merging asahi-soc/asahi-soc/for-next (1b929c02afd3 Linux 6.2-rc1) Merging aspeed/for-next (03f90343f5b5 soc: nuvoton: Add SoC info driver for= WPCM450) Merging at91/at91-next (78712fb81548 Merge branch 'clk-microchip-fixes' int= o at91-next) Merging broadcom/next (9b385edf71bd Merge branch 'devicetree-arm64/next' in= to next) Merging davinci/davinci/for-next (eaafab7e8e26 MAINTAINERS: make me the mai= ntainer of DaVinci platforms) Merging drivers-memory/for-next (682a91c4375f Merge branch 'mem-ctrl-next' = into for-next) Merging imx-mxs/for-next (6e2964c3dc83 Merge branch 'imx/defconfig' into fo= r-next) CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig Merging mediatek/for-next (eb6fd30ef65f Merge branch 'v6.2-next/soc' into f= or-next) Merging mvebu/for-next (80502ffab2fa arm64: dts: marvell: AC5/AC5X: Fix add= ress for UART1) Merging omap/for-next (f68a6fc58073 Merge branch 'omap-for-v6.3/cleanup' in= to for-next) Merging qcom/for-next (97c57426d969 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 (5f4935f3f05d Merge branches 'renesas-arm-defconfig-fo= r-v6.3', 'renesas-drivers-for-v6.3', 'renesas-dt-bindings-for-v6.3' and 're= nesas-dts-for-v6.3' into renesas-next) Merging reset/reset/next (1b929c02afd3 Linux 6.2-rc1) Merging rockchip/for-next (4c20692e9cb9 Merge branch 'v6.3-armsoc/dts32' in= to for-next) Merging samsung-krzk/for-next (5e8b8afd175e Merge branch 'next/dt64' into f= or-next) Merging scmi/for-linux-next (672583a235f6 Merge tag 'scmi-updates-6.3' of g= it://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-li= nux-next) Merging stm32/stm32-next (2f33df889e99 ARM: dts: stm32: Use new media bus t= ype macros) Merging sunxi/sunxi/for-next (7879da4e62f1 Merge branch 'sunxi/drivers-for-= 6.3' into sunxi/for-next) Merging tee/next (4a56b125ba20 Merge branch 'fixes' into next) Merging tegra/for-next (dc2b15fc18a3 Merge branch for-6.3/arm64/dt into for= -next) Merging ti/ti-next (9ae21ac445e9 arm64: dts: ti: k3-j7200: Fix wakeup pinmu= x range) Merging xilinx/for-next (a18426505c2b Merge remote-tracking branch 'git/zyn= qmp/dt' into for-next) Merging clk/clk-next (71854f780c8b Merge branch 'clk-fixes' into clk-next) Merging clk-imx/for-next (1b929c02afd3 Linux 6.2-rc1) Merging clk-renesas/renesas-clk (bd176e46e9c2 clk: renesas: r8a779g0: Add C= AN-FD clocks) 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 (5dc4c995db9e Linux 6.2-rc4) Merging m68k/for-next (553b20b211c4 m68k: defconfig: Update defconfigs for = v6.1-rc1) Merging m68knommu/for-next (43558085185a m68k: nommu: Fix misspellings of "= DragonEngine") Merging microblaze/next (5cfe469c2654 microblaze/PCI: Moving PCI iounmap an= d dependent code) Merging mips/mips-next (88603b6dc419 Linux 6.2-rc2) Merging openrisc/for-next (34a0bac084e4 MAINTAINERS: git://github -> https:= //github.com for openrisc) Merging parisc-hd/for-next (32125c5c95f2 parisc: Limit amount of kgdb break= points on parisc) Merging powerpc/next (53ab112a9508 Merge branch 'fixes' into next) Merging powerpc-objtool/topic/objtool (1b929c02afd3 Linux 6.2-rc1) Merging soc-fsl/next (4b0986a3613c Linux 5.18) Merging risc-v/for-next (9d5567ccf96f riscv: fix jal offsets in patched alt= ernatives) CONFLICT (content): Merge conflict in arch/riscv/kernel/probes/simulate-ins= n.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 "JH71= 10 PMU Support") Merging s390/for-next (fe27e533c967 Merge branch 'features' into for-next) Merging uml/next (43ee0357e15b um: vector: Fix memory leak in vector_config) Merging xtensa/xtensa-for-next (4414c1f5c7a3 xtensa: drop unused members of= struct thread_struct) Merging pidfd/for-next (6a857ab5b57c Merge branch 'fs.idmapped.overlay.acl'= into for-next) Merging vfs-idmapping/for-next (f48ed993526e Merge branch 'fs.fuse.acl' int= o for-next) CONFLICT (content): Merge conflict in fs/btrfs/inode.c Merging fscrypt/for-next (5dc4c995db9e Linux 6.2-rc4) 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 (5966d3882003 Merge branch 'for-next-next-v6.2-20230= 125' into for-next-20230125) Merging ceph/master (8e1858710d9a ceph: avoid use-after-free in ceph_fl_rel= ease_lock()) Merging cifs/for-next (d11e2b43a4c3 update internal module version number f= or cifs.ko) Merging configfs/for-next (77992f896745 configfs: remove mentions of commit= table items) Merging ecryptfs/next (c1cc2db21607 ecryptfs: keystore: Fix typo 'the the' = in comment) Merging erofs/dev (b7bfaa761d76 Linux 6.2-rc3) Merging exfat/dev (5742d6a467d1 exfat: handle unreconized benign secondary = entries) Merging ext3/for_next (085cf7b7e2ef udf: Fix file counting in LVID) Merging ext4/dev (1da18e38cb97 ext4: fix reserved cluster accounting in __e= s_remove_extent()) Merging f2fs/dev (7a2b15cfa8db f2fs: support accounting iostat count and av= g_bytes) Merging fsverity/for-next (245edf445c34 fsverity.rst: update git repo URL f= or fsverity-utils) Merging fuse/for-next (1cc4606d19e3 fuse: add inode/permission checks to fi= leattr_get/fileattr_set) Merging gfs2/for-next (2d5a4e7c82f1 gfs2: gl_object races fix) Merging jfs/jfs-next (a60dca73a1a8 jfs: makes diUnmount/diMount in jfs_moun= t_rw atomic) Merging ksmbd/ksmbd-for-next (a34dc4a9b9e2 ksmbd: downgrade ndr version err= or message to debug) 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 (f1291b416498 SUNRPC: Remove ->xpo_secure_port()) Merging ntfs3/master (57c94236401b fs/ntfs3: Refactoring of various minor i= ssues) Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_= {kernel,client}_debug_init()) Merging overlayfs/overlayfs-next (00628764be56 ovl: fail on invalid uid/gid= mapping at copy up) Merging ubifs/next (8d0960731a26 jffs2: Fix list_del corruption if compress= ors initialized failed) Merging v9fs/9p-next (1a4f69ef15ec 9p/client: fix data race on req->status) Merging v9fs-ericvh/ericvh/for-next (32a145a90935 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 (601a27ea09a3 xfs: fix extent busy updating) Merging zonefs/for-next (43592c46375a zonefs: Cache zone group directory in= odes) 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 w= riteback 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 ex= port operation) CONFLICT (content): Merge conflict in fs/stat.c Merging vfs/for-next (557e0248a8a0 Merge branch 'work.misc' into for-next) Merging printk/for-next (930348ab0ad9 Merge branch 'rework/buffers-cleanup'= into for-next) Merging pci/next (78913b41945a Merge branch 'remotes/lorenzo/pci/switchtec') Merging pstore/for-next/pstore (88603b6dc419 Linux 6.2-rc2) Merging hid/for-next (06f8ed62c952 Merge branch 'for-6.2/upstream-fixes' in= to for-next) Merging i2c/i2c/for-next (726ba204f4c7 Merge branch 'i2c/for-mergewindow' i= nto i2c/for-next) Merging i3c/i3c/next (e826acc18bc7 i3c: transfer pid from boardinfo to devi= ce info) Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point l= ength checks) Merging hwmon-staging/hwmon-next (f9b70de51c89 hwmon: add initial NXP MC34V= R500 PMIC monitoring support) Merging jc_docs/docs-next (a16abc68e66c Merge branch 'docs-mw' into docs-ne= xt) Merging v4l-dvb/master (6599e683db1b Merge tag 'v6.2-rc1' into media_tree) Merging v4l-dvb-next/master (7120d6bfd6d0 media: tm6000: remove deprecated = driver) CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in drivers/staging/media/Kconfig CONFLICT (content): Merge conflict in drivers/staging/media/Makefile Merging pm/linux-next (0bb04b623f4c Merge branch 'thermal-next' into linux-= next) Merging cpufreq-arm/cpufreq/arm/linux-next (471be3641bd7 cpufreq: tegra194:= Enable CPUFREQ thermal cooling) Merging cpupower/cpupower (1b929c02afd3 Linux 6.2-rc1) Merging devfreq/devfreq-next (497e92ab8c8e PM / devfreq: Remove "select SRC= U") Merging opp/opp/linux-next (93c697b41d14 dt-bindings: opp: v2-qcom-level: L= et qcom,opp-fuse-level be a 2-long array) 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 (ed73a505480d RDMA/erdma: Replace zero-length arrays = with flexible-array members) Merging net-next/master (0313afe8b83a Merge branch 'tools-ynl-prevent-reord= er-and-fix-flags') CONFLICT (content): Merge conflict in drivers/net/ethernet/engleder/tsnep_m= ain.c CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/ice/ice_ma= in.c CONFLICT (content): Merge conflict in net/netfilter/nf_conntrack_proto_sctp= .c Merging bpf-next/for-next (0164776a2ce7 Merge branch 'Enable bpf_setsockopt= () on ktls enabled sockets.') CONFLICT (content): Merge conflict in kernel/bpf/offload.c Merging ipsec-next/master (9f92752788d7 Merge branch 'adding-sparx5-is0-vca= p-support') Merging mlx5-next/mlx5-next (c4d508fbe54a net/mlx5: Configure IPsec steerin= g for egress RoCEv2 traffic) Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/= scm/linux/kernel/git/netdev/net) Merging ipvs-next/master (f5be9caf7bf0 net: ethtool: fix NULL pointer deref= erence in pause_prepare_data()) Merging bluetooth/master (ef017002b93b dt-bindings: leds: Document Bluetoot= h and WLAN triggers) Merging wireless-next/for-next (4ca69027691a wifi: wireless: deny wireless = extensions on MLO-capable devices) Merging mtd/mtd/next (a30144c02c84 mtd: dataflash: remove duplicate SPI ID = table) Merging nand/nand/next (a2cfa6a24c61 mtd: rawnand: vf610_nfc: use regular c= omments for functions) Merging spi-nor/spi-nor/next (55398beb0846 mtd: spi-nor: sfdp: Use SFDP_DWO= RD() macro for optional parameter tables) Merging crypto/master (d6b7ec11062e crypto: x86/aria-avx512 - fix build fai= lure with old binutils) Merging drm/drm-next (68de345e101c Merge tag 'drm-misc-next-2023-01-24' of = git://anongit.freedesktop.org/drm/drm-misc into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_workaro= unds.c CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/ttm_object.h Applying: fix up for "drm/fb-helper: Set framebuffer for vga-switcheroo cli= ents" Merging drm-misc/for-linux-next (851a4a77a9f6 dma-buf: actually set signali= ng bit for private stub fences) CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_fbdev_generic.c Merging amdgpu/drm-next (f732e2b3c6b3 drm/amdgpu/vcn4: add missing encoder = cap) Merging drm-intel/for-linux-next (d3eb347da114 drm/i915/mtl: Apply Wa_14013= 475917 for all MTL steppings) Merging drm-tegra/for-next (900cd8f065de drm/tegra: Remove #ifdef guards fo= r PM related functions) Merging drm-msm/msm-next (1d233b1cb149 drm/msm/dpu: set pdpu->is_rt_pipe ea= rly in dpu_plane_sspp_atomic_update()) Merging drm-msm-lumag/msm-next-lumag (1d233b1cb149 drm/msm/dpu: set pdpu->i= s_rt_pipe early in dpu_plane_sspp_atomic_update()) Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove red= undant color encoding and range initialisation) Merging etnaviv/etnaviv/next (30527af2bed1 drm/etnaviv: Remove #ifdef guard= s for PM related functions) Merging fbdev/for-next (ee9fffdc3887 fbdev: omapfb: Use kstrtobool() instea= d of strtobool()) Merging regmap/for-next (7b3c4c370c09 regmap: Rework regmap_mdio_c45_{read|= write} for new C45 API.) Merging sound/for-next (47c59e0c213f ALSA: aoa: make remove callback of sou= ndbus driver void returned) Merging sound-asoc/for-next (51a56d3e1a91 Merge remote-tracking branch 'aso= c/for-6.3' into asoc-next) CONFLICT (modify/delete): sound/soc/pxa/e740_wm9705.c deleted in HEAD and m= odified in sound-asoc/for-next. Version sound-asoc/for-next of sound/soc/p= xa/e740_wm9705.c left in tree. CONFLICT (modify/delete): sound/soc/pxa/e750_wm9705.c deleted in HEAD and m= odified in sound-asoc/for-next. Version sound-asoc/for-next of sound/soc/p= xa/e750_wm9705.c left in tree. CONFLICT (modify/delete): sound/soc/pxa/e800_wm9712.c deleted in HEAD and m= odified in sound-asoc/for-next. Version sound-asoc/for-next of sound/soc/p= xa/e800_wm9712.c left in tree. $ git rm -f sound/soc/pxa/e740_wm9705.c sound/soc/pxa/e750_wm9705.c sound/s= oc/pxa/e800_wm9712.c Merging modules/modules-next (fbed4fea6422 module: Use kstrtobool() instead= of strtobool()) Merging input/next (8aaec1177521 Input: cros_ec_keyb - add 3 buttons for mo= nitor function) CONFLICT (modify/delete): drivers/input/touchscreen/ucb1400_ts.c deleted in= HEAD and modified in input/next. Version input/next of drivers/input/touc= hscreen/ucb1400_ts.c left in tree. $ git rm -f drivers/input/touchscreen/ucb1400_ts.c Merging block/for-next (7d02a82b9775 Merge branch 'for-6.3/dio' into for-ne= xt) Applying: fixup for "ublk_drv: add mechanism for supporting unprivileged ub= lk device" Merging device-mapper/for-next (6bfba8b202b0 dm cache: Add some documentati= on to dm-cache-background-tracker.h) Merging libata/for-next (38d431229bfb ata: libata: exclude FUA support for = known buggy drives) Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact = Flash driver) Merging mmc/next (b1d908e6c71e dt-bindings: mmc: convert amlogic,meson-gx.t= xt to dt-schema) Merging mfd/for-mfd-next (dd77f5fa97d3 mfd: Remove toshiba tmio drivers) Merging backlight/for-backlight-next (718c35c8d594 backlight: ktz8866: Add = support for Kinetic KTZ8866 backlight) Merging battery/for-next (4e9498b835ab power: supply: bq25890: Support boar= ds with more then one charger IC) Merging regulator/for-next (e3d31788f630 Merge remote-tracking branch 'regu= lator/for-6.3' into regulator-next) Merging security/next (88603b6dc419 Linux 6.2-rc2) Merging apparmor/apparmor-next (1b929c02afd3 Linux 6.2-rc1) Merging integrity/next-integrity (b8dc57947379 ima: fix ima_delete_rules() = kernel-doc warning) Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kern= el.org/pub/scm/linux/kernel/git/viro/vfs) Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroup= s() testing to selftest) Merging selinux/next (88603b6dc419 Linux 6.2-rc2) Merging smack/next (1a3065e92046 smack_lsm: remove unnecessary type casting) Merging tomoyo/master (5fc44ba8be52 workqueue: Emit runtime message when fl= ush_scheduled_work() is called) Merging tpmdd/next (b0474a20b153 tpm: Add reserved memory event log) Merging watchdog/master (1b929c02afd3 Linux 6.2-rc1) Merging iommu/next (28dcba7e10b6 Merge branches 'apple/dart', 'arm/exynos',= 'arm/renesas', 'arm/smmu', 'x86/amd' and 'core' into next) CONFLICT (content): Merge conflict in drivers/vfio/vfio_iommu_type1.c Merging audit/next (88603b6dc419 Linux 6.2-rc2) Merging devicetree/for-next (8da765cca292 dt-bindings: vendor-prefixes: doc= ument lineartechnology) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mmc= /nvidia,tegra20-sdhci.yaml Merging dt-krzk/for-next (9fac79ef2865 Merge branch 'next/dt64' into for-ne= xt) Merging mailbox/mailbox-for-next (53c60d100427 dt-bindings: mailbox: qcom-i= pcc: Add compatible for SM8550) Merging spi/for-next (44eb7d6da222 Merge remote-tracking branch 'spi/for-6.= 3' into spi-next) Merging tip/master (610b3c408ab5 Merge branch into tip/master: 'x86/vdso') 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. $ git rm -f arch/arm/mach-omap2/pm24xx.c Merging clockevents/timers/drivers/next (e09903cea09e clocksource/drivers/r= iscv: Get rid of clocksource_arch_init() callback) Merging edac/edac-for-next (4c5be17ae445 Merge branch 'edac-drivers' into e= dac-for-next) Merging irqchip/irq/irqchip-next (6ed54e1789a2 Merge branch irq/misc-6.2 in= to irq/irqchip-next) Merging ftrace/for-next (14b7bc94a4f6 Merge branch 'trace/trace/for-next' i= nto trace/for-next) Merging rcu/rcu/next (d0df85c4fd09 tick/nohz: Fix cpu_is_hotpluggable() by = checking with nohz subsystem) Merging kvm/next (7cb79f433e75 KVM: PPC: Fix refactoring goof in kvmppc_e50= 0mc_init()) CONFLICT (content): Merge conflict in arch/x86/kvm/reverse_cpuid.h Merging kvm-arm/next (7e819b68a4f0 Merge remote-tracking branch 'oupton/kvm= arm/next' into kvmarm-master/next) Merging kvms390/next (99b63f55dc51 KVM: s390: remove unused gisa_clear_ipm_= gisc() function) Merging kvm-x86/next (503f0315c977 Merge branches 'apic', 'generic', 'misc'= , 'mmu', 'pmu', 'selftests', 'svm' and 'vmx' into next) CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h Merging xen-tip/linux-next (ca0d80778e48 xen/pvcalls-back: fix permanently = masked event channel) Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) Merging workqueues/for-next (c63a2e52d5e0 workqueue: Fold rebind_worker() w= ithin rebind_workers()) Merging drivers-x86/for-next (b7233286202b platform/x86: hp-wmi: Ignore Win= -Lock key events) Merging chrome-platform/for-next (478f32ab4daa platform/chrome: cros_typec_= vdm: Fix VDO copy) Merging hsi/for-next (1b929c02afd3 Linux 6.2-rc1) Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1) Merging leds-lj/for-leds-next (83bb0ba2c46b dt-bindings: leds: Document Blu= etooth and WLAN triggers) Merging ipmi/for-next (041fae9c105a Merge tag 'f2fs-for-6.2-rc1' of git://g= it.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) Merging driver-core/driver-core-next (0b2a1a3938aa driver core: class: Clea= r private pointer on registration failures) Merging usb/usb-next (9e6f4c8b880b usb: typec: tcpm: Remove altmode active = state updates) Merging thunderbolt/next (6ce3563520be thunderbolt: Add support for Display= Port bandwidth allocation mode) Merging usb-serial/usb-next (b7bfaa761d76 Linux 6.2-rc3) Merging tty/tty-next (ed0400ad547c serial: liteuart: Correct error rollback) Merging char-misc/char-misc-next (99ba2ad1db62 Merge 6.2-rc5 into char-misc= -next) Merging accel/habanalabs-next (4dc7c58023e8 habanalabs: Fix list of /sys/cl= ass/habanalabs/hl/status) CONFLICT (content): Merge conflict in Documentation/accel/introduction.rst Merging coresight/next (a646ca099b18 coresight: perf: Output trace id only = once) Merging fpga/for-next (c82e5aa87205 fpga: dfl: more kernel-doc corrections) CONFLICT (content): Merge conflict in drivers/fpga/dfl.h Merging icc/icc-next (6f773d4b3bfe Merge branch 'icc-sa8775p' into icc-next) Merging iio/togreg (354f23ac2c87 dt-bindings: iio: adc: Add NXP IMX93 ADC) CONFLICT (content): Merge conflict in MAINTAINERS Merging phy-next/next (fb1ff01307ee dt-bindings: phy: tegra-xusb: Convert t= o json-schema) CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/phy= /nvidia,tegra194-xusb-padctl.yaml Merging soundwire/next (545c365185a4 soundwire: stream: Move remaining regi= ster accesses over to no_pm) Merging extcon/extcon-next (2e85d0a0201d extcon: qcom-spmi: Switch to platf= orm_get_irq_byname_optional) Merging gnss/gnss-next (1b929c02afd3 Linux 6.2-rc1) Merging vfio/next (7658aeda334a vfio/platform: Use GFP_KERNEL_ACCOUNT for u= serspace persistent allocations) Merging staging/staging-next (2529ca211402 staging: vc04_services: interfac= e: Drop include Makefile directive) Merging counter-next/counter-next (01f714ee022e counter: fix dependency ref= erences for config MICROCHIP_TCB_CAPTURE) Merging mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on C= OMPILE_TEST) Merging dmaengine/next (4b23603a251d dmaengine: drivers: Use devm_platform_= ioremap_resource()) Merging cgroup/for-next (32a47817d075 cgroup/cpuset: fix a few kernel-doc w= arnings & coding style) Merging scsi/for-next (e9f87b59c685 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (5adca38c0b97 Merge patch series "Enable DMA clus= tering in the UFS driver") Merging vhost/linux-next (66c78aa2b9ba virtio: vdpa: new SolidNET DPU drive= r.) Merging rpmsg/for-next (10de8156ed71 Merge branches 'hwspinlock-next', 'rpm= sg-next' and 'rproc-next' into for-next) Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging gpio-brgl/gpio/for-next (5bb837ebcfe3 gpio: mvebu: Use IS_REACHABLE= instead of IS_ENABLED for CONFIG_PWM) Merging gpio-intel/for-next (1b929c02afd3 Linux 6.2-rc1) Merging pinctrl/for-next (3859bc00d62e Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (88f8ac47bddc pinctrl: Proofreading and upda= ting the documentation (part 2)) Merging pinctrl-renesas/renesas-pinctrl (698485cd875b pinctrl: renesas: r8a= 77950: Add VIN[45] pins, groups, and functions) Merging pinctrl-samsung/for-next (1b929c02afd3 Linux 6.2-rc1) Merging pwm/for-next (8fa22f4b88e8 pwm: pca9685: Convert to i2c's .probe_ne= w()) 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 (88a51b4f2e65 ktest.pl: Add shell commands to variab= les) Merging kselftest/next (65177e47d303 testing: kselftest_harness: add filter= ing and enumerating tests) Merging kunit/test (1b929c02afd3 Linux 6.2-rc1) Merging kunit-next/kunit (5835ffc27381 kunit: kunit.py extract handlers) Merging livepatching/for-next (cad81ab73997 Merge branch 'for-6.2/core' int= o for-next) Merging rtc/rtc-next (24304a87158a rtc: brcmstb-waketimer: allow use as non= -wake alarm) Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdim= m' 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 func= tion 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 (ef26c0349eb5 of: property: fix #nvmem-cell-cells pa= rsing) Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was all= ocated) Merging hyperv/hyperv-next (96ec2939620c Drivers: hv: Make remove callback = of hyperv driver void returned) Merging auxdisplay/auxdisplay (ddf75a86aba2 auxdisplay: hd44780: Fix potent= ial memory leak in hd44780_remove()) Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper functi= on) 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 (1fd102893456 bus: mhi: ep: Save channel state locally= during suspend and resume) Merging memblock/for-next (80c2fe022ef5 memblock tests: remove completed TO= DO item) Merging cxl/next (589c3357370a PCI/CXL: Export native CXL error reporting c= ontrol) CONFLICT (content): Merge conflict in drivers/cxl/pci.c Applying: fix up for "cxl: fix cxl_report_and_clear() RAS UE addr mis-assig= nment" Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2) Merging efi/next (240645b94108 efi/libstub: Add memory attribute protocol d= efinitions) Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation fa= ilures in mkutf8data) Merging slab/for-next (001aa6a1f0a0 Merge branch 'slab/for-6.3/cleanups' in= to slab/for-next) Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of gi= t://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging landlock/next (366617a69e60 selftests/landlock: Skip overlayfs test= s when not supported) Merging rust/rust-next (dec1df547d81 rust: prelude: prevent doc inline of e= xternal imports) 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 (2386459394d2 lib/cpumask: update comment fo= r cpumask_local_spread()) Merging hte/for-next (1b929c02afd3 Linux 6.2-rc1) Merging kspp/for-next/kspp (be1923932d0c Merge branches 'for-linus/hardenin= g' and 'for-next/hardening' into for-next/kspp) CONFLICT (content): Merge conflict in drivers/tty/vt/vt.c Merging kspp-gustavo/for-next/kspp (b942a520d9e4 bcache: Replace zero-lengt= h arrays with DECLARE_FLEX_ARRAY() helper) Merging iommufd/for-next (84798f284994 iommufd: Add three missing structure= s in ucmd_buffer) Merging mm-stable/mm-stable (9a3f21fe5cb9 selftests: vm: enable cross-compi= lation) CONFLICT (content): Merge conflict in Documentation/admin-guide/cgroup-v1/m= emory.rst CONFLICT (content): Merge conflict in fs/buffer.c Merging mm-nonmm-stable/mm-nonmm-stable (5dc4c995db9e Linux 6.2-rc4) Merging mm/mm-everything (47950d0b9368 Merge branch 'mm-nonmm-unstable' int= o mm-everything) 7d0ffb25be37 ("Revert "mm: kmemleak: alloc gray object for reserved regio= n with direct map"") b81892668314 ("Revert "mm/compaction: fix set skip in fast_find_migratebl= ock"") ce8a94688c46 ("Revert "remoteproc: qcom_q6v5_mss: map/unmap metadata regi= on before/after use"") d8b957def2c0 ("Revert "mm: add nodes=3D arg to memory.reclaim"") CONFLICT (modify/delete): drivers/gpu/drm/i810/i810_dma.c deleted in HEAD a= nd modified in mm/mm-everything. Version mm/mm-everything of drivers/gpu/d= rm/i810/i810_dma.c left in tree. CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/file_ops.c CONFLICT (content): Merge conflict in drivers/remoteproc/qcom_q6v5_mss.c CONFLICT (modify/delete): drivers/staging/media/deprecated/meye/meye.c dele= ted in HEAD and modified in mm/mm-everything. Version mm/mm-everything of = drivers/staging/media/deprecated/meye/meye.c left in tree. CONFLICT (modify/delete): drivers/staging/media/deprecated/stkwebcam/stk-we= bcam.c deleted in HEAD and modified in mm/mm-everything. Version mm/mm-eve= rything of drivers/staging/media/deprecated/stkwebcam/stk-webcam.c left in = tree. CONFLICT (content): Merge conflict in mm/mremap.c $ git rm -f drivers/gpu/drm/i810/i810_dma.c $ git rm -f drivers/staging/media/deprecated/meye/meye.c $ git rm -f drivers/staging/media/deprecated/stkwebcam/stk-webcam.c Applying: udf: fix up for "fs: convert writepage_t callback to pass a folio" Applying: accel/ivpu: fix up for "mm: introduce vma->vm_flags wrapper funct= ions" Applying: gfs2: fix up for "fs: convert writepage_t callback to pass a foli= o" Applying: remoteproc: fix for "iommu: Add a gfp parameter to iommu_map()" --Sig_/B/5KWR2+uPQrYw41d=Ume2a Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPTex4ACgkQAVBC80lX 0GygUggAglRjSYToIJEdIOhQkQRi+vMiOTTOqOEuXOeCxi3nl5hUY5tLgJWgKPtz vIhf3a0aqeU2XBdVQFO8k8X1I7DAV/Zf8IUuSul1sjv082aUYA0qrQVzGgSMEga6 Y16kiQL0CMFkML/eJAsnDKRZE+aWCUieEWforTOJZd8fGm4IBTToWM/cvLWXcmDY HOUWbnr1pnpe7gaLKyRnolj9AHZpQgNlweFcC4VximTkUyUL/nSzyZSn1G5yBOeB 5v9CLSrQzu9gUrE7MBOyZC3UDBl+LodwT+Wa4sqVDY8yKNEBa1eXN/UkJMtUMq0V z1hAPqRcJmyWavmrvn8Ooxn6WLvAbA== =rTQv -----END PGP SIGNATURE----- --Sig_/B/5KWR2+uPQrYw41d=Ume2a--