Re: linux-next: manual merge of the staging tree with the trivialtree

[Jiri Kosina]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/