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.
--
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
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
/* fields enclosed in headers_start/headers_end are copied
* using a single memcpy() in __copy_skb_header()
Attachment:
pgpGyy0STR_RP.pgp
Description: OpenPGP digital signature
