linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steffen Klassert <steffen.klassert@secunet.com>,
	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>,
	Kirill Tkhai <ktkhai@virtuozzo.com>,
	Sabrina Dubroca <sd@queasysnail.net>
Subject: linux-next: manual merge of the ipsec-next tree with the net-next tree
Date: Mon, 16 Dec 2019 10:38:37 +1100	[thread overview]
Message-ID: <20191216103837.6b5d856b@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1357 bytes --]

Hi all,

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

  net/unix/af_unix.c

between commit:

  3c32da19a858 ("unix: Show number of pending scm files of receive queue in fdinfo")

from the net-next tree and commit:

  b50b0580d27b ("net: add queue argument to __skb_wait_for_more_packets and __skb_{,try_}recv_datagram")

from the ipsec-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.

-- 
Cheers,
Stephen Rothwell

diff --cc net/unix/af_unix.c
index 6756a3ccc392,a7f707fc4cac..000000000000
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@@ -2100,8 -2058,8 +2100,8 @@@ static int unix_dgram_recvmsg(struct so
  		mutex_lock(&u->iolock);
  
  		skip = sk_peek_offset(sk, flags);
- 		skb = __skb_try_recv_datagram(sk, flags, scm_stat_del,
- 					      &skip, &err, &last);
+ 		skb = __skb_try_recv_datagram(sk, &sk->sk_receive_queue, flags,
 -					      NULL, &skip, &err, &last);
++					      scm_stat_del, &skip, &err, &last);
  		if (skb)
  			break;
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2019-12-15 23:38 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-15 23:38 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-05-19  3:27 Stephen Rothwell
2018-04-30  0:35 Stephen Rothwell
2017-02-12 23:25 Stephen Rothwell
2014-01-09  2:41 Stephen Rothwell
2013-09-24  2:16 Stephen Rothwell
2013-09-24 10:25 ` Steffen Klassert
2013-09-24 23:59   ` Stephen Rothwell
2013-09-25  5:29     ` Steffen Klassert
2013-09-27  2:01       ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191216103837.6b5d856b@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=davem@davemloft.net \
    --cc=ktkhai@virtuozzo.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=sd@queasysnail.net \
    --cc=steffen.klassert@secunet.com \
    --subject='Re: linux-next: manual merge of the ipsec-next tree with the net-next tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).