Messages in this thread | | | Date | Fri, 19 Nov 2010 17:08:28 +0100 (CET) | From | Jiri Kosina <> | Subject | Re: linux-next: manual merge of the trivial tree with the tree |
| |
On Tue, 9 Nov 2010, Stephen Rothwell wrote:
> Hi Jiri, > > Today's linux-next merge of the trivial tree got a conflict in > arch/blackfin/mach-bf538/include/mach/defBF539.h, > arch/blackfin/mach-bf518/include/mach/defBF51x_base.h and > arch/blackfin/mach-bf527/include/mach/defBF52x_base.h between various > commits from the blackfin tree and commit > b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk > typos") from the trivial tree. > > I just used the versions from the blackfin tree for now since they moved > large amounts of code around and deleted the latter 2 files.
I have reverted those hunks in my tree, so it should be conflict-less now.
Thanks,
-- Jiri Kosina SUSE Labs, Novell Inc.
| |