Re: Fwd: linux-next: manual merge of the luto-misc tree with the tip tree

From: Ingo Molnar
Date: Wed Jan 21 2015 - 00:34:19 EST



* Andy Lutomirski <luto@xxxxxxxxxxxxxx> 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.

Thanks,

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