From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: manual merge of the net-next tree with the net tree
Date: Wed, 13 Feb 2019 11:13:25 +1100
Message-ID: <20190213111325.30cfc931@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/e1bzDPTGv3EFI.geS+VAeWk"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
To: David Miller <davem@davemloft.net>, Networking <netdev@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Cong Wang <xiyou.wangcong@gmail.com>, Vlad Buslov <vladbu@mellanox.com>
List-Id: linux-next.vger.kernel.org

--Sig_/e1bzDPTGv3EFI.geS+VAeWk
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  net/sched/cls_tcindex.c

between commits:

  8015d93ebd27 ("net_sched: fix a race condition in tcindex_destroy()")
  033b228e7f26 ("net_sched: fix a memory leak in cls_tcindex")

from the net tree and commit:

  12db03b65c2b ("net: sched: extend proto ops to support unlocked classifie=
rs")

from the net-next tree.

I fixed it up (see the final resolution when linux-next is published)
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

diff --cc net/sched/cls_tcindex.c
index 38bb882bb958,14d6b4058045..000000000000
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c

--Sig_/e1bzDPTGv3EFI.geS+VAeWk
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlxjYSUACgkQAVBC80lX
0Gxv2Af9G8F2PMhER1FlSc/JpRwDJWHm6gFCJcBxPG0aKhIlr8vHXRGOjpMo/fTc
I7zlzIMMWdQtHnrylJrMOmEMYwhslPQ5FvqFIEWJQiYxDAhlbVmFCC8BJz1wCKXe
n1X49pjYE8/QnuqpINMrzh2RlNmPJ87qLESfdRHusBuVI5xGSS90ZeFkAvWM714m
Pi7QkC2NDd9HtIPLyATwQ1K5Nc0pVLwIKmJ5KDcfoC2/nGlwDYHUKy50W8QfaTRP
1kUWDLYGLoC3Amo33aHS8ptCVqQYFBIf0I8hJlvP+K+tX29Rq3xmRsxJ1S6+b335
TY1Vjgi36ADBzxVkMqqG81czxYMpZg==
=VSfd
-----END PGP SIGNATURE-----

--Sig_/e1bzDPTGv3EFI.geS+VAeWk--