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:   Mon, 21 Nov 2022 13:46:17 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>
Cc:     Dylan Yudaken <dylany@meta.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Pavel Begunkov <asml.silence@gmail.com>
Subject: linux-next: manual merge of the block tree with Linus' tree
Message-ID: <20221121134617.7eec695a@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/E.iXFjAAJdD=BrK6+8bq1p8";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/E.iXFjAAJdD=BrK6+8bq1p8
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:

  io_uring/net.c

between commit:

  91482864768a ("io_uring: fix multishot accept request leaks")

from Linus' tree and commits:

  01661287389d ("io_uring: revert "io_uring fix multishot accept ordering"")
  6488182c989a ("io_uring: remove allow_overflow parameter")

from the block tree.

I fixed it up (I just used the latter version where they conflicted) 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_/E.iXFjAAJdD=BrK6+8bq1p8
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmN65nkACgkQAVBC80lX
0GyxMAgAibdOYxXZKnenSwTJHrD18Ub1J2unLr+UXETHKz1w8j0oMz085+j9GQYc
Xzoa+gDSH9IqBseH8ULgmywFICKJWMBBMT2pVbyTEszV+/Ib/zM+z6shB9oLAf9A
47Jzs0rWsKbISmQESCKe4tjZ6XCkeLwcCrRkG4x2jGXYkTAVmY6ZHVaSBMLNkjdq
JMTJf0L7xtB3V/AWu4akhdyJWUTgWWl2cli5axo/FPI4CfoI4MN3MEUNn9RADNEF
aB8MggQwpeAzmFpCu/QFwWRY3iF1SIWct+gEQuDJCscSrXAeSacpNj2SqQINabJJ
XgdWlbnwPqu2/2EZ8wk/+5jWOn/Khg==
=vYU1
-----END PGP SIGNATURE-----

--Sig_/E.iXFjAAJdD=BrK6+8bq1p8--