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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20210809131813.3989f9e8@canb.auug.org.au>
Date:   Mon, 9 Aug 2021 13:18:13 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Kalle Valo <kvalo@...eaurora.org>,
        Wireless <linux-wireless@...r.kernel.org>,
        Petr Mladek <pmladek@...e.com>
Cc:     Chris Down <chris@...isdown.name>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Lukas Bulwahn <lukas.bulwahn@...il.com>
Subject: linux-next: manual merge of the wireless-drivers-next tree with the
 printk tree

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@...isdown.name>
 +S:	Maintained
 +F:	kernel/printk/index.c
 +
- PRISM54 WIRELESS DRIVER
- M:	Luis Chamberlain <mcgrof@...nel.org>
- L:	linux-wireless@...r.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@...r.kernel.org
  L:	linux-fsdevel@...r.kernel.org

Content of type "application/pgp-signature" skipped