Messages in this thread | | | Date | Tue, 10 Aug 2010 13:22:48 +0200 (CEST) | From | Jiri Kosina <> | Subject | Re: linux-next: manual merge of the trivial tree with Linus' tree |
| |
On Tue, 10 Aug 2010, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in > arch/arm/mach-omap1/board-nokia770.c between commit > ab6f7751905e5cf713d081dbb3b97b8f6909ab34 ("Removing dead OMAP_DSP") from > Linus' tree and commit 426d31071ac476ea62c62656b242930c17b58c00 ("fix > printk typo 'faild'") from the trivial tree. > > The former removes the code that the latter is updating. So I just > removed it.
Hi Stephen,
I have now merged Linus' master into for-next branch, so this conflict should now be gone.
-- Jiri Kosina SUSE Labs, Novell Inc.
| |