Re: linux-next: manual merge of the wireless-drivers-next tree with the printk tree

Hi all,

[Just cc'ing Dave]

On Tue, 24 Aug 2021 12:07:14 +1000 Stephen Rothwell [off-list ref] wrote:

On Mon, 9 Aug 2021 13:18:13 +1000 Stephen Rothwell [off-list ref] wrote:

quoted

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  MAINTAINERS

between commit:

  337015573718 ("printk: Userspace format indexing support")

from the printk tree and commit:

  d249ff28b1d8 ("intersil: remove obsolete prism54 wireless driver")

from the wireless-drivers-next 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 5cf181197a50,492bc169c3bd..000000000000

--- a/MAINTAINERS
+++ b/MAINTAINERS

@@@ -14974,18 -14927,6 +14974,11 @@@ S:	Maintaine
  F:	include/linux/printk.h
  F:	kernel/printk/
  
 +PRINTK INDEXING
 +R:	Chris Down [off-list ref]
 +S:	Maintained
 +F:	kernel/printk/index.c
 +
- PRISM54 WIRELESS DRIVER
- M:	Luis Chamberlain [off-list ref]
- L:	linux-wireless@vger.kernel.org
- S:	Obsolete
- W:	https://wireless.wiki.kernel.org/en/users/Drivers/p54
- F:	drivers/net/wireless/intersil/prism54/
- 
  PROC FILESYSTEM
  L:	linux-kernel@vger.kernel.org
  L:	linux-fsdevel@vger.kernel.org  

This is now a conflict between the net-next tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell