From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: Re: linux-next: manual merge of the staging tree with the char-misc.current tree
Date: Fri, 14 Feb 2020 07:30:01 -0800 [thread overview]
Message-ID: <20200214153001.GA3960639@kroah.com> (raw)
In-Reply-To: <20200214105519.70a7f6a2@canb.auug.org.au>
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@driverdev.osuosl.org
> - S: Obsolete
> - F: drivers/staging/uwb/
> -
> -UNICODE SUBSYSTEM:
> +UNICODE SUBSYSTEM
> M: Gabriel Krisman Bertazi <krisman@collabora.com>
> L: linux-fsdevel@vger.kernel.org
> 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
prev parent reply other threads:[~2020-02-14 20:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-13 23:55 linux-next: manual merge of the staging tree with the char-misc.current tree Stephen Rothwell
2020-02-14 15:30 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200214153001.GA3960639@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=bgolaszewski@baylibre.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).