[lkml]   [2010]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: 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.


Jiri Kosina
SUSE Labs, Novell Inc.

 \ /
  Last update: 2010-11-19 17:11    [W:0.024 / U:8.104 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site