Messages in this thread | | | Date | Wed, 19 Jul 2017 08:07:02 +0200 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the staging.current tree |
| |
On Wed, Jul 19, 2017 at 01:07:28PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got conflicts in: > > drivers/staging/Kconfig > drivers/staging/Makefile > > between commit: > > dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging") > > from the staging.current tree and commit: > > 874bcba65f9a ("staging: pi433: New driver") > > from the staging tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts.
Yeah, I know this is going to happen, I'll be fixing it up when staging-linus gets into Linus's tree.
thanks,
greg k-h
| |