[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20210408131958.0779430e@canb.auug.org.au>
Date: Thu, 8 Apr 2021 13:19:58 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Miller <davem@...emloft.net>,
Networking <netdev@...r.kernel.org>
Cc: Hoang Huu Le <hoang.h.le@...tech.com.au>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>,
Xin Long <lucien.xin@...il.com>
Subject: linux-next: manual merge of the net-next tree with the net tree
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/tipc/crypto.c
between commit:
2a2403ca3add ("tipc: increment the tmp aead refcnt before attaching it")
from the net tree and commit:
97bc84bbd4de ("tipc: clean up warnings detected by sparse")
from the net-next tree.
I fixed it up (I used the former version) 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.
--
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists