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:   Thu, 8 Dec 2022 08:23:01 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc:     Juergen Gross <jgross@suse.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Yang Yingliang <yangyingliang@huawei.com>
Subject: linux-next: manual merge of the net tree with Linus' tree
Message-ID: <20221208082301.5f7483e8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/BBoFWBm3G8D.uuP4C6PiDj_";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/BBoFWBm3G8D.uuP4C6PiDj_
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/net/xen-netback/rx.c

between commit:

  74e7e1efdad4 ("xen/netback: don't call kfree_skb() with interrupts disabl=
ed")

from Linus' tree and commit:

  9e6246518592 ("xen/netback: don't call kfree_skb() under spin_lock_irqsav=
e()")

from the net tree.

I fixed it up (I just used the version from Linus' tree) 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_/BBoFWBm3G8D.uuP4C6PiDj_
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmORBDUACgkQAVBC80lX
0Gw0awf+Ljq8FCkkBHKNr/Ow1PMqCcSfW6hDzj1DTusJr8dJ/bfwl+465fFNK47G
XETYph0oA/coKmc3gpfQ3uU+HclRU3qDZklLLZwcw/MrBQ86m9z8VxwrcDhhZ/+O
0Ckr6D3AinEbqRCd0gJ05Q/jWkdRjNORGrPrwo6uvDPi8JfbPANAQBHWpLO0hLyI
a6lVtl7Y/7NeLeBgLLPz6j42Z7+9L0sh5ccagPmPLtrc+UIHSwYHu5CN5H656DFP
JcEVovbfr8KsSAYit3npE2KD1BgmxuMoW3fCWGtfEJwWErWCNRZnJFWMp1ryHV/B
du+cSCTFqqmCNIfLI1QiKfopjh+onQ==
=uxy7
-----END PGP SIGNATURE-----

--Sig_/BBoFWBm3G8D.uuP4C6PiDj_--