Received-SPF: pass (google.com: domain of linux-kernel+bounces-7651-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Thu, 21 Dec 2023 10:52:38 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>, Andrew Morton
 <akpm@linux-foundation.org>
Cc: David Howells <dhowells@redhat.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, "Matthew Wilcox (Oracle)"
 <willy@infradead.org>
Subject: linux-next: manual merge of the vfs-brauner tree with the mm-stable
 tree
Message-ID: <20231221105238.4d16892a@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/UQvRs_nl0/Vvnj2w2aH_dAD";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/UQvRs_nl0/Vvnj2w2aH_dAD
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  fs/afs/write.c

between commits:

  8525d5984b7b ("afs: do not test the return value of folio_start_writeback=
()")
  af7628d6ec19 ("fs: convert error_remove_page to error_remove_folio")

from the mm-stable tree and commit:

  874ff39da314 ("afs: Use the netfs write helpers")

from the vfs-brauner tree.

I fixed it up (the latter removed the code modified by 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_/UQvRs_nl0/Vvnj2w2aH_dAD
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWDfkYACgkQAVBC80lX
0Gwxngf9Houx3yuHoZXUI8LLchJdw971OE64uunJGARtuR1GLHU2Y6KmUHWvYV23
wVAjQ+SvU/rYqFmkKDoZM23GFRUhp5nXQjOsUvJ4043xek7pqHSF8aC0GCL08BP0
2yljE68SA7yuqypzDg6wMOfZbTqOfI/GAtCQ/wlzeZIOIj9J+uI1nHcueEH/44rg
nAAVUMaElXCEWQwkfn27GEeRX3lL7o4TVntcp93LJc3ljghc4C5N1IgOTiKWY0Yw
F7yZcEegPuuWqedZfmd/pdmKDf/BZ2iagRHKDVyU/TpNzSbis+cGpv/NaUKEPNr3
kdQrwmHPYW320fTfGc+f8C0ke26jPw==
=p6fs
-----END PGP SIGNATURE-----

--Sig_/UQvRs_nl0/Vvnj2w2aH_dAD--