Messages in this thread | | | Date | Fri, 27 Jul 2018 10:36:19 +0200 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the powerpc tree |
| |
On Fri, Jul 27, 2018 at 05:59:11PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the staging tree got a conflict in: > > MAINTAINERS > > between commit: > > d69ccc00c497 ("MAINTAINERS: Remove the entry for the orphaned ams driver") > > from the powerpc tree and commit: > > 28d1a7ac2a0d ("iio: dac: Add AD5758 support") > > 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.
Looks good to me, thanks!
greg k-h
| |