Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 9 Aug 2021 14:29:09 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Hao Xu <haoxu@linux.alibaba.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 block tree with Linus' tree
Message-ID: <20210809142909.1d5fab20@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/KIEW3llqG=OJyd2dUqLGnUW";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  fs/io-wq.c

between commit:

  21698274da5b ("io-wq: fix lack of acct->nr_workers < acct->max_workers ju=
dgement")

from Linus' tree and commit:

  e16aa0c614c6 ("io-wq: remove GFP_ATOMIC allocation off schedule out path")

from the block tree.

I fixed it up (I just used the latter version, but more may be needed?) 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_/KIEW3llqG=OJyd2dUqLGnUW
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmEQrxUACgkQAVBC80lX
0GyVngf+JaunBYc+g+eedHe1Gl8MavVh6SlLSYUYi7K0Hc7OWQWiWVT629MpN0+z
wbONyHFF/ttbjgnf4rYhKt/OTJwCvGb9RkEECUv9nphPzSPtFseMZZSGYOF8dOXb
PMbUj1o/CPjKufamBWpi9WoIURk0FwU3+GJoch9bzUUAmKX9Ow4v7aVZOiQmbPgL
0N4WJLo7+h/8TLjfq1ULTcYSO/p+FfBGtWoN8AVNZDJIp/pMmTfa2zOlgSk75NRC
Bej+lE3lWJdtD3qcUoU5XFbn7fckBgf/keQjMqwP49l8z/rKBj0rnYiDPaHfhzo9
kQ9S9U05wRrBkhne5UUTytRRMaUsAA==
=Ynxb
-----END PGP SIGNATURE-----

--Sig_/KIEW3llqG=OJyd2dUqLGnUW--