netdev - How to make a change in both net and net-next

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <3476832.1595978507@warthog.procyon.org.uk>
Date:   Wed, 29 Jul 2020 00:21:47 +0100
From:   David Howells <dhowells@...hat.com>
To:     David Miller <davem@...emloft.net>
cc:     dhowells@...hat.com, netdev@...r.kernel.org
Subject: How to make a change in both net and net-next

Hi Dave,

In the fix I just posted, subject:

	[PATCH net] rxrpc: Fix race between recvmsg and sendmsg on immediate
		call failure

there's a change I need to make as part of the patch:

	-	spin_lock_bh(&conn->params.peer->lock);
	-	hlist_del_rcu(&call->error_link);
	-	spin_unlock_bh(&conn->params.peer->lock);
	+	if (!hlist_unhashed(&call->error_link)) {
	+		spin_lock_bh(&call->peer->lock);
	+		hlist_del_rcu(&call->error_link);
	+		spin_unlock_bh(&call->peer->lock);
	+	}

but I also make the same change as part of a set of patches I want to post for
net-next.

Should I just rebase the net-next patches on top of the one I sent you once
you've picked it into net, or is there a better way?

Thanks,
David