On Thu, 12 Mar 2009, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in
> init/Kconfig between commit b943c460ff8556a193b28e2145b513f8b978e869
> ("menu: fix embedded menu snafu") from Linus' tree and commit
> 2622b54dff6e30d114828648e96777739b764063 ("trivial: fix typos/grammar
> errors in Kconfig texts") from the trivial tree.
Hi,
the trivial tree is now based on current Linus' tree (ebdcc81c). Strangely
enough, I didn't encounter any conflict while doing rebase ...
--
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
