On Tue, Jul 02, 2024 at 02:15:55PM +1000, Stephen Rothwell wrote: > 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. Thanks, LGTM. -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette