On Fri, Feb 14, 2020 at 10:55:19AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the staging tree got a conflict in: > > MAINTAINERS > > between commit: > > 95ba79e89c10 ("MAINTAINERS: remove unnecessary ':' characters") > > from the char-misc.current tree and commit: > > caa6772db4c1 ("Staging: remove wusbcore and UWB from the kernel tree.") > > 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc MAINTAINERS > index a9a93de6223c,9a4c715d1e50..000000000000 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@@ -17118,12 -17089,7 +17113,7 @@@ S: Maintaine > F: drivers/usb/common/ulpi.c > F: include/linux/ulpi/ > > - ULTRA-WIDEBAND (UWB) SUBSYSTEM > - L: devel@xxxxxxxxxxxxxxxxxxxx > - S: Obsolete > - F: drivers/staging/uwb/ > - > -UNICODE SUBSYSTEM: > +UNICODE SUBSYSTEM > M: Gabriel Krisman Bertazi <krisman@xxxxxxxxxxxxx> > L: linux-fsdevel@xxxxxxxxxxxxxxx > S: Supported Thanks for this, I'll handle the merge issue when one of the branches gets to Linus in a day or so. greg k-h