lkml.org 
[lkml]   [2011]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the trivial tree with the s390 tree
On Tue, 21 Jun 2011, Stephen Rothwell wrote:

> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/s390/kvm/sie64a.S between commit 57e98c34511e ("[S390] move sie code
> to entry.S") from the s390 tree and commit e44ba033c565 ("treewide:
> remove duplicate includes") from the trivial tree.
>
> The former merged this file into another file, so I just removed this file.

Thanks for reporting, I have dropped the hunk.

--
Jiri Kosina
SUSE Labs


\
 
 \ /
  Last update: 2011-06-24 13:59    [W:0.041 / U:0.548 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site