Messages in this thread | | | Date | Wed, 20 Jul 2011 12:01:27 +0200 (CEST) | From | Jiri Kosina <> | Subject | Re: 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
| |