linux-kernel - Re: [PATCH tip/core/rcu 04/15] rcu: Permit RCU_NONIDLE() to be used from interrupt context

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-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 12 Sep 2012 10:13:30 -0400
From:	Steven Rostedt <rostedt@...dmis.org>
To:	paulmck@...ux.vnet.ibm.com
Cc:	Josh Triplett <josh@...htriplett.org>,
	linux-kernel@...r.kernel.org, mingo@...e.hu, laijs@...fujitsu.com,
	dipankar@...ibm.com, akpm@...ux-foundation.org,
	mathieu.desnoyers@...ymtl.ca, niv@...ibm.com, tglx@...utronix.de,
	peterz@...radead.org, Valdis.Kletnieks@...edu, dhowells@...hat.com,
	eric.dumazet@...il.com, darren@...art.com, fweisbec@...il.com,
	sbw@....edu, patches@...aro.org,
	"Paul E. McKenney" <paul.mckenney@...aro.org>
Subject: Re: [PATCH tip/core/rcu 04/15] rcu: Permit RCU_NONIDLE() to be used
 from interrupt context

On Tue, 2012-09-11 at 18:07 -0700, Paul E. McKenney wrote:
>  
> > Paul, you just push your changes through tip, right? Then we can just
> > let Ingo know. I could even make the patch a separate branch, that Ingo
> > can pull into the RCU branch too.
> 
> Yep!  But we also need to worry about -next and -fengguang.
> 
> How about if you push your change into 3.7 and I push mine into 3.8?

Bah, this is what Linus said not to do. Although he's more about not
having this happen in a single merge window, but this isn't the "git
way".

There should be no problem in pushing the patch based off of Linus's
tree and have it be pulled into two branches. This is what Linus said he
wanted. The change will go in via one of the branches, whichever is
pulled first. And as the change will have the same SHA1 in both
branches, git will merge it nicely. This is what Linus said at kernel
summit that he wants people to do.

Note, this will also get into -next and -fengguang's tree as well,
without issue.

-- Steve

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/