Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the staging tree with the char-misc.current tree
@ 2020-02-13 23:55 Stephen Rothwell
  2020-02-14 15:30 ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-02-13 23:55 UTC (permalink / raw)
  To: Greg KH, Arnd Bergmann
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Bartosz Golaszewski

[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: manual merge of the staging tree with the char-misc.current tree
  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
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2020-02-14 15:30 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Arnd Bergmann, Linux Next Mailing List,
	Linux Kernel Mailing List, Bartosz Golaszewski

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git