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:   Fri, 7 Jul 2023 08:54:37 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     Alexander Gordeev <agordeev@linux.ibm.com>,
        Baoquan He <bhe@redhat.com>,
        Heiko Carstens <hca@linux.ibm.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the mm tree with Linus' tree
Message-ID: <20230707085437.28b9c898@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/+GEyw.9=lYEkzKGe0NC2k5C";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/+GEyw.9=lYEkzKGe0NC2k5C
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/s390/kernel/perf_cpum_sf.c

between commits:

  51f513fd9659 ("s390/mm: do not include <asm-generic/io.h> directly")
  b378a9826143 ("s390: include linux/io.h instead of asm/io.h")

from Linus' tree and commit:

  c594d5c4b630 ("s390: mm: convert to GENERIC_IOREMAP")

from the mm tree.

I fixed it up (I just used the former) 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_/+GEyw.9=lYEkzKGe0NC2k5C
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmSnRi0ACgkQAVBC80lX
0Gwkfgf/Xzx6RQJmmWhT6irqKihn90+5/M8OlUp0zAORkeu7XfIcZmonLgbVwCcs
s0T/bNUGwcruWxmMtpbc2YbCKH+EDBLKy28Mwyav6H3e8ae0rfnYrlmLV0gDDBQk
IKQ+dK57LXI56Cg4pidhhNlplTAdx0vBh8EYPNBfYFEma9wQHwrByJxR+t+YOHCu
RsOmpEwH7gCsqteSHDRTiA/YPMQuVxkV4SEJbUittGqqZQh8ZwHmPXC0IBrug/Lu
3OPZe8a9AmlnoxZVQs3Pjdiz4xnQbZ9uTQDARWCz7IrsOy4mQ0lfzrj1eQ7Iit5L
jlZzQS3Xo4y07EfVeULoB/P61itowA==
=eJGl
-----END PGP SIGNATURE-----

--Sig_/+GEyw.9=lYEkzKGe0NC2k5C--