From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the net-next tree with the net tree Date: Tue, 17 Jul 2018 12:33:06 +1000 Message-ID: <20180717123306.3e030fde@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/R2RZjPx4TyHgkOtDzbO5d0i"; protocol="application/pgp-signature" Return-path: Sender: linux-kernel-owner@vger.kernel.org To: David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Stefano Brivio , Boris Pismenny List-Id: linux-next.vger.kernel.org --Sig_/R2RZjPx4TyHgkOtDzbO5d0i 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: include/linux/skbuff.h between commit: 8b7008620b84 ("net: Don't copy pfmemalloc flag in __copy_skb_header()") from the net tree and commit: 784abe24c903 ("net: Add decrypted field to skb") from the net-next tree. I fixed it up (see below - maybe not the best resolution) 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 include/linux/skbuff.h index 610a201126ee,3ceb8dcc54da..000000000000 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@@ -630,7 -630,7 +630,8 @@@ typedef unsigned char *sk_buff_data_t * @hash: the packet hash * @queue_mapping: Queue mapping for multiqueue devices * @xmit_more: More SKBs are pending for this queue + * @pfmemalloc: skbuff was allocated from PFMEMALLOC reserves + * @decrypted: Decrypted SKB * @ndisc_nodetype: router type (from link layer) * @ooo_okay: allow the mapping of a socket to a queue to be changed * @l4_hash: indicate hash is a canonical 4-tuple hash over transport @@@ -736,7 -737,11 +738,11 @@@ struct sk_buff=20 peeked:1, head_frag:1, xmit_more:1, + pfmemalloc:1; + #ifdef CONFIG_TLS_DEVICE - decrypted:1; -#else - __unused:1; ++ __u8 decrypted:1, ++ __unused:7; + #endif =20 /* fields enclosed in headers_start/headers_end are copied * using a single memcpy() in __copy_skb_header() --Sig_/R2RZjPx4TyHgkOtDzbO5d0i Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAltNVWIACgkQAVBC80lX 0GxJDAf7BW5N4RmxlnCIm57PBOKM4axQk+io2wG99dwG3gUaGmUPaS0yV+Jwl6KY yT4Y5wJAiFXliGifiy/p4HvfLujqpfrl8GWHuTfejrT3/GKxLg4XDg5W/3+m77n6 gE8/lZeDk+PShNNGVhVuT8bb9VdaaAlHzA1ukiHNBe1Gbb2pW3C/ZqFLWIztz7BV LIM0iglWaz+8Fcg/WxVwm9Ie3pP4DIs+jhK5IG1GBARVd1zR5h9LhPqHm/iJQN1r 49GdluWKOV2om1wM87EpU/eknmGcuzgF3lNm1F906vqtLYwZXRH/Igbxi3QdGt4T CSu2MMtpio7y6UHa6QmeU4nlT+x5Mg== =gDxA -----END PGP SIGNATURE----- --Sig_/R2RZjPx4TyHgkOtDzbO5d0i--