Messages in this thread | | | From | Andy Lutomirski <> | Date | Tue, 20 Jan 2015 21:48:36 -0800 | Subject | Re: Fwd: linux-next: manual merge of the luto-misc tree with the tip tree |
| |
On Tue, Jan 20, 2015 at 9:34 PM, Ingo Molnar <mingo@kernel.org> wrote: > > * Andy Lutomirski <luto@amacapital.net> wrote: > >> Hi Ingo and Thomas- >> >> There's a trivial conflict in the pull request I sent last week. > > This is your x86 entry code rework pull request, right? The -tip > tree now has the RCU commit it depends on, so could you please > rebase it on top of tip:core/rcu so I can pull it? I'll resolve > any remaining conflicts with the rest of -tip. >
Sure, I can do that in the morning. The pull request merges cleanly with tip:core/rcu, though, so is the rebase needed?
--Andy
| |