Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Date:   Thu, 19 Oct 2023 16:36:07 +0100
From:   Mark Brown <broonie@kernel.org>
To:     Shuah Khan <skhan@linuxfoundation.org>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Shuah Khan <shuah@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Tiezhu Yang <yangtiezhu@loongson.cn>
Subject: Re: linux-next: manual merge of the kselftest tree with the
 mm-hotfixes tree
Message-ID: <038eb23d-f74f-43c6-91e8-762e6bbc7282@sirena.org.uk>
References: <20231019163310.6c24d6ac@canb.auug.org.au>
 <1ee483d6-3311-42b1-a3e0-3b6073913a21@linuxfoundation.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="DTFmdvUpl3i2yoH6"
Content-Disposition: inline
In-Reply-To: <1ee483d6-3311-42b1-a3e0-3b6073913a21@linuxfoundation.org>
Precedence: bulk


--DTFmdvUpl3i2yoH6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Thu, Oct 19, 2023 at 08:49:24AM -0600, Shuah Khan wrote:
> On 10/18/23 23:33, Stephen Rothwell wrote:

> > I fixed it up (I used this files form the latter commit) 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.

That'll drop the fix that Tiezhu did which is a good one.

> I can rebase linux-kselftest next to pick up the following once it goes
> into Linus's tree.

I've got the rebase/rework locally (I did it as a new commit which isn't
ideal but it's such a complete conflict that it felt like the best
option).  Assuming nothing blows up in my local CI I should send it out
later today.

--DTFmdvUpl3i2yoH6
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmUxTOcACgkQJNaLcl1U
h9Bv1gf9Hc4eaSUYZmGh/lRCxEFa56zuauD0fPTqXWL4iz6cl7ptwPxQsrMpxHWV
dCzIXI9UesyWf7YSmHZ5VNDmX2f60ZHOwR4qJhddg6oraq9KZYr1MP1CrQ6bl87K
mlUz4/zzFTVEHK4zNGQBeKHUkhjAtuzbmB+VfEtlApKD/6v+RidTDcQZ/OPC17/P
tkivM1YNh4xXHzmZuA5n1vu/ICI1t0sKs76E1gL8FIf8yHlYXrzS/lstED6rmdGY
PwxYsDlbjscwJUGYieeM+yPFKtPVZtg9gO9d6KRU9IKH8m51Xw/lXvC1fEAhqTfr
odo+u0ickOuSriXPTgBd/uiuFFkYqg==
=mN4r
-----END PGP SIGNATURE-----

--DTFmdvUpl3i2yoH6--