From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 1 Sep 2021 23:55:20 +0000 (+1000)
Subject: Merge remote-tracking branch 'printk/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=acc908e59f9f8bb903e3ca679ddee29fe99e4820;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'printk/for-next'

# Conflicts:
#	MAINTAINERS
---

acc908e59f9f8bb903e3ca679ddee29fe99e4820
diff --cc MAINTAINERS
index 09643ad13c6f,a19a104e0cc4..f7d880dd41eb
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -15018,6 -14918,18 +15018,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