Received-SPF: pass (google.com: domain of linux-kernel+bounces-203537-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Thu, 6 Jun 2024 12:30:34 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mike Rapoport <rppt@kernel.org>, Andrew Morton
 <akpm@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, Wei Yang
 <richard.weiyang@gmail.com>
Subject: linux-next: manual merge of the memblock tree with the mm tree
Message-ID: <20240606123034.052151bc@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/cY2i+t1tYMpeDTJzaft4Ge8";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/cY2i+t1tYMpeDTJzaft4Ge8
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  mm/mm_init.c

between commits:

  dcd8c5e5603d ("mm/mm_init.c: use deferred_init_mem_pfn_range_in_zone() to=
 decide loop condition")
  c6586af1f388 ("mm/mm_init.c: not always search next deferred_init_pfn fro=
m very beginning")

from the mm-unstable branch of the mm tree and commit:

  731b11684819 ("mm/mm_init.c: use deferred_init_mem_pfn_range_in_zone() to=
 decide loop condition")

from the memblock tree.

I fixed it up (I used the former version) 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_/cY2i+t1tYMpeDTJzaft4Ge8
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZhH0oACgkQAVBC80lX
0GzCYQf/Vz77QCdiaGyyZDdcQsYlPXYDa3E/+UrceRxhiuy6FT7Kq+xqXbd56OBx
pWK0iqbqQi7S3n3Sigyt7Ok0eEqVwDncHVe70+qX65SNX6wqRD0WUHUnx5d5pwRu
SQ+0WeuRAR16pBvlMZUHDl7C71riZwPNKCob3Fm/8GU52mR/m+VvMj9m1hgNtkKu
4dyd4wSx4EPhcWiDz6tRi13Na+CH2tBQ+vWk5aTXjIfXJJkwcbLp7q7nDe8Wdg3P
9xDijejlublDnPN0VeiaZn2fLcRvRm6zaDZMGstSmZw/TjOqP1ZBwlGyH2pCWkPd
CZwA+P0byiF8lDdCK/kMqpBWklv1Vw==
=XZKB
-----END PGP SIGNATURE-----

--Sig_/cY2i+t1tYMpeDTJzaft4Ge8--