Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 23 Aug 2023 14:52:58 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Shuah Khan <shuah@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Andre Przywara <andre.przywara@arm.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Shuah Khan <skhan@linuxfoundation.org>
Subject: linux-next: manual merge of the kselftest tree with the mm-hotfixes
 tree
Message-ID: <20230823145258.6fb2b8d8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/55h4r/lSXpA1HGfWzqvna+L";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/55h4r/lSXpA1HGfWzqvna+L
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the kselftest tree got a conflict in:

  tools/testing/selftests/cachestat/test_cachestat.c

between commits:

  fbf31ed6e0f4 ("selftests: cachestat: test for cachestat availability")
  8d55633e168b ("selftests: cachestat: catch failing fsync test on tmpfs")

from the mm-hotfixes tree and commit:

  13eb52f6293d ("selftests: cachestat: test for cachestat availability")

from the kselftest tree.

I fixed it up (I just used the former version of the conflicting bits)
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_/55h4r/lSXpA1HGfWzqvna+L
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTlkKoACgkQAVBC80lX
0GxZzwgAgtv0nteYhBoB1Hc+BEYfznW9x40Eef7yyOwDm7EKopeN9gvS3Z6mQVHx
G2eSKgVClmxALXtRxJEIS6NEEuKXMlCkKtTr9QnOR01kGh7lc5BOEhgGML7m/nuc
xm0l9auTogb5FKKwzkToO8ie2WjgqX3dRWgq8W5hEjLWIoT3CygQx6PEImxNFbLX
bB0bpj7xTWvzxj22GUoENqDiQdS9qH3L1bQVTirL3zXg3L46GoOq42zGYO8Tl6sE
myKhQyoJuvHUYEaLUJ41W8wNcnfhOnvxz4mkd1FeGJFUe6YHf2Ubc0KB5VaLR9x5
wR8kPizitzpw2hypIJxyHEgpvn57ww==
=8P/9
-----END PGP SIGNATURE-----

--Sig_/55h4r/lSXpA1HGfWzqvna+L--