Date: Tue, 9 Jul 2024 08:52:38 +1000 From: Stephen Rothwell To: Dmitry Baryshkov Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: error when fetching the drm-msm-lumag tree Message-ID: <20240709085238.1fbc301d@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/bRZO1NnApjCsw8iiRTSbWDY"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271289 org.kernel.vger.linux-next:62099 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/bRZO1NnApjCsw8iiRTSbWDY Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Fetching the drm-msm-lumag tree (https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag) produces this error: fatal: couldn't find remote ref refs/heads/msm-next-lumag --=20 Cheers, Stephen Rothwell --Sig_/bRZO1NnApjCsw8iiRTSbWDY Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaMbbYACgkQAVBC80lX 0GzVegf9HK+iyY6v6N+dJfnbLoQfwGIHZ4rndR52qNaF9KwHOWyI8KzsoUZ9FoCl zXJ0k0gPN3x+Ohn1HIFzgmUg4ABO9e+eAt89c9wJ4Q/SkXIOfRBnhVKgmmslOknW LEr8ITX4gIjxfsAA2VN9StC2h6V1DEXJwLyEdM+rsQ/5vz1Lhv5JFq/kAK9/IYZY tJmYIrO5dCWbuAt0Sh17k9BnZp31ehrLc3YeHsTcmLlXE128M3kG+yANywNOFRyz GrR+NxF1mvPHY/+euSML6WOxwLPBacnyN/8cBNF1EuLzXdGsbaiXrZzVZ0R7ophN yHuvkgaALGa742Wf7eSPKXvC0uQCPw== =NrLd -----END PGP SIGNATURE----- --Sig_/bRZO1NnApjCsw8iiRTSbWDY-- . Date: Tue, 9 Jul 2024 10:01:54 +1000 From: Stephen Rothwell To: Huacai Chen , Arnd Bergmann Cc: Huacai Chen , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the loongarch tree with the asm-generic tree Message-ID: <20240709100154.0b4b1372@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/tyAqR0/17fp8Oix9WjZuroh"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271324 org.kernel.vger.linux-next:62101 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/tyAqR0/17fp8Oix9WjZuroh Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the loongarch tree got a conflict in: arch/loongarch/include/uapi/asm/unistd.h between commits: 13aa27ce8de0 ("clone3: drop __ARCH_WANT_SYS_CLONE3 macro") 1d7b98ec5d78 ("loongarch: convert to generic syscall table") from the asm-generic tree and commit: a5d43e6d87c0 ("LoongArch: Define __ARCH_WANT_NEW_STAT in unistd.h") from the loongarch tree. I fixed it up (I think - see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc arch/loongarch/include/uapi/asm/unistd.h index 1f01980f9c94,b344b1f91715..000000000000 --- a/arch/loongarch/include/uapi/asm/unistd.h +++ b/arch/loongarch/include/uapi/asm/unistd.h @@@ -1,3 -1,6 +1,4 @@@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ + #define __ARCH_WANT_NEW_STAT -#define __ARCH_WANT_SYS_CLONE -#define __ARCH_WANT_SYS_CLONE3 =20 -#include +#include --Sig_/tyAqR0/17fp8Oix9WjZuroh Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaMffIACgkQAVBC80lX 0Gw58wf/ej1lSWnuM4/KpOYRyf7AFxFIGuHEe3PWI66JhSRbE4GQXRwD2ob5i5gx QilnVWse31u809LAQLnnjCTMwuws65cHsOLGP/NRbO9yNIMTUMV+7xV41Uhspf7g zYCI/pxPkvP3v+SMqUGCST/oPHgTCNdsATn9VxjPQQEM7gqCnilsNY3sG79oCkgZ MyXo2aWTglCQr65gOIPzWhue8DthOGT389Kz/rDoANBG4X6MOcFGkG/8tzib/M7U cQ48LBYdgmfQycwV5qWc/H1p9B0Xwnbo4uHAApLQgdXVGxnpa954X6SmcG/ybATs URUTtryewsP0NgceZFCSFuG3IiLnVg== =OLR0 -----END PGP SIGNATURE----- --Sig_/tyAqR0/17fp8Oix9WjZuroh-- . Date: Tue, 9 Jul 2024 10:05:36 +1000 From: Stephen Rothwell To: Huacai Chen , Arnaldo Carvalho de Melo , Namhyung Kim Cc: Bibo Mao , Huacai Chen , Ian Rogers , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the loongarch tree with the perf tree Message-ID: <20240709100536.238f4d12@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/a+ilXKgZ+tAeMFl71gmgY2f"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271328 org.kernel.vger.linux-next:62102 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/a+ilXKgZ+tAeMFl71gmgY2f Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the loongarch tree got a conflict in: tools/perf/arch/loongarch/util/Build between commit: e467705a9fb3 ("perf util: Make util its own library") from the perf tree and commit: c4d8557f0f71 ("perf kvm: Add kvm-stat for loongarch64") from the loongarch tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc tools/perf/arch/loongarch/util/Build index 2386ebbf6dd4,b12d374d7096..000000000000 --- a/tools/perf/arch/loongarch/util/Build +++ b/tools/perf/arch/loongarch/util/Build @@@ -1,5 -1,7 +1,7 @@@ -perf-y +=3D header.o -perf-y +=3D perf_regs.o ++perf-util-y +=3D header.o +perf-util-y +=3D perf_regs.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o ++perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o --Sig_/a+ilXKgZ+tAeMFl71gmgY2f Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaMftAACgkQAVBC80lX 0Gyt4Af/QD5jip7UipOwbE7fgRxYLvbsl4IQo/G6xhc3VL7bdeePojG4AAnQ/2LR bPEEAgmCYnSdQodGJtN/rOO4Thxxnus9Ur+u78nbztIom1Tg7fRiaAgd7HwPdWW8 wJvQxy1O5rcwkPTTsK/OxW7vYcnZ9JhDyJdldRZ40MS1BRp2kB6fdMC8AxCTaRVj evDZ7GOc4TwWcO/KMnkYD6wtG+8L/+UDU8C2z8iWnnnD8gVQ4FdTojqpOVBc5NQB 0JzdHoDMQo0qx5PWOWd8/3jFDQ3lNI88ramJi1TB8Y9lpOoteSPZYu6A9UAxkTia iM3vkSWqVwIulZXbf6WG+pI92XmyqQ== =X7Jo -----END PGP SIGNATURE----- --Sig_/a+ilXKgZ+tAeMFl71gmgY2f-- . Date: Tue, 9 Jul 2024 10:13:49 +1000 From: Stephen Rothwell To: Alexandre Torgue , Olof Johansson , Arnd Bergmann Cc: ARM , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: duplicate patches in the stm32 tree Message-ID: <20240709101349.02040caa@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/5=S9=Ywkr+c1nEVexhs0zK_"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271339 org.kernel.vger.linux-next:62103 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/5=S9=Ywkr+c1nEVexhs0zK_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, The following commits are also in the arm-soc tree as different commits (but the same patches): 1245911be805 ("ARM: multi_v7_defconfig: Add MCP23S08 pinctrl support") 2599b1f071f4 ("ARM: dts: stm32: Document output pins for PWMs on stm32mp1= 35f-dk") 32bc9d195039 ("ARM: dts: stm32: Add ethernet support for DH STM32MP13xx D= HCOR DHSBC board") 3389697affa5 ("arm64: dts: st: add HPDMA nodes on stm32mp251") 55dc557485c7 ("arm64: dts: st: add ethernet1 and ethernet2 support on stm= 32mp25") 5d6c1cef82a0 ("arm64: dts: st: describe power supplies for stm32mp257f-ev= 1 board") 9bcaeb10520a ("ARM: dts: stm32: add ethernet1 for STM32MP135F-DK board") a11b40677a34 ("regulator: Add STM32MP25 regulator bindings") a29ad03d8393 ("arm64: dts: st: add scmi regulators on stm32mp25") a43179fe3f09 ("arm64: dts: st: add eth2 pinctrl entries in stm32mp25-pinc= trl.dtsi") a4a0254811cc ("ARM: dts: stm32: omit unused pinctrl groups from stm32mp13= dtb files") a80ce2d743fb ("ARM: dts: stm32: add ethernet1 and ethernet2 support on st= m32mp13") ba3e48a76df3 ("ARM: dts: stm32: OP-TEE async notif interrupt for ST STM32= MP15x boards") c62c13b4efe4 ("ARM: dts: stm32: add ethernet1/2 RMII pins for STM32MP13F-= DK board") d41b45f29bc3 ("ARM: dts: stm32: order stm32mp13-pinctrl nodes") de2997982cf9 ("arm64: dts: st: enable Ethernet2 on stm32mp257f-ev1 board") --=20 Cheers, Stephen Rothwell --Sig_/5=S9=Ywkr+c1nEVexhs0zK_ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaMgL0ACgkQAVBC80lX 0GylIggAiKlBZwD5EOyhWhidAbirpGT7nGVIDwk1ruUtICoUcPX/Yyg7t9E9nb2R Dqbs8MY3KMrCtwczbuFKl6xZoqeuFxjou28cuGuDUuCGG0fwdtvDoLnNqlqE9dIo AmQuvIXMEPNHmDGS+RVaZVmP5j2lZWULNc6PZEuDOZQTk7KWaMygqR3sznT3izit 85+CF6AzEMIKtr/WzGCADK0sIiJt764PVnKdMYPblypbEZMbdIGCCWisvOyPC//x nZNLCk5qpLmO29LZlCu22Swbx3nHSjbtmbJBHoL5IPra6NVQZPRF4MvhtfxHCFs1 WCBsVzhhJVN3ff2oTsvkGJgybYFr2A== =1vuG -----END PGP SIGNATURE----- --Sig_/5=S9=Ywkr+c1nEVexhs0zK_-- . Date: Tue, 9 Jul 2024 10:57:09 +1000 From: Stephen Rothwell To: Arnd Bergmann , Christian Brauner Cc: Christian =?UTF-8?B?R8O2dHRzY2hl?= , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the vfs-brauner tree with the asm-generic tree Message-ID: <20240709105709.18ce785d@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/u_6tWU9N=/p6=6h78vKxFym"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271358 org.kernel.vger.linux-next:62104 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/u_6tWU9N=/p6=6h78vKxFym Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the fs-next tree got conflicts in: arch/arm64/include/asm/unistd.h arch/arm64/include/asm/unistd32.h between commit: ea0130bf3c45 ("arm64: convert unistd_32.h to syscall.tbl format") from the asm-generic tree and commit: e6873349f700 ("fs/xattr: add *at family syscalls") from the vfs-brauner tree. I fixed it up (I used the former versions) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell --Sig_/u_6tWU9N=/p6=6h78vKxFym Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaMiuUACgkQAVBC80lX 0Gxazgf9GtsVw4zw0bMnVtzUPbNw8+v1fDLVlAShS/iQvKXh7iueCGjfEtK41zwB loeSGQxU/k03Un0vgdy6Bb2dht247UEo5DZuH+Ao7tAQQDr19teUM1jo2nUENTs1 IU4Adh4oJA6rg7aRsZtz0RUGXsOPRaIrEFjfj/oSDi+5tK+Dv+6Mi9p3s5xsv93T dp25Pu6HiW2rF6kB+mPGxOR9caOAC0Gpqm4lD/KKPFiVaaEbQZWbFqT3wruUY0z2 pfj5D+n0QW73eOqDRlsKlQ3sfXTEEXr/SaExu2u3tBZ4b8v8LyOLNL6Eus1SxmgY jkP4C2dnPcTGwpQuKSlnBY0aWIxFkA== =wYly -----END PGP SIGNATURE----- --Sig_/u_6tWU9N=/p6=6h78vKxFym-- . Date: Tue, 9 Jul 2024 11:25:44 +1000 From: Stephen Rothwell To: Jiri Kosina , Benjamin Tissoires , Andrew Morton Cc: Benjamin Tissoires , Linux Kernel Mailing List , Linux Next Mailing List , Suren Baghdasaryan Subject: linux-next: manual merge of the hid tree with the mm tree Message-ID: <20240709112544.190ffda4@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/NAVrAfdl4p6hXZzxs31WWAi"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271377 org.kernel.vger.linux-next:62105 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/NAVrAfdl4p6hXZzxs31WWAi Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the hid tree got a conflict in: include/linux/hid_bpf.h between commit: bad8443fbbca ("mm: add comments for allocation helpers explaining why the= y are macros") from the mm-unstable branch of the mm tree and commit: 6cd735f0e57a ("HID: bpf: protect HID-BPF prog_list access by a SRCU") from the hid tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc include/linux/hid_bpf.h index 99a3edb6cf07,9ca96fc90449..000000000000 --- a/include/linux/hid_bpf.h +++ b/include/linux/hid_bpf.h @@@ -151,12 -227,7 +227,12 @@@ static inline int dispatch_hid_bpf_outp static inline int hid_bpf_connect_device(struct hid_device *hdev) { retur= n 0; } static inline void hid_bpf_disconnect_device(struct hid_device *hdev) {} static inline void hid_bpf_destroy_device(struct hid_device *hid) {} - static inline void hid_bpf_device_init(struct hid_device *hid) {} + static inline int hid_bpf_device_init(struct hid_device *hid) { return 0;= } +/* + * This specialized allocator has to be a macro for its allocations to be + * accounted separately (to have a separate alloc_tag). The typecast is + * intentional to enforce typesafety. + */ #define call_hid_bpf_rdesc_fixup(_hdev, _rdesc, _size) \ ((u8 *)kmemdup(_rdesc, *(_size), GFP_KERNEL)) =20 --Sig_/NAVrAfdl4p6hXZzxs31WWAi Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaMkZgACgkQAVBC80lX 0GwhXAf/R4CzLIOh2qhlhRwz/o6XJpfm54jmwD1728EsE7aJO6F90p4or3F5Nxw9 3GfOJJACY7iffkQJqB7/u0BI5qGl5ZaaO1TzJgrX3Wbz/4snzfCoR7WXxcx0QXwp 1q7TeQn1hIRi9SaRycqOqeXN1dJX9VI2J4OMg+UpTWdTvm1iQA08DOwIs+KE9hEB 9W+SjbfybpPvfwHiDzN+K0x7jkxJDUfdoTYgVeQ92kPIrSaq05BeHhRnizQ4SdTE +Wv27yTRxy3nSYKfEejr+N4AbYfWL/0ydEoxYi1VJRY2yxWzI5/lX15h1E5HaWaU 2IROVCneh6teWhlch8YzCEBIV6giOQ== =Zrzc -----END PGP SIGNATURE----- --Sig_/NAVrAfdl4p6hXZzxs31WWAi-- . Date: Tue, 9 Jul 2024 13:34:20 +1000 From: Stephen Rothwell To: Sebastian Reichel , Lee Jones Cc: Hans de Goede , Linux Kernel Mailing List , Linux Next Mailing List , Thomas =?UTF-8?B?V2Vpw59zY2h1aA==?= Subject: linux-next: manual merge of the battery tree with the leds-lj tree Message-ID: <20240709133420.55645c59@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/_v8u5kc2hc6W_g+2qeKHAQL"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271446 org.kernel.vger.linux-next:62107 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/_v8u5kc2hc6W_g+2qeKHAQL Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the battery tree got a conflict in: include/linux/leds.h between commit: 6b0d3355e5a5 ("leds: class: Add flag to avoid automatic renaming of LED d= evices") from the leds-lj tree and commit: 5607ca92e627 ("leds: core: Add led_mc_set_brightness() function") from the battery tree. I assume that the bit number valuse don;t actually matter, right? I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc include/linux/leds.h index 99f87587a132,517b6198df07..000000000000 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@@ -107,7 -107,7 +107,8 @@@ struct led_classdev=20 #define LED_BRIGHT_HW_CHANGED BIT(21) #define LED_RETAIN_AT_SHUTDOWN BIT(22) #define LED_INIT_DEFAULT_TRIGGER BIT(23) -#define LED_MULTI_COLOR BIT(24) +#define LED_REJECT_NAME_CONFLICT BIT(24) ++#define LED_MULTI_COLOR BIT(25) =20 /* set_brightness_work / blink_timer flags, atomic, private. */ unsigned long work_flags; --Sig_/_v8u5kc2hc6W_g+2qeKHAQL Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaMr7wACgkQAVBC80lX 0Gy0lwf+IWhCwyn95vuG7hTe6ViduwPCf0YLwW676tQaOuabhrUMHYQSyOccJoiu C+ktCzeO5xUZ/ZZX3RGnFhuulaicq/dVhFnisdqeQMTGQlspapaoIWmTeF1m2j3z AlhE99r6vOF66Zvp1mfjCBOTkeDwH1jL4mhW6newj7rU2bC30OPtNaoyxMhv0FEb E9rye/tJpzlb9zWRoAXnwsf2Lr7xKz9Z1tztBXKLHW79fsgX4YIvGIrJ1iCOFx0E KrMA8NFGDkm9l49xFOILdrk2TscO5nDSRqr+GiBQEOEngqllNktHfAF4RTLof3E8 q606QJVtf3gEyYFrG2U8Z4GuttDmdQ== =jaF+ -----END PGP SIGNATURE----- --Sig_/_v8u5kc2hc6W_g+2qeKHAQL-- . Date: Tue, 9 Jul 2024 13:55:23 +1000 From: Stephen Rothwell To: Theodore Ts'o , "Jason A. Donenfeld" Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: Signed-off-by missing for commit in the random tree Message-ID: <20240709135523.29112dba@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/NgulIbg9v7KAUMEI9qBs7nr"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271452 org.kernel.vger.linux-next:62108 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/NgulIbg9v7KAUMEI9qBs7nr Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Commits 868680ffba11 ("selftests/vDSO: remove duplicate compiler invocations from= Makefile") 7bb79ef48b9d ("selftests/vDSO: remove partially duplicated "all:" target = in Makefile") 14cd1a877fc6 ("selftests/vDSO: fix clang build errors and warnings") are missing a Signed-off-by from their committer. --=20 Cheers, Stephen Rothwell --Sig_/NgulIbg9v7KAUMEI9qBs7nr Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaMtKsACgkQAVBC80lX 0GwLUwf7BQYUsuAtXbnXjy3p97mMwcREp31LB57m0oqar7mClszXFCFuuLARRngf iqj+TD7DflD42VrVlL0NstTFYtsen+QbOfKlNlbX/kC2fpfCryKF40EaTAlWWThC rnuDA58Bkfm3LtIXIBPOT1xnCgm36OE8Z0ESLqVa09zbvoa9988CtUUi9h3EdM64 6HtNSD5m2CMmBBAgZnshBxm9Vb4lAlgS+7w6nLRsSlXEMHpPB72HM5ZdsuVfb/dt CtR528vPu2UIJmb8rA6ke8L5NejRiT4l5lFg9MG9cD0cXA3RD0kXJYtUHlG38ilI l8wPcO8TtNDfYWW7ux5WsScF5uGBXg== =c1MV -----END PGP SIGNATURE----- --Sig_/NgulIbg9v7KAUMEI9qBs7nr-- . Date: Tue, 9 Jul 2024 14:27:38 +1000 From: Stephen Rothwell To: Rob Herring , Masahiro Yamada Cc: Dmitry Baryshkov , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the devicetree tree with the kbuild tree Message-ID: <20240709142738.167999ba@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/B7geL4Vw7Eo/RMNFQ6Ha8m/"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271465 org.kernel.vger.linux-next:62109 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/B7geL4Vw7Eo/RMNFQ6Ha8m/ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the devicetree tree got a conflict in: scripts/Makefile.lib between commit: ab6aaea6835b ("kbuild: avoid build error when single DTB is turned into c= omposite DTB") from the kbuild tree and commit: dd402cbd0afa ("kbuild: verify dtoverlay files against schema") from the devicetree tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc scripts/Makefile.lib index 636119dc4403,29da0dc9776d..000000000000 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@@ -407,12 -407,15 +407,19 @@@ cmd_dtc =3D $(HOSTCC) -E $(dtc_cpp_flags -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) =20 +# NOTE: +# Do not replace $(filter %.dtb %.dtbo, $^) with $(real-prereqs). When a = single +# DTB is turned into a multi-blob DTB, $^ will contain header file depend= encies +# recorded in the .*.cmd file. + DT_CHECK_CMD =3D $(DT_CHECKER) $(DT_CHECKER_FLAGS) -u $(srctree)/$(DT_BIN= DING_DIR) -p $(DT_TMP_SCHEMA) +=20 + ifneq ($(CHECK_DTBS),) + quiet_cmd_fdtoverlay =3D DTOVLCH $@ - cmd_fdtoverlay =3D $(objtree)/scripts/dtc/fdtoverlay -o $@ -i $(rea= l-prereqs) ; $(DT_CHECK_CMD) $@ || true ++ cmd_fdtoverlay =3D $(objtree)/scripts/dtc/fdtoverlay -o $@ -i $(fil= ter %.dtb %.dtbo, $^) ; $(DT_CHECK_CMD) $@ || true + else quiet_cmd_fdtoverlay =3D DTOVL $@ - cmd_fdtoverlay =3D $(objtree)/scripts/dtc/fdtoverlay -o $@ -i $(rea= l-prereqs) + cmd_fdtoverlay =3D $(objtree)/scripts/dtc/fdtoverlay -o $@ -i $(fil= ter %.dtb %.dtbo, $^) + endif =20 $(multi-dtb-y): FORCE $(call if_changed,fdtoverlay) --Sig_/B7geL4Vw7Eo/RMNFQ6Ha8m/ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaMvDoACgkQAVBC80lX 0GzLOwf6Azn898I9IYbx0cOxjh16AlgcpVB6sPvgFqO8txlQbKE8PQ+gZtfRgVB6 ET5ReR1GDHbBNzeHsMgmMzF+ZB1rXcS0WQDYyX485Qkc64LiimwQmVP/zRn7HaTP JrdpTSJFr6W1XVMKabvRem9Qp3e3n21w5ykC7FlYCaw7P6YBFsWKM0rE8u/f5WAy ngAAzx6/6oSxLb5uUK/3a4vIbp6IzWRkfebCqFnltb72dhoYrzfItpX78h6lEQz+ 2g5S/ts/DRRWW/W2/D9eaY9mHBh66zNaVUwg1y+T+lynAHJIJZaWhkhcN0mSrYUz lxY9Nau7EzUFW+nvDv+/mxuE6weLFA== =9CNJ -----END PGP SIGNATURE----- --Sig_/B7geL4Vw7Eo/RMNFQ6Ha8m/-- . Date: Tue, 9 Jul 2024 15:37:47 +1000 From: Stephen Rothwell To: Greg KH Cc: Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Rasmus Villemoes , Stefan Eichenberger Subject: linux-next: manual merge of the tty tree with the tty.current tree Message-ID: <20240709153747.07d7272c@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/20wsyuH.4Ohkr5IbyyKsu/p"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271505 org.kernel.vger.linux-next:62110 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/20wsyuH.4Ohkr5IbyyKsu/p Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the tty tree got a conflict in: drivers/tty/serial/imx.c between commit: 9706fc87b4cf ("serial: imx: only set receiver level if it is zero") from the tty.current tree and commit: 3093f180bc6e ("serial: imx: stop casting struct uart_port to struct imx_p= ort") from the tty tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc drivers/tty/serial/imx.c index ff32cd2d2863,d96f0524f7fb..000000000000 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@@ -1549,10 -1553,9 +1554,10 @@@ static int imx_uart_startup(struct uart =20 static void imx_uart_shutdown(struct uart_port *port) { - struct imx_port *sport =3D (struct imx_port *)port; + struct imx_port *sport =3D to_imx_port(port); unsigned long flags; u32 ucr1, ucr2, ucr4, uts; + int loops; =20 if (sport->dma_is_enabled) { dmaengine_terminate_sync(sport->dma_chan_tx); @@@ -1984,8 -1937,8 +1989,8 @@@ static void imx_uart_poll_put_char(stru static int imx_uart_rs485_config(struct uart_port *port, struct ktermios = *termios, struct serial_rs485 *rs485conf) { - struct imx_port *sport =3D (struct imx_port *)port; + struct imx_port *sport =3D to_imx_port(port); - u32 ucr2; + u32 ucr2, ufcr; =20 if (rs485conf->flags & SER_RS485_ENABLED) { /* Enable receiver if low-active RTS signal is requested */ --Sig_/20wsyuH.4Ohkr5IbyyKsu/p Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaMzKsACgkQAVBC80lX 0GwBaAf+IQdnt5lHrEVR733zi2DEUfysmf9dniwZEnSKMMXn21Pi/l/RACvNcKoq BU1au5gAw+QxyvggvqAjxGSjF+ASNNsYeUWmGyxy4yUN0RfTlzfbl3SUYQZswvyn BFmn15gdHDVUh5d7mYPOss3HekEhwYmC6KqDhLECj2BVDCVQk3WxeXGC8906bL9V E84grww3k0K8T+32EW3yxyNvDfFDoe0dqIi6DI8A79aCs7X53SsmkQ961eedT59y NvED0bUgIpRlcOSPgRJdQUwHIeOvcoPfB+oW1Y6vO6Dn3NvZrqBy8N3z3mworD42 f0B2+LP3QYgCFsoZr3TfBejhm4MMtQ== =yz1h -----END PGP SIGNATURE----- --Sig_/20wsyuH.4Ohkr5IbyyKsu/p-- . Date: Tue, 9 Jul 2024 16:33:05 +1000 From: Stephen Rothwell To: Joerg Roedel , Bjorn Helgaas , Lorenzo Pieralisi , Krzysztof =?UTF-8?B?V2lsY3p5?= =?UTF-8?B?xYRza2k=?= Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: duplicate patch in the iommu tree Message-ID: <20240709163305.188b1182@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/b3VQaRT5EBDDwIjA+IZt6xB"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271560 org.kernel.vger.linux-next:62113 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/b3VQaRT5EBDDwIjA+IZt6xB Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, The following commit is also in the pci tree as a different commit (but the same patch): 40929e8e5449 ("dt-bindings: PCI: generic: Add ats-supported property") This is commit 631b2e7318d4 ("dt-bindings: PCI: generic: Add ats-supported property") in the pci tree. --=20 Cheers, Stephen Rothwell --Sig_/b3VQaRT5EBDDwIjA+IZt6xB Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaM2aEACgkQAVBC80lX 0GyGSAf+Kb1z8rJJsmT9B3/6CyrDBJEr9XNP5Xrz7DYxYV1ApGejCpBouFVMOL1d QR5YnmNYMWIhINmmKgGpWwx3sWLXB00GvmpyXpMw5vZpM7mBsUkRf27ySbYZlWx0 R0IwdT3a2FdmtUQ1ZgLCCM8sgBPfhWVdZyJvgMMrtJueIwwAh4TeKkoHnzCGo+lM HsCm5pfqj4Djhb+SmHqHhGlT2c+e09RD2wFat71QPMDx6k8MxFa/v5L5TyOPXoMr TyWY1NQBzz6txX8mGfdYK0splWEmZu+yFeBn6V/a8jmKDgOGFC7BMGD2qjlxje4A VGVAd1Rs6BbOsQuR3u3GYm5v9yCBRg== =RGWI -----END PGP SIGNATURE----- --Sig_/b3VQaRT5EBDDwIjA+IZt6xB-- . Date: Tue, 9 Jul 2024 16:37:15 +1000 From: Stephen Rothwell To: Greg KH , Mauro Carvalho Chehab Cc: David Plowman , Hans Verkuil , Jacopo Mondi , Naushir Patuck , Nick Hollinghurst , Sakari Ailus , Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the driver-core tree Message-ID: <20240709163715.3bcd6ab3@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/LLRyCjwUfGVoOapVNN1ZBj8"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271564 org.kernel.vger.linux-next:62114 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/LLRyCjwUfGVoOapVNN1ZBj8 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the driver-core tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: error: initia= lization of 'void (*)(struct platform_device *)' from incompatible pointer = type 'int (*)(struct platform_device *)' [-Werror=3Dincompatible-pointer-ty= pes] 1786 | .remove =3D pispbe_remove, | ^~~~~~~~~~~~~ drivers/media/platform/raspberrypi/pisp_be/pisp_be.c:1786:27: note: (near i= nitialization for 'pispbe_pdrv..remove') cc1: all warnings being treated as errors Caused by commit 0edb555a65d1 ("platform: Make platform_driver::remove() return void") interacting withc commit 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE") from the vl4-dvb-next tree. I have applied the following fix up patch. From: Stephen Rothwell Date: Tue, 9 Jul 2024 16:03:05 +1000 Subject: [PATCH] fix up for "platform: Make platform_driver::remove() retur= n void" interacting with commit 12187bd5d4f8 ("media: raspberrypi: Add support for PiSP BE") from the v4l-dvb-next tree. Signed-off-by: Stephen Rothwell --- drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c b/drivers= /media/platform/raspberrypi/pisp_be/pisp_be.c index e74df5b116dc..7596ae1f7de6 100644 --- a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c @@ -1756,7 +1756,7 @@ static int pispbe_probe(struct platform_device *pdev) return ret; } =20 -static int pispbe_remove(struct platform_device *pdev) +static void pispbe_remove(struct platform_device *pdev) { struct pispbe_dev *pispbe =3D platform_get_drvdata(pdev); =20 @@ -1765,8 +1765,6 @@ static int pispbe_remove(struct platform_device *pdev) pispbe_runtime_suspend(pispbe->dev); pm_runtime_dont_use_autosuspend(pispbe->dev); pm_runtime_disable(pispbe->dev); - - return 0; } =20 static const struct dev_pm_ops pispbe_pm_ops =3D { --=20 2.43.0 --=20 Cheers, Stephen Rothwell --Sig_/LLRyCjwUfGVoOapVNN1ZBj8 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaM2psACgkQAVBC80lX 0Gyf8wf/baWep99MNzEME4/nIVkQHEFidvtVri78Hc3DIvOaf67CD2/HrRVB8KMh A5KqtbfeIiN2PCcLTCFE0ROb9Dg7ZWVz1glwLfJ5DTj/tMHytu52nvCqiQMjCgva HxW4d+Svgk7RrGQlF+qLjmKs3KXAhSS1kjcc97dNH4+8x2ZJl+F+E6r1prPEJ1mI HlSZcXYC50ipu8Mk1uKj/DrQxZYAGchUTYoKj9zwvZGJgpVdhe+qh6zNH8M0dJX1 W/NMXHfGA+RiOGVJ0W5GqPZDOU+lBmJquNEXOwQ9Vt+GQEppLy5SHa22PHAB5rBt y2zi5Yn6+27Ytlr2onRQNSvolmrBEQ== =saEg -----END PGP SIGNATURE----- --Sig_/LLRyCjwUfGVoOapVNN1ZBj8-- . Date: Tue, 9 Jul 2024 16:46:18 +1000 From: Stephen Rothwell To: Rob Herring , Olof Johansson , Arnd Bergmann , Palmer Dabbelt , Paul Walmsley Cc: ARM , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: duplicate patches in the devicetree tree Message-ID: <20240709164618.69cfcfad@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/2DRl4Cklscdcw/Xkyc9LcFw"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271573 org.kernel.vger.linux-next:62115 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/2DRl4Cklscdcw/Xkyc9LcFw Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, The following commits are also in the arm-soc and risc-v trees as different commits (but the same patches): 0620bce64afa ("dt-bindings: riscv: cpus: add ref to interrupt-controller") 877097a2fab0 ("dt-bindings: interrupt-controller: convert marvell,mpic bi= nding to YAML") c7ce06684bf5 ("dt-bindings: interrupt-controller: riscv,cpu-intc: convert= to dtschema") --=20 Cheers, Stephen Rothwell --Sig_/2DRl4Cklscdcw/Xkyc9LcFw Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaM3LoACgkQAVBC80lX 0GwKNwf8C0TTNGeCtICkaEL7I5AWdR7ssQTG9fP8m1pLeOiumk0wskNlJW/ROFzb /SiWmmkLWyyibTgIhWBnSFm8LXb4HeudQ+aWUiLOxF3kqDnTs+TQudNDX7u26lQ5 kIeya6dht59jXAzYaHhaNALEB96sAQ3E4/nsLGwJOBMBst3bEi9WdSZ69KdopdlH QpZ0ZK1PCUiWzhHoBaL+uZE2qFAQjZ1HPz8T1S228U62aOJyKJkwU96BWQ7ydUnx zpo94wBP4KcvSFPs7Eq6KwbqCXtjveCn4r2eHP4PCxWHTULhINgYsSwXDYDiT2HS y9KXROo0MWiicnBgSUhicPzjNyWUaw== =0ofK -----END PGP SIGNATURE----- --Sig_/2DRl4Cklscdcw/Xkyc9LcFw-- . Date: Tue, 9 Jul 2024 16:57:08 +1000 From: Stephen Rothwell To: "Martin K. Petersen" Cc: Linux Kernel Mailing List , Linux Next Mailing List , Nathan Chancellor , Tomas Henzl Subject: linux-next: manual merge of the scsi-mkp tree with Linus' tree Message-ID: <20240709165708.3f8e3498@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/T511yx9uxaRgdDo9lMOp/sB"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271588 org.kernel.vger.linux-next:62117 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/T511yx9uxaRgdDo9lMOp/sB Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/mpi3mr/mpi3mr_transport.c between commit: 9f365cb8bbd0 ("scsi: mpi3mr: Use proper format specifier in mpi3mr_sas_po= rt_add()") from Linus' tree and commit: de24085328c0 ("scsi: mpi3mr: Correct a test in mpi3mr_sas_port_add()") from the scsi-mkp tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc drivers/scsi/mpi3mr/mpi3mr_transport.c index 82aa4e418c5a,27865ee896d7..000000000000 --- a/drivers/scsi/mpi3mr/mpi3mr_transport.c +++ b/drivers/scsi/mpi3mr/mpi3mr_transport.c @@@ -1363,8 -1377,8 +1377,8 @@@ static struct mpi3mr_sas_port *mpi3mr_s (mr_sas_node->phy[i].hba_port !=3D hba_port)) continue; =20 - if (i > sizeof(mr_sas_port->phy_mask) * 8) { + if (i >=3D sizeof(mr_sas_port->phy_mask) * 8) { - ioc_warn(mrioc, "skipping port %u, max allowed value is %lu\n", + ioc_warn(mrioc, "skipping port %u, max allowed value is %zu\n", i, sizeof(mr_sas_port->phy_mask) * 8); goto out_fail; } --Sig_/T511yx9uxaRgdDo9lMOp/sB Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaM30QACgkQAVBC80lX 0GwVmQgAk9XUPMw49w+zT9uAmQ4spf44yUxg5HEswz1XMAx+mTzzMyU7wAZhm+v2 meWwhq8erwgXVEgNDbnzBeOGzlsOtRljpPyNk1P3qhcBD7gsVh/TUkYdEhjzHr07 UKCxmeSd9u0rU4yfkOU4Ju5tBkcOPwY5C7acYEgnx3bFq9alrKsH67kitYXLgCwP A/GgMf2MYrU+qDJJmlhMKXahbDZM8Oj8MvrMSEd1CLwZ7mawZDotSxDx0IH9UvTS BHhKZeLM21uiNhRY6sErAGOd0Gnw3lUJvTDKI1de1xzvVnRJg60MxRuCrKtxA6eP wX4fvBk0eyCxnh+w5JestFo570oeiQ== =xk5+ -----END PGP SIGNATURE----- --Sig_/T511yx9uxaRgdDo9lMOp/sB-- . Date: Tue, 9 Jul 2024 17:40:53 +1000 From: Stephen Rothwell To: Theodore Ts'o , "Jason A. Donenfeld" , Andrew Morton Cc: Barry Song , Barry Song , Lance Yang , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the random tree with the mm-stable tree Message-ID: <20240709174053.051a46a4@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Nss_ongiZk.IhXDCBHpNi9z"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271625 org.kernel.vger.linux-next:62120 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/Nss_ongiZk.IhXDCBHpNi9z Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the random tree got a conflict in: mm/rmap.c between commits: 26d21b18d971 ("mm/rmap: remove duplicated exit code in pagewalk loop") 15bde4abab73 ("mm: extend rmap flags arguments for folio_add_new_anon_rma= p") from the mm-stable tree and commit: 94beef29e110 ("mm: add MAP_DROPPABLE for designating always lazily freeab= le mappings") from the random tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc mm/rmap.c index 8616308610b9,1f9b5a9cb121..000000000000 --- a/mm/rmap.c +++ b/mm/rmap.c @@@ -1394,27 -1384,26 +1394,30 @@@ void folio_add_anon_rmap_pmd(struct fol * * Like folio_add_anon_rmap_*() but must only be called on *new* folios. * This means the inc-and-test can be bypassed. - * The folio does not have to be locked. + * The folio doesn't necessarily need to be locked while it's exclusive + * unless two threads map it concurrently. However, the folio must be + * locked if it's shared. * - * If the folio is pmd-mappable, it is accounted as a THP. As the folio - * is new, it's assumed to be mapped exclusively by a single process. + * If the folio is pmd-mappable, it is accounted as a THP. */ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *= vma, - unsigned long address) + unsigned long address, rmap_t flags) { - int nr =3D folio_nr_pages(folio); + const int nr =3D folio_nr_pages(folio); + const bool exclusive =3D flags & RMAP_EXCLUSIVE; + int nr_pmdmapped =3D 0; =20 VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio); + VM_WARN_ON_FOLIO(!exclusive && !folio_test_locked(folio), folio); VM_BUG_ON_VMA(address < vma->vm_start || address + (nr << PAGE_SHIFT) > vma->vm_end, vma); -=20 - if (!folio_test_swapbacked(folio)) + /* + * VM_DROPPABLE mappings don't swap; instead they're just dropped when + * under memory pressure. + */ - if (!(vma->vm_flags & VM_DROPPABLE)) ++ if (!folio_test_swapbacked(folio) && !(vma->vm_flags & VM_DROPPABLE)) __folio_set_swapbacked(folio); - __folio_set_anon(folio, vma, address, true); + __folio_set_anon(folio, vma, address, exclusive); =20 if (likely(!folio_test_large(folio))) { /* increment count (starts at -1) */ @@@ -1858,8 -1862,15 +1867,13 @@@ static bool try_to_unmap_one(struct fol * discarded. Remap the page to page table. */ set_pte_at(mm, address, pvmw.pte, pteval); - folio_set_swapbacked(folio); + /* + * Unlike MADV_FREE mappings, VM_DROPPABLE ones + * never get swap backed on failure to drop. + */ + if (!(vma->vm_flags & VM_DROPPABLE)) + folio_set_swapbacked(folio); - ret =3D false; - page_vma_mapped_walk_done(&pvmw); - break; + goto walk_abort; } =20 if (swap_duplicate(entry) < 0) { --Sig_/Nss_ongiZk.IhXDCBHpNi9z Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaM6YYACgkQAVBC80lX 0GybgAf9ECAKGIckkbB4BocYWJ2LMVtImP9MpX5fijc2X7IUsowkamBueLMpgVIa o06Z6BEgfLrs5IDk/2KJLh2blwxaub/cQJbIylL4BiyGTKQM6+TwvuBDDbNESaQX rH9C5CrGBjNDFCL+R0qOS0NyK98Q9gOLb7MpsdnI3KjKYPczM4TVwQgKcpn8UFBG 6szVfoxMtWWspV6rvMDRKCrqoKn8SFY+1n2yB0grzs9ZYnY4jooO49xqyiwbaqlh xqN+gDGASx7jZ35vH5qFfMvHiUNZxr5fPKsR06nPHk7H4xpOtrAMIRvTAxH8/eIl B+IPAD1AUGOo/PXILnAJDPjyZZ5igw== =xolW -----END PGP SIGNATURE----- --Sig_/Nss_ongiZk.IhXDCBHpNi9z-- . Date: Tue, 9 Jul 2024 17:43:40 +1000 From: Stephen Rothwell To: Theodore Ts'o , "Jason A. Donenfeld" , Andrew Morton Cc: Donet Tom , Linux Kernel Mailing List , Linux Next Mailing List , "Ritesh Harjani (IBM)" Subject: linux-next: manual merge of the random tree with the mm-stable tree Message-ID: <20240709174340.5c03c2b9@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/MmvR/cmc7U=7=PRedTMJjZb"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271629 org.kernel.vger.linux-next:62121 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/MmvR/cmc7U=7=PRedTMJjZb Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the random tree got a conflict in: tools/testing/selftests/mm/Makefile between commit: 3a103b5315b7 ("selftest: mm: Test if hugepage does not get leaked during = __bio_release_pages()") from the mm-stable tree and commit: 94beef29e110 ("mm: add MAP_DROPPABLE for designating always lazily freeab= le mappings") from the random tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc tools/testing/selftests/mm/Makefile index e1aa09ddaa3d,e3e5740e13e1..000000000000 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@@ -75,7 -73,7 +75,8 @@@ TEST_GEN_FILES +=3D ksm_functional_test TEST_GEN_FILES +=3D mdwe_test TEST_GEN_FILES +=3D hugetlb_fault_after_madv TEST_GEN_FILES +=3D hugetlb_madv_vs_map +TEST_GEN_FILES +=3D hugetlb_dio + TEST_GEN_FILES +=3D droppable =20 ifneq ($(ARCH),arm64) TEST_GEN_FILES +=3D soft-dirty --Sig_/MmvR/cmc7U=7=PRedTMJjZb Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaM6iwACgkQAVBC80lX 0GzQ0Qf8D5iZvMUXOim4h+wk5dm9lHbdnosCIMex9sPYFogb+B8L5JFi8rNQ3R+N RJrVWK8G/gcEh3dtx7/VV1FpURnjs0AKDvJbYHVTSRbrfbKhAcoeZEvzf3eXNv6i 9Gf/hrOznL+Fs0ZIkt1UwgIgCHHctZNura+Tt80LlSa3fRe1ybGeQ5eMP68AsMnV siS9me/dpizAbMnJluRxwWLbhT86tXBehR6UNI2F+5x4Q/AUSclEuh/aSQGtDSzp 19v7cJXh50Ggx8ANyDtdJWlxktpQ7B4wrZOoMT3Sya8+9yhSOcvdxGCiuhiKBQ6W 1mR1+GF/nNUtOxwe72xMb5OFvNWC9w== =Ea6t -----END PGP SIGNATURE----- --Sig_/MmvR/cmc7U=7=PRedTMJjZb-- . Date: Tue, 9 Jul 2024 17:52:55 +1000 From: Stephen Rothwell To: Miguel Ojeda , Jens Axboe Cc: Alice Ryhl , Andreas Hindborg , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the rust tree with the block tree Message-ID: <20240709175255.71439654@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/SQaM2+PQVQpHyl/GZVumm26"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271648 org.kernel.vger.linux-next:62122 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/SQaM2+PQVQpHyl/GZVumm26 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the rust tree got a conflict in: rust/bindings/bindings_helper.h between commit: 5b026e341207 ("rust: block: fix generated bindings after refactoring of f= eatures") from the block tree and commit: ab44079e2869 ("rust: alloc: add __GFP_HIGHMEM flag") from the rust tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc rust/bindings/bindings_helper.h index 53c996e4bedf,f2bafb10f181..000000000000 --- a/rust/bindings/bindings_helper.h +++ b/rust/bindings/bindings_helper.h @@@ -30,4 -26,4 +30,5 @@@ const gfp_t RUST_CONST_HELPER_GFP_KERNE const gfp_t RUST_CONST_HELPER_GFP_KERNEL_ACCOUNT =3D GFP_KERNEL_ACCOUNT; const gfp_t RUST_CONST_HELPER_GFP_NOWAIT =3D GFP_NOWAIT; const gfp_t RUST_CONST_HELPER___GFP_ZERO =3D __GFP_ZERO; + const gfp_t RUST_CONST_HELPER___GFP_HIGHMEM =3D ___GFP_HIGHMEM; +const blk_features_t RUST_CONST_HELPER_BLK_FEAT_ROTATIONAL =3D BLK_FEAT_R= OTATIONAL; --Sig_/SQaM2+PQVQpHyl/GZVumm26 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaM7FcACgkQAVBC80lX 0GxcWwf/TXx1Qn6sERh8dtnIHcUrY59B3lh6/VsRoba/j4nWIjjF4BJQbyIIWkfz RyC5pj382gQrw3elMEZcWZHCUsFWlJ0CtWXFrQPJm9Yg5S6LFDvW37K6DulV6O0H mf5KRUP+W9zQB04wzb5/Ku7Qv5RqmcLFYPt8npQiZl2q3ofkRBvs6JG1tyoX+YoA xq+JbM8BjmMUmHcQg/dNJIR3SgktYLKA6+4qDXwjOnrTXwLT585PBY2p5MpgVbsv xuQPwaVujxBSeKnB60h2K1sAE71zt62mLqxK+NN9d+fgf6E1HmeFbUA7QxFqKP0i qPMBhP/ngTGfcm55HID06VuRPU17DA== =H4xZ -----END PGP SIGNATURE----- --Sig_/SQaM2+PQVQpHyl/GZVumm26-- . Date: Tue, 9 Jul 2024 17:58:03 +1000 From: Stephen Rothwell To: Kees Cook Cc: Arnd Bergmann , Linux Kernel Mailing List , Linux Next Mailing List , liujinlong , liujinlong Subject: linux-next: manual merge of the kspp tree with Linus' tree Message-ID: <20240709175803.36f8bca6@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/qcOr_DR=iMkXoT2OuDs2tZ3"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271655 org.kernel.vger.linux-next:62124 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/qcOr_DR=iMkXoT2OuDs2tZ3 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the kspp tree got a conflict in: kernel/kallsyms.c between commit: 7e1f4eb9a60d ("kallsyms: rework symbol lookup return codes") from Linus' tree and commit: 21b4564fedad ("sprint_symbol: Replace strcpy with memmove to handle poten= tial overlap") from the kspp tree. I fixed it up (the former removed the code modified by the latter, so I did that) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell --Sig_/qcOr_DR=iMkXoT2OuDs2tZ3 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaM7YsACgkQAVBC80lX 0GwIvAf/eSokduLCFkiUm0VI3VjxQ5l6EOv5sWiuWd6e+ogG7Bx+H5IR4eW/ILuL lC6jIREbFxZvTSpX26NWoT9wz3XwWp5e0os4aWaHAfJIVFFtn3WV3qhyi1SldVtD WTDckClVNPaXO4mp8qqQb1r3JncXgKD7DdOWzhcOWJ8Y1FKJ3ejoqDPZalP1KEg6 Qv8UryngT/Rgz3U+qvO6mUTmhbK4L0SXBR86pfXxJmX2GHP6uDMPBL2+uJS0jeZE pP798gknfYXGAT6vC5oGBuHrvIwpE1mStrPcEFAOhkUs19VZNZ3k7WlCgfeStyIs CISiihqs4gGmzdbxGo0Umvf3Rpk5rQ== =tKSh -----END PGP SIGNATURE----- --Sig_/qcOr_DR=iMkXoT2OuDs2tZ3-- . Date: Tue, 9 Jul 2024 18:08:29 +1000 From: Stephen Rothwell To: Theodore Ts'o , "Jason A. Donenfeld" , Shuah Khan Cc: John Hubbard , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: duplicate patches in the random tree Message-ID: <20240709180829.65e8967d@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/0GB.kt9fq8KwD/z07AtL0gY"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271664 org.kernel.vger.linux-next:62125 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/0GB.kt9fq8KwD/z07AtL0gY Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, The following commits are also in the kselftest-fixes tree as different commits (but the same patches): 868680ffba11 ("selftests/vDSO: remove duplicate compiler invocations from= Makefile") 7bb79ef48b9d ("selftests/vDSO: remove partially duplicated "all:" target = in Makefile") 14cd1a877fc6 ("selftests/vDSO: fix clang build errors and warnings") These are already causing an unnecessary conflict :-( Maybe you could just merge the kselftest-fixes tree (git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fi= xes), but first make sure that it won't be rebased. --=20 Cheers, Stephen Rothwell --Sig_/0GB.kt9fq8KwD/z07AtL0gY Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaM7/0ACgkQAVBC80lX 0Gw8hAf/UQnJJh+08sSLt89DvlFahc3R/Bj9A21CjSdQNk2lz9JDcpz9NBsYmkif qPiMQA396LxTqa3A/f7S3LV3OtoOCS7keei4rxkaDMHBdu+X1TPNLMpALZYVxnHr DOQ55cQMyLNsHqtc4MQl4Kco3TbAKvPx+6K/ahF83pA62f4e9mjxV/bNwNlZPTvU CPM0crEthjdpDQe2yjArub0Pexab1vxPWOXL0maClOn6EimbKlnotrSf6UC4g62F 9mqA4kf00IlgSOfytAPOATHFd8w9UZd1VbuOwQUcKJT+hUkJAsPCss18/QIjc7wR t/WiOR6iaJr56/fYHkBX0msJQqPbVA== =O8I8 -----END PGP SIGNATURE----- --Sig_/0GB.kt9fq8KwD/z07AtL0gY-- . Date: Tue, 9 Jul 2024 18:40:04 +1000 From: Stephen Rothwell To: Andrew Morton Cc: Nicolas Pitre , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the mm tree Message-ID: <20240709184004.60f94726@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/rapPalzJMwbDFUFj46ja6p1"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271697 org.kernel.vger.linux-next:62128 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/rapPalzJMwbDFUFj46ja6p1 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the mm tree, today's linux-next build (i386 defconfig) failed like this: lib/math/div64.c: In function 'mul_u64_u64_div_u64': lib/math/div64.c:211:2: error: #error "unknown endianness" 211 | #error "unknown endianness" | ^~~~~ lib/math/div64.c:219:21: error: 'union ' has no member named 'l' 219 | X.v =3D (u64)A.l * B.l; | ^ lib/math/div64.c:219:27: error: 'union ' has no member named 'l' 219 | X.v =3D (u64)A.l * B.l; | ^ lib/math/div64.c:220:21: error: 'union ' has no member named 'l' 220 | Y.v =3D (u64)A.l * B.h + X.h; | ^ lib/math/div64.c:220:27: error: 'union ' has no member named 'h' 220 | Y.v =3D (u64)A.l * B.h + X.h; | ^ lib/math/div64.c:220:33: error: 'union ' has no member named 'h' 220 | Y.v =3D (u64)A.l * B.h + X.h; | ^ lib/math/div64.c:221:21: error: 'union ' has no member named 'h' 221 | Z.v =3D (u64)A.h * B.h + Y.h; | ^ lib/math/div64.c:221:27: error: 'union ' has no member named 'h' 221 | Z.v =3D (u64)A.h * B.h + Y.h; | ^ lib/math/div64.c:221:33: error: 'union ' has no member named 'h' 221 | Z.v =3D (u64)A.h * B.h + Y.h; | ^ lib/math/div64.c:222:21: error: 'union ' has no member named 'h' 222 | Y.v =3D (u64)A.h * B.l + Y.l; | ^ lib/math/div64.c:222:27: error: 'union ' has no member named 'l' 222 | Y.v =3D (u64)A.h * B.l + Y.l; | ^ lib/math/div64.c:222:33: error: 'union ' has no member named 'l' 222 | Y.v =3D (u64)A.h * B.l + Y.l; | ^ lib/math/div64.c:223:10: error: 'union ' has no member named 'h' 223 | X.h =3D Y.l; | ^ lib/math/div64.c:223:16: error: 'union ' has no member named 'l' 223 | X.h =3D Y.l; | ^ lib/math/div64.c:224:17: error: 'union ' has no member named 'h' 224 | Z.v +=3D Y.h; | ^ Caused by commit 7a3c42cc4fc3 ("mul_u64_u64_div_u64: make it precise always") from the mm-nonmm-unstable branch of the mm tree. I have reverted that commit for today. --=20 Cheers, Stephen Rothwell --Sig_/rapPalzJMwbDFUFj46ja6p1 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaM92QACgkQAVBC80lX 0GxBVwgAgHuPqASRv0/BBKUWaI0FG76ok4ilXZt0mP7bVT0zxhq8YydZBUYfpkD/ be1bUE+pVJ5Zk2lINRyqYhF1aBHDjKVqcWEKNcQp1XI2mL6qzcmxuE3HFwiK6Efu 0yi24f4GLkKwYVwRlDkT3LKM073T4SvrhJO7UF2U/fY6fruJ0Te3KFJ+MAUq6/du vtcWDivTJ6EVxbXQL2xZId1fADBw/ThJ1qglxc5bkyAGIw8Xo6iaBZZD84ie/rc1 1fp4QMuP39TcHz3+FrDc/C12SK+A6Y//eqnAc4ZYFFMo3+O5gw5Yca7/rd1dYbdp fKbTSBrHUiBNv1Tm+b5TOnKYRIu+uw== =I2em -----END PGP SIGNATURE----- --Sig_/rapPalzJMwbDFUFj46ja6p1-- . Date: Tue, 9 Jul 2024 18:57:33 +1000 From: Stephen Rothwell To: Alasdair G Kergon , Mike Snitzer Cc: Mikulas Patocka , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build warning after merge of the device-mapper tree Message-ID: <20240709185733.4aac356a@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/D405Mat/UdkS.xjdaUH+mwk"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271730 org.kernel.vger.linux-next:62130 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/D405Mat/UdkS.xjdaUH+mwk Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the device-mapper tree, today's linux-next build (htmldocs) produced this warning: Documentation/admin-guide/device-mapper/dm-crypt.rst:168: ERROR: Unexpected= indentation. Introduced by commit 04a1020ad350 ("dm-crypt: limit the size of encryption requests") --=20 Cheers, Stephen Rothwell --Sig_/D405Mat/UdkS.xjdaUH+mwk Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaM+30ACgkQAVBC80lX 0GwXWAf9GvpDZfiGkricFbGTVWIiIf2s2644aR9UeKiAiFkC4tNtFayP66pIPqRk t6JjCvoKMJEIsW7SBeABK27cAmsz84AkfdaeVt9ODqUKuaZkShGFnI3ZN/p9wKh9 2hRcy5Xli9wCDdq3zbUiMQVTNM2/TrVJYmyZwEq61T6x7bSRYJqtKFri876Da9SR UI/L60WF/D8mw78m0HYlMMVvU6JtVh7z31onleCzVo9gh65AMakJRPXLMRRgBBTo 5Zyf4ydhn2cR0U8ppqNDl5/JU93YRviEHxFsezp36vycqJrkFA9HduVo+IZUAK/O B+ZYhWRrEU3aygd23mPGBtb5KmW0eg== =1USZ -----END PGP SIGNATURE----- --Sig_/D405Mat/UdkS.xjdaUH+mwk-- . Date: Tue, 9 Jul 2024 19:06:13 +1000 From: Stephen Rothwell To: Joerg Roedel Cc: Mark-PK Tsai , Will Deacon , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build warning after merge of the iommu tree Message-ID: <20240709190613.3fd8b7ea@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/5auU+RIQ0GygD0jvw/HXm9p"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271757 org.kernel.vger.linux-next:62131 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/5auU+RIQ0GygD0jvw/HXm9p Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the iommu tree, today's linux-next build (htmldocs) produced this warning: Documentation/userspace-api/index.rst:42: WARNING: toctree contains referen= ce to nonexisting document 'userspace-api/iommu' Introduced by commit d926e7c04843 ("docs: iommu: Remove outdated Documentation/userspace-api/i= ommu.rst") --=20 Cheers, Stephen Rothwell --Sig_/5auU+RIQ0GygD0jvw/HXm9p Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaM/YUACgkQAVBC80lX 0GwiOwf/ayee33mJAEPEAI7xIDR9vX/J4cteqJFZWm4XgSFfYuZFc+g04Tf3eHbT QgvV5FLr1CsRNhUapgaPKOgH8gwmvvM33YXWWvXQA4lwqjdD6iM+Wbv0QUUdcoWt X6IhO6GNQZEX5nNcwr0ip8S4JJs7qxstv/a4IPNS4BpwzQk5SeldlocPZiMdou0g +TFLCDMC3g0bBFSHuwuP3wjiagMyNijIbaeQCXJPScMb4CNWxjpRj/Z3hshf9cUa wm4OM9AK7CQoYVrnWxTVjiHEvoYBT7uffpExWHYBvBlDKMtSs6hOwMKo2UzFAOCb WO0VtoM5gDveI0GPSZVsFwIyy3Hj0w== =ZQTn -----END PGP SIGNATURE----- --Sig_/5auU+RIQ0GygD0jvw/HXm9p-- . Date: Tue, 9 Jul 2024 19:24:58 +1000 From: Stephen Rothwell To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Jul 9 Message-ID: <20240709192458.521ae796@canb.auug.org.au> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/ZUvFGGfEGWix86qdtNCRjzh"; protocol="application/pgp-signature"; micalg=pgp-sha256 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1271783 org.kernel.vger.linux-next:62133 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --Sig_/ZUvFGGfEGWix86qdtNCRjzh Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20240703: The mm-hotfixes tree lost its build failure. The mm tree gained a build failure for which I reverted a commit. The loongarch tree gained conflicts against the asm-generic and perf trees. The vfs-brauner tree gained a conflict against the asm-generic tree. The hid tree gained a conflict against the mm tree. The drm tree lost one of its build failures but I am still reverting a commit. The battery tree gained a conflict against the leds-lj tree. The devicetree tree gained a conflict against the kbuild tree. The driver-core tree gained a semantic conflict against the vl4-dvb-next tree. The tty tree gained a conflict against the tty.current tree. The scsi-mkp tree gained a conflict against Linus' tree. The vhost tree gained a conflict against the net-next tree. The random tree gained conflicts against the mm-stable tree. The rust tree gained a conflict against the block tree. The kspp tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 10864 11362 files changed, 819057 insertions(+), 207252 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 is also the merge.log file 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, s390, 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 378 trees (counting Linus' and 106 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 (4376e966ecb7 Merge tag 'perf-tools-fixes-for-v6.10-2= 024-07-08' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools) Merging fixes/fixes (2dde18cd1d8f Linux 6.5) Merging mm-hotfixes/mm-hotfixes-unstable (bd2e263b4fe4 filemap: replace pte= _offset_map() with pte_offset_map_nolock()) Applying: fixup for "mm: gup: stop abusing try_grab_folio" Merging vfs-brauner-fixes/vfs.fixes (0570730c1630 hfsplus: fix uninit-value= in copy_name) Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1) Merging fsverity-current/for-current (4cece7649650 Linux 6.9-rc1) Merging btrfs-fixes/next-fixes (f04a05bcdad5 Merge branch 'misc-6.10' into = next-fixes) Merging vfs-fixes/fixes (bba1f6758a9e lirc: rc_dev_get_from_fd(): fix file = leak) Merging erofs-fixes/fixes (9b32b063be10 erofs: ensure m_llen is reset to 0 = if metadata is invalid) Merging nfsd-fixes/nfsd-fixes (ac03629b1612 Revert "nfsd: fix oops when rea= ding pool_stats before server is started") Merging v9fs-fixes/fixes/next (1613e604df0c Linux 6.10-rc1) Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_v= erify_area()) Merging fs-current (0b175af8aace Merge branch 'fixes' of git://git.kernel.o= rg/pub/scm/linux/kernel/git/viro/vfs.git) Merging kbuild-current/fixes (22a40d14b572 Linux 6.10-rc6) Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6) Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the fo= lio is reserved for no-mapping addresses) Merging arm64-fixes/for-next/fixes (ecc54006f158 arm64: Clear the initial I= D map correctly before remapping) Merging arm-soc-fixes/arm/fixes (f3a6a54104b8 MAINTAINERS: Move myself from= SPRD Maintainer to Reviewer) Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1) Merging drivers-memory-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging sophgo-fixes/fixes (90f6cc7f8e07 riscv: dts: sophgo: disable write-= protection for milkv duo) Merging m68k-current/for-linus (ec8c8266373f m68k: defconfig: Update defcon= figs for v6.9-rc1) Merging powerpc-fixes/fixes (8b7f59de92ac selftests/powerpc: Fix build with= USERCFLAGS set) Merging s390-fixes/fixes (b3a58f3b90f5 s390/dasd: Fix invalid dereferencing= of indirect CCW data pointer) Merging net/main (83c36e7cfd74 docs: networking: devlink: capitalise length= value) Merging bpf/master (5f1d18de7918 selftests/bpf: Extend tcx tests to cover l= ate tcx_entry release) Merging ipsec/master (2d5317753e5f xfrm: Export symbol xfrm_dev_state_delet= e.) Merging netfilter/main (9f6958ba2e90 netfilter: nf_tables: unconditionally = flush pending work before notifier) Merging ipvs/main (9f6958ba2e90 netfilter: nf_tables: unconditionally flush= pending work before notifier) Merging wireless/for-next (4130c67cd123 wifi: iwlwifi: mvm: check vif for N= ULL/ERR_PTR before dereference) Merging wpan/master (b8ec0dc3845f net: mac802154: Fix racy device stats upd= ates by DEV_STATS_INC() and DEV_STATS_ADD()) Merging rdma-fixes/for-rc (f2661062f16b Linux 6.10-rc5) Merging sound-current/for-linus (6db03b1929e2 ALSA: hda/realtek: Limit mic = boost on VAIO PRO PX) Merging sound-asoc-fixes/for-linus (680e126ec040 firmware: cs_dsp: Use strn= len() on name fields in V1 wmfw files) Merging regmap-fixes/for-linus (76f19626bd35 regmap: add missing MODULE_DES= CRIPTION() macros) Merging regulator-fixes/for-linus (f2661062f16b Linux 6.10-rc5) Merging spi-fixes/for-linus (8221545c440b spi: omap2-mcspi: Revert multi mo= de support) Merging pci-current/for-linus (1613e604df0c Linux 6.10-rc1) Merging driver-core.current/driver-core-linus (6ba59ff42279 Linux 6.10-rc4) Merging tty.current/tty-linus (2ac33975abda serial: qcom-geni: do not kill = the machine on fifo underrun) Merging usb.current/usb-linus (6d3c721e686e usb: gadget: configfs: Prevent = OOB read/write in usb_string_copy()) Merging usb-serial-fixes/usb-linus (ae420771551b USB: serial: option: add R= olling RW350-GL variants) Merging phy/fixes (f2661062f16b Linux 6.10-rc5) Merging staging.current/staging-linus (22a40d14b572 Linux 6.10-rc6) Merging iio-fixes/fixes-togreg (1d7cfde11d49 staging: iio: frequency: ad983= 4: Validate frequency parameter value) Merging counter-current/counter-current (22a40d14b572 Linux 6.10-rc6) Merging char-misc.current/char-misc-linus (389637d4fb5f mei: vsc: Fix spell= ing error) Merging soundwire-fixes/fixes (f2661062f16b Linux 6.10-rc5) Merging thunderbolt-fixes/fixes (f2661062f16b Linux 6.10-rc5) Merging input-current/for-linus (7c7b1be19b22 Input: ads7846 - use spi_devi= ce_id table) Merging crypto-current/master (a5d8922ab2ae crypto: qat - fix linking error= s when PCI_IOV is disabled) Merging vfio-fixes/for-linus (d71a989cf5d9 vfio/pci: Insert full vma on mma= p'd MMIO fault) Merging kselftest-fixes/fixes (66cde337fa1b selftests/vDSO: remove duplicat= e compiler invocations from Makefile) Merging dmaengine-fixes/fixes (f2661062f16b Linux 6.10-rc5) Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) Merging mtd-fixes/mtd/fixes (b27d8946b5ed mtd: rawnand: rockchip: ensure NV= DDR timings are rejected) Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix miss= ing IRQ status registers range) Merging v4l-dvb-fixes/fixes (fd404435d44b media: ivsc: Depend on IPU_BRIDGE= or not IPU_BRIDGE) Merging reset-fixes/reset/fixes (ab35896730a5 reset: hisilicon: hi6220: add= missing MODULE_DESCRIPTION() macro) Merging mips-fixes/mips-fixes (0d5679a0aae2 mips: fix compat_sys_lseek sysc= all) Merging at91-fixes/at91-fixes (1613e604df0c Linux 6.10-rc1) Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang f= or am3 usb) Merging kvm-fixes/master (8ad209fc6448 Merge tag 'kvm-s390-master-6.10-1' o= f git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) Merging kvms390-fixes/master (4c6abb7f7b34 KVM: s390: fix LPSWEY handling) Merging hwmon-fixes/hwmon (6ba59ff42279 Linux 6.10-rc4) Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrec= t calculation of idt size) Merging cxl-fixes/fixes (a0f39d51dbf7 cxl: documentation: add missing files= to cxl driver-api) Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restr= icted pool list_head when SWIOTLB_DYNAMIC=3Dy) Merging drivers-x86-fixes/fixes (e527a6127223 platform/x86: toshiba_acpi: F= ix quickstart quirk handling) Merging samsung-krzk-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pinctrl-samsung-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging devicetree-fixes/dt/linus (2cf6b7d15a28 of/irq: Disable "interrupt-= map" parsing for PASEMI Nemo) Merging dt-krzk-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging scsi-fixes/fixes (7a6bbc2829d4 scsi: sd: Do not repeat the starting= disk message) Merging drm-fixes/drm-fixes (256abd8e550c Linux 6.10-rc7) Merging drm-intel-fixes/for-linux-next-fixes (f72383371e8c drm/i915/display= : For MTL+ platforms skip mg dp programming) Merging mmc-fixes/fixes (ab069ce12596 mmc: sdhci: Do not lock spinlock arou= nd mmc_gpio_get_ro()) Merging rtc-fixes/rtc-fixes (1613e604df0c Linux 6.10-rc1) Merging gnss-fixes/gnss-linus (6ba59ff42279 Linux 6.10-rc4) Merging hyperv-fixes/hyperv-fixes (3b85a2eacd3d Documentation: hyperv: Add = overview of Confidential Computing VM support) Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) Merging risc-v-fixes/fixes (c562ba719df5 riscv: kexec: Avoid deadlock in ke= xec crash path) Merging riscv-dt-fixes/riscv-dt-fixes (e21de658f8e8 MAINTAINERS: thead: upd= ate Maintainer) Merging riscv-soc-fixes/riscv-soc-fixes (1613e604df0c Linux 6.10-rc1) Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging spdx/spdx-linus (a3e18a540541 Merge tag 'xfs-6.10-fixes-3' of git:/= /git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging gpio-brgl-fixes/gpio/for-current (256abd8e550c Linux 6.10-rc7) Merging gpio-intel-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pinctrl-intel-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging auxdisplay-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging kunit-fixes/kunit-fixes (1613e604df0c Linux 6.10-rc1) Merging memblock-fixes/fixes (8043832e2a12 memblock: use numa_valid_node() = helper to check for invalid node ID) Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add= missing #interrupt-cells to DA9063 nodes) Merging perf-current/perf-tools (7b2450bb4027 perf dsos: When adding a dso = into sorted dsos maintain the sort order) Merging efi-fixes/urgent (46e27b9961d8 efi/arm64: Fix kmemleak false positi= ve in arm64_efi_rt_init()) Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bo= unds UBSAN warning) Merging battery-fixes/fixes (d3911f1639e6 power: supply: rt5033: Bring back= i2c_set_clientdata) Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) Merging iommufd-fixes/for-rc (dd5a440a31fa Linux 6.9-rc7) Merging rust-fixes/rust-fixes (a126eca84435 rust: avoid unused import warni= ng in `rusttest`) Merging w1-fixes/fixes (1613e604df0c Linux 6.10-rc1) Merging pmdomain-fixes/fixes (c3f38fa61af7 Linux 6.10-rc2) Merging i2c-host-fixes/i2c/i2c-host-fixes (256abd8e550c Linux 6.10-rc7) Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) Merging clk-fixes/clk-fixes (10f84de27bd0 Merge tag 'qcom-clk-fixes-for-6.1= 0' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into clk-f= ixes) Merging pwrseq-fixes/pwrseq/for-current (83a7eefedc9b Linux 6.10-rc3) Merging drm-misc-fixes/for-linux-next-fixes (91f9f4a37124 drm/bridge: adv75= 11: Fix Intermittent EDID failures) Merging mm-stable/mm-stable (44195d1eba82 docs: mm: add enable_soft_offline= sysctl) Merging mm-nonmm-stable/mm-nonmm-stable (0f3819e8c483 nilfs2: avoid undefin= ed behavior in nilfs_cnt32_ge macro) Merging mm/mm-everything (df73b40cb739 foo) CONFLICT (content): Merge conflict in mm/gup.c Merging kbuild/for-next (cd843d58ee1d kbuild: deb-pkg: use default string w= hen variable is unset or null) Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v= 6.7-rc4's `for_each` macro list) Merging perf/perf-tools-next (608c3b1e612a perf install: Don't propagate su= bdir to Documentation submake) Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attr= ibutes: counted_by: fixup clang URL) Merging dma-mapping/for-next (82d71b53d7e7 Documentation/core-api: correct = reference to SWIOTLB_DYNAMIC) Merging asm-generic/master (f564176f4e4f riscv: convert to generic syscall = table) Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging arm/for-next (b5e352609497 Merge branches 'clkdev', 'fixes' and 'mi= sc' into for-next) Merging arm64/for-next/core (8b288f7785c6 Merge branch 'for-next/misc' into= for-next/core) Merging arm-perf/for-next/perf (dc4c33f753ca perf: arm_pmuv3: Add support f= or Armv9.4 PMU instruction counter) Merging arm-soc/for-next (bf40ba18e3a4 soc: document merges) Merging amlogic/for-next (338c92a5d195 Merge branch 'v6.11/arm64-dt' into f= or-next) Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) Merging aspeed/for-next (73feb9cd46f1 ARM: dts: aspeed: System1: Updates to= BMC board) Merging at91/at91-next (1cdb1c9626a4 Merge branch 'at91-defconfig' into at9= 1-next) Merging broadcom/next (4caff16b6e00 Merge branch 'devicetree-arm64/next' in= to next) Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1) Merging drivers-memory/for-next (815cc7715ab1 dt-bindings: memory: fsl: rep= lace maintainer) Merging imx-mxs/for-next (ffa7b132ee5f Merge branch 'imx/defconfig' into fo= r-next) Merging mediatek/for-next (1613e604df0c Linux 6.10-rc1) Merging mvebu/for-next (ffd0d7df6bdb Merge branch 'mvebu/dt64' into mvebu/f= or-next) Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10= ' into for-next) Merging qcom/for-next (6fd4da15c334 Merge branches 'arm32-for-6.11', 'arm64= -defconfig-fixes-for-6.10', 'arm64-defconfig-for-6.11', 'arm64-fixes-for-6.= 10', 'arm64-for-6.11', 'clk-fixes-for-6.10', 'clk-for-6.11', 'drivers-fixes= -for-6.10' and 'drivers-for-6.11' into for-next) Merging renesas/next (5c91aa40e630 Merge branches 'renesas-arm-defconfig-fo= r-v6.11' and 'renesas-dts-for-v6.11' into renesas-next) Merging reset/reset/next (c1267e1afae6 arm64: dts: renesas: rz-smarc: Repla= ce fixed regulator for USB VBUS) Merging rockchip/for-next (d02701b77967 Merge branch 'v6.11-armsoc/dts64' i= nto for-next) Merging samsung-krzk/for-next (b305fd6840d1 Merge branch 'next/dt64' into f= or-next) Merging scmi/for-linux-next (eaaeef9e62f9 Merge tags 'scmi-updates-6.11', '= ffa-updates-6.11', 'vexpress-updates-6.11' and 'juno-updates-6.11' of ssh:/= /gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-l= inux-next) Merging sophgo/for-next (1613e604df0c Linux 6.10-rc1) Merging stm32/stm32-next (1eafc48af859 arm64: stm32: enable scmi regulator = for stm32) 1245911be805 ("ARM: multi_v7_defconfig: Add MCP23S08 pinctrl support") 2599b1f071f4 ("ARM: dts: stm32: Document output pins for PWMs on stm32mp1= 35f-dk") 32bc9d195039 ("ARM: dts: stm32: Add ethernet support for DH STM32MP13xx D= HCOR DHSBC board") 3389697affa5 ("arm64: dts: st: add HPDMA nodes on stm32mp251") 55dc557485c7 ("arm64: dts: st: add ethernet1 and ethernet2 support on stm= 32mp25") 5d6c1cef82a0 ("arm64: dts: st: describe power supplies for stm32mp257f-ev= 1 board") 9bcaeb10520a ("ARM: dts: stm32: add ethernet1 for STM32MP135F-DK board") a11b40677a34 ("regulator: Add STM32MP25 regulator bindings") a29ad03d8393 ("arm64: dts: st: add scmi regulators on stm32mp25") a43179fe3f09 ("arm64: dts: st: add eth2 pinctrl entries in stm32mp25-pinc= trl.dtsi") a4a0254811cc ("ARM: dts: stm32: omit unused pinctrl groups from stm32mp13= dtb files") a80ce2d743fb ("ARM: dts: stm32: add ethernet1 and ethernet2 support on st= m32mp13") ba3e48a76df3 ("ARM: dts: stm32: OP-TEE async notif interrupt for ST STM32= MP15x boards") c62c13b4efe4 ("ARM: dts: stm32: add ethernet1/2 RMII pins for STM32MP13F-= DK board") d41b45f29bc3 ("ARM: dts: stm32: order stm32mp13-pinctrl nodes") de2997982cf9 ("arm64: dts: st: enable Ethernet2 on stm32mp257f-ev1 board") Merging sunxi/sunxi/for-next (0682fbf17dd9 Merge branches 'sunxi/clk-fixes-= for-6.10', 'sunxi/drivers-for-6.11' and 'sunxi/dt-for-6.11' into sunxi/for-= next) Merging tee/next (cd88a296582c Merge branch 'optee_notif_wait_timeout_for_v= 6.11' into next) Merging tegra/for-next (5211d93c551f Merge branch for-6.11/arm64/defconfig = into for-next) Merging ti/ti-next (b6332e83c241 Merge branch 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (41aa58501753 Merge branch 'zynqmp/soc' into for-ne= xt) Merging clk/clk-next (0e3575a61335 Merge branch 'clk-mediatek' into clk-nex= t) Merging clk-imx/for-next (466da3d2d967 clk: imx: composite-7ulp: Use NULL i= nstead of 0) Merging clk-renesas/renesas-clk (c7e58843d1e4 clk: renesas: r9a08g045: Add = clock, reset and power domain support for I2C) Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.= kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging loongarch/loongarch-next (58202cc8341a Merge branch 'loongarch-kvm'= into loongarch-next) CONFLICT (content): Merge conflict in arch/loongarch/include/uapi/asm/unist= d.h CONFLICT (content): Merge conflict in tools/perf/arch/loongarch/util/Build Merging m68k/for-next (75d3891ca19e m68k: defconfig: Update defconfigs for = v6.10-rc1) Merging m68knommu/for-next (256abd8e550c Linux 6.10-rc7) Merging microblaze/next (1613e604df0c Linux 6.10-rc1) Merging mips/mips-next (6fe920b4fc18 MAINTAINERS: Mobileye: add OLB drivers= and dt-bindings) Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_= regs) Merging parisc-hd/for-next (2fd4e52e442c parisc: Use max() to calculate par= isc_tlb_flush_threshold) Merging powerpc/next (45547a0a93d8 powerpc/configs: Update defconfig with n= ow user-visible CONFIG_FSL_IFC) CONFLICT (content): Merge conflict in arch/powerpc/mm/nohash/Makefile Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a wr= ite-only variable) Merging risc-v/for-next (60a6707f582e Merge patch series "riscv: Memory Hot= (Un)Plug support") CONFLICT (content): Merge conflict in arch/riscv/kernel/patch.c Merging riscv-dt/riscv-dt-for-next (2904244a8c46 riscv: dts: starfive: add = PCIe dts configuration for JH7110) Merging riscv-soc/riscv-soc-for-next (c813ef3c5f6c MAINTAINERS: drop riscv = list from cache controllers) Merging s390/for-next (313a6dadfa35 Merge branch 'features' into for-next) Merging sh/for-next (1613e604df0c Linux 6.10-rc1) Merging sparc/for-next (1c9e709cde80 sparc/leon: Remove on-stack cpumask va= r) Merging uml/next (98ff534ec2cd um: vector: always reset vp->opened) Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush= _dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros) Merging bcachefs/for-next (d6d793ae5589 bcachefs: Simplify btree key cache = fill path) CONFLICT (content): Merge conflict in fs/bcachefs/super.c [fs-next 58ec8d3c6da9] Merge branch 'for-next' of https://evilpiepirate.org= /git/bcachefs.git Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git:/= /git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging fscrypt/for-next (256abd8e550c Linux 6.10-rc7) Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), includi= ng server address) Merging btrfs/for-next (871a1174fd0c Merge branch 'for-next-next-v6.10-2024= 0704' into for-next-20240704) Merging ceph/master (93a2221c9c1a doc: ceph: update userspace command to ge= t CephFS metadata) Merging cifs/for-next (256abd8e550c Linux 6.10-rc7) Merging configfs/for-next (4425c1d9b44d configfs: improve item creation per= formance) Merging dlm/next (89b01913dc73 dlm: add rcu_barrier before destroy kmem cac= he) Merging erofs/dev (2080ca1ed3e4 erofs: tidy up `struct z_erofs_bvec`) Merging exfat/dev (0daa52fbc7ac exfat: fix potential deadlock on __exfat_ge= t_dentry_set) Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8) Merging ext3/for_next (85f22bb5d2c2 Merge UDF consistency fixes.) Merging ext4/dev (8262fe9a902c ext4: make ext4_da_map_blocks() buffer_head = unaware) Merging f2fs/dev (388a2a0640e1 f2fs: remove redundant sanity check in sanit= y_check_inode()) Merging fsverity/for-next (256abd8e550c Linux 6.10-rc7) Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support) Merging gfs2/for-next (5a1906a476bc gfs2: Revert "check for no eligible quo= ta changes") Merging jfs/jfs-next (d0fa70aca54c jfs: don't walk off the end of ealist) Merging ksmbd/ksmbd-for-next (e2e33caa5dc2 ksmbd: discard write access to t= he directory open) Merging nfs/linux-next (22a40d14b572 Linux 6.10-rc6) Merging nfs-anna/linux-next (b571cfcb9dca nfs: don't reuse partially comple= ted requests in nfs_lock_and_join_requests) Merging nfsd/nfsd-next (a3123341dc35 gss_krb5: Fix the error handling path = for crypto_sync_skcipher_setkey) Merging ntfs3/master (bde63e8eae5d fs/ntfs3: Fix formatting, change comment= s, renaming) Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid ac= cess) Merging overlayfs/overlayfs-next (004b8d1491b4 ovl: fix encoding fid for lo= wer only root) Merging ubifs/next (af9a8730ddb6 jffs2: Fix potential illegal address acces= s in jffs2_free_inode) Merging v9fs/9p-next (2211561723a6 9p: Enable multipage folios) Merging v9fs-ericvh/ericvh/for-next (1613e604df0c Linux 6.10-rc1) Merging xfs/for-next (49cdc4e834e4 xfs: get rid of xfs_ag_resv_rmapbt_alloc) Merging zonefs/for-next (df2f9708ff1f zonefs: enable support for large foli= os) Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_w= rite_iter()) Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counte= rs for online fsck) Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-= mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6= -mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging vfs-brauner/vfs.all (5f30e082ab8b Merge branch 'vfs.iomap' into vfs= .all Signed-off-by: Christian Brauner ) CONFLICT (content): Merge conflict in fs/btrfs/inode.c [fs-next 2528528feafc] Merge branch 'vfs.all' of git://git.kernel.org/pub/s= cm/linux/kernel/git/vfs/vfs.git Merging vfs/for-next (a38297e3fb01 Linux 6.9) Merging fs-next (2528528feafc Merge branch 'vfs.all' of git://git.kernel.or= g/pub/scm/linux/kernel/git/vfs/vfs.git) CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h CONFLICT (content): Merge conflict in fs/nfs/internal.h Merging printk/for-next (07c2ab22a8da Merge branch 'for-6.11' into for-next) Merging pci/next (cc7fe8c237ed Merge branch 'controller/tegra194' into next) CONFLICT (content): Merge conflict in drivers/pci/pci.c Merging pstore/for-next/pstore (9b3c13c9ea4e pstore: platform: add missing = MODULE_DESCRIPTION() macro) Merging hid/for-next (3959f155ad59 Merge branch 'for-6.11/bpf' into for-nex= t) CONFLICT (content): Merge conflict in include/linux/hid_bpf.h Merging i2c/i2c/for-next (35dc6101fd9c Merge branch 'i2c/for-current' into = i2c/for-next) Merging i2c-host/i2c/i2c-host (fd6acb0d21b8 i2c: mt7621: Add Airoha EN7581 = i2c support) Merging i3c/i3c/next (145ca7b61e95 i3c: dw: Add optional apb clock) Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for = number of populated and total memory slots) Merging hwmon-staging/hwmon-next (4814241a5817 hwmon: (amc6821) Add support= for pwm1_mode attribute) Merging jc_docs/docs-next (60ca3e59cfc4 Merge branch 'docs-mw' into docs-ne= xt) Merging v4l-dvb/master (156922faabce media: atomisp: Switch to new Intel CP= U model defines) Merging v4l-dvb-next/master (5d5f67b3b23f media: atomisp: Fix spelling mist= akes in sh_css_sp.c) Merging pm/linux-next (bdf722ad7d75 Merge branch 'thermal-fixes' into linux= -next) Merging cpufreq-arm/cpufreq/arm/linux-next (0f5a2b9e1722 cpufreq: mediatek:= Use dev_err_probe in every error path in probe) Merging cpupower/cpupower (3a5bb5066f4c cpupower: fix lib default installat= ion path) Merging devfreq/devfreq-next (1d143dde7679 PM / devfreq: exynos: Use Use de= vm_clk_get_enabled() helpers) Merging pmdomain/next (cc647e931a24 pmdomain: amlogic: add missing MODULE_D= ESCRIPTION() macros) Merging opp/opp/linux-next (e3943f00afdb OPP: Introduce an OF helper functi= on to inform if required-opps is used) Merging thermal/thermal/linux-next (7eeb114a635a dt-bindings: thermal: conv= ert hisilicon-thermal.txt to dt-schema) Merging rdma/for-next (af48f95492dc RDMA/core: Introduce "name_assign_type"= for an IB device) Merging net-next/main (e0ee68a8bef9 selftests: net: ksft: interrupt cleanly= on KeyboardInterrupt) Merging bpf-next/for-next (90dc946059b7 selftests/bpf: DENYLIST.aarch64: Re= move fexit_sleep) CONFLICT (content): Merge conflict in arch/riscv/net/bpf_jit_comp64.c Applying: HID: bpf: Fix up build Merging ipsec-next/master (f531d13bdfe3 xfrm: support sending NAT keepalive= s in ESP in UDP states) Merging mlx5-next/mlx5-next (b339e0a39dc3 RDMA/mlx5: Add Qcounters req_tran= sport_retries_exceeded/req_rnr_retries_exceeded) Merging netfilter-next/main (ac26327635d6 Merge branch 'fixes-for-stm32-dwm= ac-driver-fails-to-probe') Merging ipvs-next/main (ac26327635d6 Merge branch 'fixes-for-stm32-dwmac-dr= iver-fails-to-probe') Merging bluetooth/master (41473738be53 Bluetooth: btintel: Add support for = Whale Peak2) CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c Merging wireless-next/for-next (b3603133d3b7 wifi: mac80211_hwsim: fix warn= ing) Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://gi= t.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git:= //git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging mtd/mtd/next (2538af030d6f mtd: cmdlinepart: Replace `dbg()` macro = with `pr_debug()`) Merging nand/nand/next (5f713030117a mtd: rawnand: lpx32xx: Fix dma_request= _chan() error checks) Merging spi-nor/spi-nor/next (d35df77707bf mtd: spi-nor: winbond: fix w25q1= 28 regression) Merging crypto/master (8323c036789b crypto: starfive - Fix nent assignment = in rsa dec) Merging drm/drm-next (62a05f4ae9c1 Merge tag 'drm-msm-next-2024-07-04' of h= ttps://gitlab.freedesktop.org/drm/msm into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_migrate.c Applying: Revert "drm/omap: Allow build with COMPILE_TEST=3Dy" Merging drm-exynos/for-linux-next (221009347844 drm/exynos/vidi: convert to= struct drm_edid) Merging drm-misc/for-linux-next (cb31c58e8c29 drm/fbdev-dma: Fix framebuffe= r mode for big endian devices) Merging amdgpu/drm-next (ee98fb71baa8 drm/amdgpu: set CP_HQD_PQ_DOORBELL_CO= NTROL.DOORBELL_MODE to 1) Merging drm-intel/for-linux-next (9fc97277eb2d drm/i915: Skip programming F= IA link enable bits for MTL+) Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit = integer overflow) Merging drm-msm/msm-next (fe34394ecdad dt-bindings: display/msm: dsi-contro= ller-main: Add SM7150) Merging drm-msm-lumag/msm-next-lumag (399af57ccca2 dt-bindings: display/msm= /gpu: fix the schema being not applied) Merging drm-xe/drm-xe-next (caaf1f44a6a2 drm/xe: Drop trace_xe_hw_fence_fre= e) Merging etnaviv/etnaviv/next (704d3d60fec4 drm/etnaviv: don't block schedul= er when GPU is still active) Merging fbdev/for-next (7ee6cfe6d9cf fbdev: omap2: Return clk_prepare_enabl= e to transfer the error) Merging regmap/for-next (3dc4236dc44d Merge remote-tracking branch 'regmap/= for-6.11' into regmap-next) Merging sound/for-next (fefbbdfb59d3 ALSA: seq: Add tempo base unit for MID= I2 Set Tempo messages) Merging ieee1394/for-next (9f349e8e532d Revert "firewire: ohci: use common = macro to interpret be32 data in le32 buffer") Merging sound-asoc/for-next (e0665761fd01 Merge remote-tracking branch 'aso= c/for-6.11' into asoc-next) Merging modules/modules-next (61842868de13 module: create weak dependecies) Merging input/next (5e91cef94426 Input: himax_hx83112b - add support for HX= 83100A) CONFLICT (content): Merge conflict in include/linux/interrupt.h Merging block/for-next (7f8851d381f7 Merge branch 'for-6.11/block' into for= -next) CONFLICT (content): Merge conflict in fs/stat.c CONFLICT (content): Merge conflict in include/linux/fs.h Merging device-mapper/for-next (b67a93868e50 dm-crypt: support for per-sect= or NVMe metadata) Merging libata/for-next (f97106b10d9a ata: ahci: Add debug print for extern= al port) Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIP= TION() macros) Merging mmc/next (c17aecf85800 mmc: dw_mmc-bluefield: Add support for eMMC = HW reset) Merging mfd/for-mfd-next (75c3d85083ff dt-bindings: mfd: syscon: Add APM po= weroff mailbox) Merging backlight/for-backlight-next (b337cc3ce475 backlight: lm3509_bl: Fi= x early returns in for_each_child_of_node()) Merging battery/for-next (be6299c6e55e power: supply: sysfs: use power_supp= ly_property_is_writeable()) CONFLICT (content): Merge conflict in include/linux/leds.h Merging regulator/for-next (ef0b29e74496 regulator: dt-bindings: pca9450: M= ake interrupt optional) Merging security/next (aa99fe0d3b77 Automated merge of 'dev' into 'next') Merging apparmor/apparmor-next (3dd384108d53 apparmor: fix possible NULL po= inter dereference) Merging integrity/next-integrity (fbf06cee6087 ima: fix wrong zero-assignme= nt during securityfs dentry remove) Merging selinux/next (e123134b39dc selinux: Use 1UL for EBITMAP_BIT to matc= h maps type) Merging smack/next (e86cac0acdb1 smack: unix sockets: fix accept()ed socket= label) Merging tomoyo/master (b96342141183 rtnetlink: print rtnl_mutex holder/wait= er for debug purpose) Merging tpmdd/next (bb3bd6a6663c tpm_tis_spi: add missing attpm20p SPI devi= ce ID entry) Merging watchdog/master (22a40d14b572 Linux 6.10-rc6) Merging iommu/next (87b2e7792b68 Merge branches 'iommu/core', 'iommu/fwspec= -ops-removal', 'iommu/pci/ats', 'iommu/iommufd/attach-handles', 'iommu/iomm= ufd/paging-domain-alloc', 'iommu/allwinner/sun50i', 'iommu/amd/amd-vi', 'io= mmu/arm/smmu', 'iommu/intel/vt-d' and 'iommu/qualcomm/msm' into iommu/next) 40929e8e5449 ("dt-bindings: PCI: generic: Add ats-supported property") Merging audit/next (1613e604df0c Linux 6.10-rc1) Merging devicetree/for-next (011e6a719ead dt-bindings: soc: fsl: Add fsl,ls= 1028a-reset for reset syscon node) 0620bce64afa ("dt-bindings: riscv: cpus: add ref to interrupt-controller") 877097a2fab0 ("dt-bindings: interrupt-controller: convert marvell,mpic bi= nding to YAML") c7ce06684bf5 ("dt-bindings: interrupt-controller: riscv,cpu-intc: convert= to dtschema") CONFLICT (content): Merge conflict in scripts/Makefile.lib Merging dt-krzk/for-next (828f810f69f3 Merge branch 'next/dt64' into for-ne= xt) Merging mailbox/for-next (256abd8e550c Linux 6.10-rc7) Merging spi/for-next (ad02097d49dd Merge remote-tracking branch 'spi/for-6.= 11' into spi-next) Merging tip/master (aa9d8caba6e4 Merge timers/core into tip/master) CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h CONFLICT (content): Merge conflict in include/linux/cacheinfo.h Merging clockevents/timers/drivers/next (008addaf6139 clocksource/drivers/m= ips-gic-timer: Correct sched_clock width) Merging edac/edac-for-next (9a1c5fe0f0a8 Merge ras/edac-misc into for-next) Merging ftrace/for-next (5dfebf3c26dc Merge ring-buffer/for-next) CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h Merging rcu/next (02219caa92b5 Merge branches 'doc.2024.06.06a', 'fixes.202= 4.07.04a', 'mb.2024.06.28a', 'nocb.2024.06.03a', 'rcu-tasks.2024.06.06a', '= rcutorture.2024.06.06a' and 'srcu.2024.06.18a' into HEAD) Merging paulmck/non-rcu/next (8122d6e11bd8 Merge branches 'cmpxchg.2024.07.= 04a', 'kcsan.2024.06.06a', 'lkmm.2024.06.06a', 'nolibc.2024.06.30a' and 'to= rture.2024.05.30b' into HEAD) Merging kvm/next (02b0d3b9d4dd Merge branch 'kvm-6.10-fixes' into HEAD) CONFLICT (content): Merge conflict in arch/x86/include/asm/sev-common.h Merging kvm-arm/next (4012664073a0 Merge branch kvm-arm64/misc into kvmarm/= next) Merging kvms390/next (7816e58967d0 kvm: s390: Reject memory region operatio= ns for ucontrol VMs) Merging kvm-ppc/topic/ppc-kvm (ca8dad041516 KVM: PPC: add missing MODULE_DE= SCRIPTION() macros) Merging kvm-riscv/riscv_kvm_next (e325618349cd RISC-V: KVM: Redirect AMO lo= ad/store access fault traps to guest) CONFLICT (content): Merge conflict in tools/perf/arch/riscv/util/Build Merging kvm-x86/next (771df9ffadb8 Merge branch 'static_calls') Merging xen-tip/linux-next (611ff1b1ae98 xen: privcmd: Fix possible access = to a freed kirqfd instance) Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for= -next) Merging workqueues/for-next (fb7e4b92f44e Merge branch 'for-6.11' into for-= next) Merging sched-ext/for-next (6fbd643318a1 sched_ext/scx_qmap: Add an example= usage of DSQ iterator) Merging drivers-x86/for-next (4bf1ea3fc914 platform/x86: asus-wmi: support = the disable camera LED on F10 of Zenbook 2023) Merging chrome-platform/for-next (4baf1cc54433 power: supply: cros_charge-c= ontrol: Fix signedness bug in charge_behaviour_store()) CONFLICT (content): Merge conflict in MAINTAINERS Merging chrome-platform-firmware/for-firmware-next (fc2c1d716d4a firmware: = google: add missing MODULE_DESCRIPTION() macros) Merging hsi/for-next (f02cfe695047 HSI: ssi_protocol: Remove unused linux/g= pio.h) Merging leds-lj/for-leds-next (940b27161afc Revert "leds: led-core: Fix ref= count leak in of_led_get()") Merging ipmi/for-next (19a01155ddfe ipmi: Drop explicit initialization of s= truct i2c_device_id::driver_data to 0) Merging driver-core/driver-core-next (997197b58bf6 devres: Correct code sty= le for functions that return a pointer type) 573a39d05053 ("drm/mediatek: Convert to platform remove callback returnin= g void") CONFLICT (content): Merge conflict in drivers/fsi/fsi-occ.c CONFLICT (content): Merge conflict in drivers/reset/reset-meson-audio-arb.c Applying: net: ethernet: rtsn: Fix up for remove() coversion to return void Applying: drm: Fix up STM LVDS driver for void remove() conversion Applying: fix up for "platform: Make platform_driver::remove() return void" Merging usb/usb-next (179264157bba usb: dwc3: core: Check all ports when se= t phy suspend) Merging thunderbolt/next (49056c95df44 thunderbolt: debugfs: Use FIELD_GET(= )) Merging usb-serial/usb-next (df8c0b8a03e8 USB: serial: garmin_gps: use stru= ct_size() to allocate pkt) Merging tty/tty-next (17199dfccd4b Documentation: kernel-parameters: Add DE= VNAME:0.0 format for serial ports) CONFLICT (content): Merge conflict in drivers/tty/serial/imx.c Merging char-misc/char-misc-next (1ebab783647a Merge tag 'mhi-for-v6.11' of= ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc= -next) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/ven= dor-prefixes.yaml CONFLICT (content): Merge conflict in MAINTAINERS Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-20= 24-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) Merging coresight/next (2e5657aa5966 hwtracing: use for_each_endpoint_of_no= de()) Merging fastrpc/for-next (1613e604df0c Linux 6.10-rc1) Merging fpga/for-next (3a0fa8e97d30 fpga: altera-fpga2sdram: remove unused = struct 'prop_map') Merging icc/icc-next (226e58b20975 Merge branch 'icc-rpmh-qos' into icc-nex= t) Merging iio/togreg (1ebab783647a Merge tag 'mhi-for-v6.11' of ssh://gitolit= e.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-next) Merging phy-next/next (2a011c3c12e8 phy: airoha: Add dtime and Rx AEQ IO re= gisters) CONFLICT (content): Merge conflict in include/linux/soc/samsung/exynos-regs= -pmu.h Merging soundwire/next (518aee32c551 drivers:soundwire: qcom: cleanup port = maask calculations) Merging extcon/extcon-next (e508f2606c0b extcon: Add LC824206XA microUSB sw= itch driver) Merging gnss/gnss-next (6ba59ff42279 Linux 6.10-rc4) Merging vfio/next (abe8103da3c5 vfio/pci: Fix typo in macro to declare acce= ssors) Merging w1/for-next (26bf5fc86033 w1: Drop allocation error message) Merging spmi/spmi-next (1613e604df0c Linux 6.10-rc1) Merging staging/staging-next (d3401cefd0f7 staging: nvec: Use x instead of = x !=3D NULL to improve readability.) Merging counter-next/counter-next (7b47e79eac4c Merge tag 'ib-mfd-counter-v= 5.11' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/lee/mfd into co= unter-next) Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using dev= m_siox_* functions) Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) Merging dmaengine/next (316d1225b112 dmaengine: fsl-dpaa2-qdma: add missing= MODULE_DESCRIPTION() macro) Merging cgroup/for-next (ecd36a3ae7ff Merge branch 'for-6.11' into for-next) Merging scsi/for-next (dbe36d249533 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (6cd48c8f62ad Merge patch series "mpi3mr: Support= PCI Error Recovery") CONFLICT (content): Merge conflict in drivers/scsi/mpi3mr/mpi3mr_transport.c Merging vhost/linux-next (fd115d1b9140 net: virtio: unify code to init stat= s) CONFLICT (content): Merge conflict in drivers/net/virtio_net.c Merging rpmsg/for-next (d87dbfd31796 Merge branches 'hwspinlock-next', 'rpm= sg-next' and 'rproc-next' into for-next) Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) Merging gpio-brgl/gpio/for-next (8060be2489f9 dt-bindings: gpio: vf610: All= ow gpio-line-names to be set) Merging gpio-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl/for-next (11eaac6e8e72 Merge tag 'renesas-pinctrl-for-v6.11= -tag3' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drive= rs into devel) Merging pinctrl-intel/for-next (1613e604df0c Linux 6.10-rc1) Merging pinctrl-renesas/renesas-pinctrl (2453e858e945 pinctrl: renesas: rzg= 2l: Support output enable on RZ/G2L) Merging pinctrl-samsung/for-next (707807f4c112 pinctrl: samsung: Use scope = based of_node_put() cleanups) Merging pwm/pwm/for-next (120a528213b6 pwm: Allow pwm state transitions fro= m an invalid state) Merging ktest/for-next (07283c1873a4 ktest: force $buildonly =3D 1 for 'mak= e_warnings_file' test type) Merging kselftest/next (483d0785e8bf selftests/timers: remove unused irqcou= nt variable) Merging kunit/test (1613e604df0c Linux 6.10-rc1) Merging kunit-next/kunit (67c9971cd6d3 kunit/usercopy: Add missing MODULE_D= ESCRIPTION()) Merging livepatching/for-next (9871e6af43db Merge branch 'for-6.11/sysfs-pa= tch-replace' into for-next) Merging rtc/rtc-next (a47d377e22c4 rtc: Drop explicit initialization of str= uct i2c_device_id::driver_data to 0) Merging nvdimm/libnvdimm-for-next (b0d478e34dbf testing: nvdimm: Add MODULE= _DESCRIPTION() macros) Merging at24/at24/for-next (3a9ba4e32230 dt-bindings: eeprom: at24: Add com= patible for ONSemi N24S64B) Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) Merging seccomp/for-next/seccomp (f0c508faea64 selftests/seccomp: check tha= t a zombie leader doesn't affect others) Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) Merging slimbus/for-next (1613e604df0c Linux 6.10-rc1) Merging nvmem/for-next (1613e604df0c Linux 6.10-rc1) Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic()= doc) Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to= seed guest random number generator) Merging auxdisplay/for-next (2ccfe94bc3ac auxdisplay: ht16k33: Drop referen= ce after LED registration) Merging kgdb/kgdb/for-next (9bccbe7b2087 kdb: Get rid of redundant kdb_curr= _task()) Merging hmm/hmm (6613476e225e Linux 6.8-rc1) Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1) Merging mhi/mhi-next (65bc58c3dcad net: wwan: mhi: make default data link i= d configurable) Merging memblock/for-next (9364a7e40d54 memblock tests: fix implicit declar= ation of function 'numa_valid_node') CONFLICT (content): Merge conflict in mm/memblock.c Merging cxl/next (86588139b843 Documentation: CXL Maturity Map) Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) Merging efi/next (ebf5a79acf9a x86/efistub: Drop redundant clearing of BSS) Merging unicode/for-next (68318904a775 unicode: add MODULE_DESCRIPTION() ma= cros) Merging slab/slab/for-next (fe4e761669ab Merge branch 'slab/for-6.11/bucket= s' into slab/for-next) Merging random/master (594a5586f022 selftests/vDSO: add tests for vgetrando= m) 14cd1a877fc6 ("selftests/vDSO: fix clang build errors and warnings") 7bb79ef48b9d ("selftests/vDSO: remove partially duplicated "all:" target = in Makefile") 868680ffba11 ("selftests/vDSO: remove duplicate compiler invocations from= Makefile") CONFLICT (content): Merge conflict in mm/rmap.c CONFLICT (content): Merge conflict in tools/testing/selftests/mm/Makefile CONFLICT (content): Merge conflict in tools/testing/selftests/vDSO/Makefile Merging landlock/next (395a02d04ed4 landlock: Use bit-fields for storing ha= ndled layer access masks) Merging rust/rust-next (fc6e66f4696b rust: add abstraction for `struct page= `) CONFLICT (content): Merge conflict in rust/bindings/bindings_helper.h Merging sysctl/sysctl-next (acc154691fc7 sysctl: Warn on an empty procname = element) Merging execve/for-next/execve (2a97388a807b ELF: fix kernel.randomize_va_s= pace double read) Merging bitmap/bitmap-for-next (e0eeb938adb0 bitops: Add a comment explaini= ng the double underscore macros) CONFLICT (content): Merge conflict in include/linux/cpumask.h Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCR= IPTION() macro) Merging kspp/for-next/kspp (70570167588d Merge branch 'for-next/hardening' = into for-next/kspp) CONFLICT (content): Merge conflict in kernel/kallsyms.c Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) Merging nolibc/nolibc (1613e604df0c Linux 6.10-rc1) Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation su= pport using TSM_REPORTS) Merging iommufd/for-next (53e6b65693b6 iommufd/iova_bitmap: Remove iterator= logic) Merging turbostat/next (eff04be3f4aa tools/power turbostat: Extend --add op= tion with perf counters) Merging pwrseq/pwrseq/for-next (50b040ef3732 PCI/pwrctl: only call of_platf= orm_populate() if CONFIG_OF is enabled) CONFLICT (add/add): Merge conflict in drivers/power/sequencing/core.c Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing b= uild for PREEMPT_RT) Applying: Revert "mul_u64_u64_div_u64: make it precise always" Applying: Revert "mul_u64_u64_div_u64: basic sanity test" --Sig_/ZUvFGGfEGWix86qdtNCRjzh Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmaNAeoACgkQAVBC80lX 0Gz5/AgAgleYcuY9o7Mz7lxBIba76PK4jRc+gkXVMmH35NvGqNBPgTZKT/ZxxvDX 565UNDgDIbXbU72ZOXp14HtKT8qfJzxu+Be8GG9pUUFeDcnQeTJfI2IikO08GXHl U0E7I3Uwjs3zOXWvD3VK0OnzgaTSvbc4j9/vlmI9GZwft46QqL3Vdio5+wSjBz/4 KHK8RJx79jNFCmXOW2vOzuSsqtf/uCNfDls+QPaQcEIq5FvUyxAtQqdLMfW7Vd7Y EOtQPgjZ7SxCxG4E3LrsoHN8mmlgJCvbuUMOUUjfWl4z0kPLn87AVq7xJ+2kFzgx p9WqmFNTfTUqdbcRCD9HKdaK3oRN/Q== =exiU -----END PGP SIGNATURE----- --Sig_/ZUvFGGfEGWix86qdtNCRjzh-- .