lkml.org 
[lkml]   [2011]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the staging tree with the trivial tree
On Sun, 17 Jul 2011, Greg KH wrote:

> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/staging/generic_serial/ser_a2232.c between commit 28f65c11f2ff
> > ("treewide: Convert uses of struct resource to resource_size(ptr)") from
> > the trivial tree and commit bb2a97e9ccd5 ("Staging: delete generic_serial
> > drivers") from the staging tree.
> >
> > The latter removes the file, so I did that.
>
> Thank you, that is the correct fix :)

I have dropped the conflicting hunks now (and the same for the other
trivial/staging conflict).

Thanks,

--
Jiri Kosina
SUSE Labs


\
 
 \ /
  Last update: 2011-07-20 12:03    [W:0.064 / U:0.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site