linux-next: manual merge of the trivial tree with Linus' tree
in [Kernel]
|
Prev: linux-next: manual merge of the trivial tree with the vfs tree
Next: sh: remove RELOC_HIDE on exception handlers and syscall routines
From: Stephen Rothwell on 9 Aug 2010 22:20 Hi Jiri, 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. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Jiri Kosina on 10 Aug 2010 07:30
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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |