Hi all,

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

  include/net/strparser.h

between commit:

  0984ebc631792 ("strparser: make sure __strp_recv isn't running before tearing down the parser")

from the net tree and commit:

  02fd0a2111374 ("net: strparser: removed the aborted bit and aborts counter")

from the net-next tree.

I fixed it up (see below) 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.

diff --cc include/net/strparser.h
index 881b7ae344986,3c9c8ca088282..0000000000000
--- a/include/net/strparser.h
+++ b/include/net/strparser.h
@@@ -91,11 -87,10 +87,10 @@@ static inline struct strp_msg *strp_msg
  struct strparser {
  	struct sock *sk;
  
 -	u32 stopped : 1;
 -	u32 paused : 1;
 -	u32 interrupted : 1;
 -	u32 unrecov_intr : 1;
 +	u8 stopped;
 +	u8 paused;
- 	u8 aborted;
 +	u8 interrupted;
 +	u8 unrecov_intr;
  
  	struct sk_buff **skb_nextp;
  	struct sk_buff *skb_head;