LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the wireless-drivers-next tree with the printk tree
@ 2021-08-09  3:18 Stephen Rothwell
  2021-08-17 17:01 ` Kalle Valo
  2021-08-24  2:07 ` Stephen Rothwell
  0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2021-08-09  3:18 UTC (permalink / raw)
  To: Kalle Valo, Wireless, Petr Mladek
  Cc: Chris Down, Linux Kernel Mailing List, Linux Next Mailing List,
	Lukas Bulwahn

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

Hi all,

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 <chris@chrisdown.name>
 +S:	Maintained
 +F:	kernel/printk/index.c
 +
- PRISM54 WIRELESS DRIVER
- M:	Luis Chamberlain <mcgrof@kernel.org>
- 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

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

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

end of thread, other threads:[~2021-08-24  2:09 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-09  3:18 linux-next: manual merge of the wireless-drivers-next tree with the printk tree Stephen Rothwell
2021-08-17 17:01 ` Kalle Valo
2021-08-24  2:07 ` Stephen Rothwell
2021-08-24  2:09   ` Stephen Rothwell

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).