Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	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>,
	Qian Cai <cai@lca.pw>, Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <jakub.kicinski@netronome.com>
Subject: linux-next: manual merge of the tip tree with the net tree
Date: Fri, 11 Oct 2019 11:52:12 +1100
Message-ID: <20191011115212.42c99d3d@canb.auug.org.au> (raw)

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

Hi all,

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

  net/core/sock.c

between commit:

  8265792bf887 ("net: silence KCSAN warnings around sk_add_backlog() calls")

from the net tree and commit:

  5facae4f3549 ("locking/lockdep: Remove unused @nested argument from lock_release()")

from the tip 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/core/sock.c
index 54c06559ad8f,50b930364cb0..000000000000
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@@ -521,8 -521,8 +521,8 @@@ int __sk_receive_skb(struct sock *sk, s
  
  		rc = sk_backlog_rcv(sk, skb);
  
- 		mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
+ 		mutex_release(&sk->sk_lock.dep_map, _RET_IP_);
 -	} else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
 +	} else if (sk_add_backlog(sk, skb, READ_ONCE(sk->sk_rcvbuf))) {
  		bh_unlock_sock(sk);
  		atomic_inc(&sk->sk_drops);
  		goto discard_and_relse;

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

             reply index

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-11  0:52 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-09-13  2:37 Stephen Rothwell
2010-06-21  6:16 Stephen Rothwell
2010-06-21 17:30 ` Paul E. McKenney
2010-06-21 23:42   ` Stephen Rothwell
2009-08-07  6:47 Stephen Rothwell
2009-08-13  0:33 ` David Miller
2009-08-13  4:04   ` Stephen Rothwell

Reply instructions:

You may reply publically 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=20191011115212.42c99d3d@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=cai@lca.pw \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=hpa@zytor.com \
    --cc=jakub.kicinski@netronome.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=netdev@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    /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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org linux-next@archiver.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/ public-inbox