[PATCH v3.2 00/10] MAINTAINERS: F: pattern updates

[PATCH v3.2 00/10] MAINTAINERS: F: pattern updates

[Joe Perches]

Joe Perches (10):
  MAINTAINERS: Update various arm F: patterns
  MAINTAINERS: Update amd-iommu F: patterns
  MAINTAINERS: Update adp gpio F: patterns
  MAINTAINERS: Update bt8xx gpio F: patterns
  MAINTAINERS: Update marvell ccic F: patterns
  MAINTAINERS: Update mfd F: patterns
  MAINTAINERS: Update sdhci F: patterns
  MAINTAINERS: Update tulip F: patterns
  MAINTAINERS: Update greth F: patterns
  MAINTAINERS: Update encrypted-keys F: patterns

 MAINTAINERS |   34 ++++++++++++++--------------------
 1 files changed, 14 insertions(+), 20 deletions(-)

-- 
1.7.8.111.gad25c.dirty

[PATCH v3.2 01/10] MAINTAINERS: Update various arm F: patterns

[Joe Perches]

Track renames and missing or deleted files.

CC: Russell King <linux@arm.linux.org.uk>

Signed-off-by: Joe Perches <joe@perches.com>
---
 MAINTAINERS |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index b4f1802..7daf771 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -919,7 +919,6 @@ M:	Lennert Buytenhek <kernel@wantstofly.org>
 M:	Nicolas Pitre <nico@fluxnic.net>
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Odd Fixes
-F:	arch/arm/mach-loki/
 F:	arch/arm/mach-kirkwood/
 F:	arch/arm/mach-mv78xx0/
 F:	arch/arm/mach-orion5x/
@@ -1081,8 +1080,8 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
 F:	arch/arm/mach-s5pv210/mach-aquila.c
 F:	arch/arm/mach-s5pv210/mach-goni.c
-F:	arch/arm/mach-exynos4/mach-universal_c210.c
-F:	arch/arm/mach-exynos4/mach-nuri.c
+F:	arch/arm/mach-exynos/mach-universal_c210.c
+F:	arch/arm/mach-exynos/mach-nuri.c
 
 ARM/SAMSUNG S5P SERIES FIMC SUPPORT
 M:	Kyungmin Park <kyungmin.park@samsung.com>
@@ -1110,7 +1109,6 @@ M:	Tomasz Stanislawski <t.stanislaws@samsung.com>
 L:	linux-arm-kernel@lists.infradead.org
 L:	linux-media@vger.kernel.org
 S:	Maintained
-F:	arch/arm/plat-s5p/dev-tv.c
 F:	drivers/media/video/s5p-tv/
 
 ARM/SHMOBILE ARM ARCHITECTURE
@@ -1152,7 +1150,6 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:	http://www.mcuos.com
 S:	Maintained
 F:	arch/arm/mach-w90x900/
-F:	arch/arm/mach-nuc93x/
 F:	drivers/input/keyboard/w90p910_keypad.c
 F:	drivers/input/touchscreen/w90p910_ts.c
 F:	drivers/watchdog/nuc900_wdt.c
@@ -6186,9 +6183,7 @@ M:	Viresh Kumar <viresh.kumar@st.com>
 W:	http://www.st.com/spear
 S:	Maintained
 F:	arch/arm/mach-spear*/clock.c
-F:	arch/arm/mach-spear*/include/mach/clkdev.h
 F:	arch/arm/plat-spear/clock.c
-F:	arch/arm/plat-spear/include/plat/clkdev.h
 F:	arch/arm/plat-spear/include/plat/clock.h
 
 SPEAR PAD MULTIPLEXING SUPPORT
-- 
1.7.8.111.gad25c.dirty

[PATCH v3.2 02/10] MAINTAINERS: Update amd-iommu F: patterns

[Joe Perches]

Commit 29b68415e335 ("x86: amd_iommu: move to drivers/iommu/")
moved the files, update the patterns.

CC: Ohad Ben-Cohen <ohad@wizery.com>
CC: Joerg Roedel <joerg.roedel@amd.com>

Signed-off-by: Joe Perches <joe@perches.com>
---
 MAINTAINERS |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 7daf771..80167e7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -511,8 +511,8 @@ M:	Joerg Roedel <joerg.roedel@amd.com>
 L:	iommu@lists.linux-foundation.org
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
 S:	Supported
-F:	arch/x86/kernel/amd_iommu*.c
-F:	arch/x86/include/asm/amd_iommu*.h
+F:	drivers/iommu/amd_iommu*.[ch]
+F:	include/linux/amd-iommu.h
 
 AMD MICROCODE UPDATE SUPPORT
 M:	Andreas Herrmann <andreas.herrmann3@amd.com>
-- 
1.7.8.111.gad25c.dirty

Re: [PATCH v3.2 02/10] MAINTAINERS: Update amd-iommu F: patterns

[Joerg Roedel]

On Thu, Dec 08, 2011 at 08:21:40PM -0800, Joe Perches wrote:
> Commit 29b68415e335 ("x86: amd_iommu: move to drivers/iommu/")
> moved the files, update the patterns.
> 
> CC: Ohad Ben-Cohen <ohad@wizery.com>
> CC: Joerg Roedel <joerg.roedel@amd.com>
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  MAINTAINERS |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7daf771..80167e7 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -511,8 +511,8 @@ M:	Joerg Roedel <joerg.roedel@amd.com>
>  L:	iommu@lists.linux-foundation.org
>  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
>  S:	Supported
> -F:	arch/x86/kernel/amd_iommu*.c
> -F:	arch/x86/include/asm/amd_iommu*.h
> +F:	drivers/iommu/amd_iommu*.[ch]
> +F:	include/linux/amd-iommu.h
>  
>  AMD MICROCODE UPDATE SUPPORT
>  M:	Andreas Herrmann <andreas.herrmann3@amd.com>

Applied, thanks.

-- 
AMD Operating System Research Center

Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632

[PATCH v3.2 03/10] MAINTAINERS: Update adp gpio F: patterns

[Joe Perches]

Commit c103de240439df ("gpio: reorganize drivers") renamed
the files, update the patterns.

CC: Grant Likely <grant.likely@secretlab.ca>
CC: Michael Hennerich <michael.hennerich@analog.com>

Signed-off-by: Joe Perches <joe@perches.com>
---
 MAINTAINERS |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 80167e7..bfa54c1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -347,7 +347,7 @@ S:	Supported
 F:	drivers/mfd/adp5520.c
 F:	drivers/video/backlight/adp5520_bl.c
 F:	drivers/leds/leds-adp5520.c
-F:	drivers/gpio/adp5520-gpio.c
+F:	drivers/gpio/gpio-adp5520.c
 F:	drivers/input/keyboard/adp5520-keys.c
 
 ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)
@@ -356,7 +356,7 @@ L:	device-drivers-devel@blackfin.uclinux.org
 W:	http://wiki.analog.com/ADP5588
 S:	Supported
 F:	drivers/input/keyboard/adp5588-keys.c
-F:	drivers/gpio/adp5588-gpio.c
+F:	drivers/gpio/gpio-adp5588.c
 
 ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)
 M:	Michael Hennerich <michael.hennerich@analog.com>
-- 
1.7.8.111.gad25c.dirty

Re: [PATCH v3.2 03/10] MAINTAINERS: Update adp gpio F: patterns

[Michael Hennerich]

On 12/09/2011 05:21 AM, Joe Perches wrote:
> Commit c103de240439df ("gpio: reorganize drivers") renamed
> the files, update the patterns.
>
> CC: Grant Likely<grant.likely@secretlab.ca>
> CC: Michael Hennerich<michael.hennerich@analog.com>
>
> Signed-off-by: Joe Perches<joe@perches.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
> ---
>   MAINTAINERS |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 80167e7..bfa54c1 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -347,7 +347,7 @@ S:	Supported
>   F:	drivers/mfd/adp5520.c
>   F:	drivers/video/backlight/adp5520_bl.c
>   F:	drivers/leds/leds-adp5520.c
> -F:	drivers/gpio/adp5520-gpio.c
> +F:	drivers/gpio/gpio-adp5520.c
>   F:	drivers/input/keyboard/adp5520-keys.c
>
>   ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)
> @@ -356,7 +356,7 @@ L:	device-drivers-devel@blackfin.uclinux.org
>   W:	http://wiki.analog.com/ADP5588
>   S:	Supported
>   F:	drivers/input/keyboard/adp5588-keys.c
> -F:	drivers/gpio/adp5588-gpio.c
> +F:	drivers/gpio/gpio-adp5588.c
>
>   ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)
>   M:	Michael Hennerich<michael.hennerich@analog.com>


-- 
Greetings,
Michael

--
Analog Devices GmbH      Wilhelm-Wagenfeld-Str. 6      80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin,
Margaret Seif

Re: [PATCH v3.2 03/10] MAINTAINERS: Update adp gpio F: patterns

[Grant Likely]

On Fri, Dec 09, 2011 at 09:16:52AM +0100, Michael Hennerich wrote:
> On 12/09/2011 05:21 AM, Joe Perches wrote:
> >Commit c103de240439df ("gpio: reorganize drivers") renamed
> >the files, update the patterns.
> >
> >CC: Grant Likely<grant.likely@secretlab.ca>
> >CC: Michael Hennerich<michael.hennerich@analog.com>
> >
> >Signed-off-by: Joe Perches<joe@perches.com>
> Acked-by: Michael Hennerich <michael.hennerich@analog.com>

Acked-by: Grant Likely<grant.likely@secretlab.ca>

> >---
> >  MAINTAINERS |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)
> >
> >diff --git a/MAINTAINERS b/MAINTAINERS
> >index 80167e7..bfa54c1 100644
> >--- a/MAINTAINERS
> >+++ b/MAINTAINERS
> >@@ -347,7 +347,7 @@ S:	Supported
> >  F:	drivers/mfd/adp5520.c
> >  F:	drivers/video/backlight/adp5520_bl.c
> >  F:	drivers/leds/leds-adp5520.c
> >-F:	drivers/gpio/adp5520-gpio.c
> >+F:	drivers/gpio/gpio-adp5520.c
> >  F:	drivers/input/keyboard/adp5520-keys.c
> >
> >  ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)
> >@@ -356,7 +356,7 @@ L:	device-drivers-devel@blackfin.uclinux.org
> >  W:	http://wiki.analog.com/ADP5588
> >  S:	Supported
> >  F:	drivers/input/keyboard/adp5588-keys.c
> >-F:	drivers/gpio/adp5588-gpio.c
> >+F:	drivers/gpio/gpio-adp5588.c
> >
> >  ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)
> >  M:	Michael Hennerich<michael.hennerich@analog.com>
> 
> 
> -- 
> Greetings,
> Michael
> 
> --
> Analog Devices GmbH      Wilhelm-Wagenfeld-Str. 6      80807 Muenchen
> Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
> Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin,
> Margaret Seif
> 
> 

[PATCH v3.2 04/10] MAINTAINERS: Update bt8xx gpio F: patterns

[Joe Perches]

Commit c103de240439d ("gpio: reorganize drivers") renamed
the file, update the pattern.

CC: Grant Likely <grant.likely@secretlab.ca>
CC: Michael Buesch <m@bues.ch>

Signed-off-by: Joe Perches <joe@perches.com>
---
 MAINTAINERS |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index bfa54c1..df2bef0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1630,7 +1630,7 @@ BT8XXGPIO DRIVER
 M:	Michael Buesch <m@bues.ch>
 W:	http://bu3sch.de/btgpio.php
 S:	Maintained
-F:	drivers/gpio/bt8xxgpio.c
+F:	drivers/gpio/gpio-bt8xx.c
 
 BTRFS FILE SYSTEM
 M:	Chris Mason <chris.mason@oracle.com>
-- 
1.7.8.111.gad25c.dirty

[PATCH v3.2 05/10] MAINTAINERS: Update marvell ccic F: patterns

[Joe Perches]

Commit f8fc729870ee
("[media] marvell-cam: Move cafe-ccic into its own directory")
moved the files, update the pattern.

CC: Jonathan Corbet <corbet@lwn.net>
CC: Mauro Carvalho Chehab <mchehab@redhat.com>

Signed-off-by: Joe Perches <joe@perches.com>
---
 MAINTAINERS |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index df2bef0..6d98e5e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1671,7 +1671,7 @@ L:	linux-media@vger.kernel.org
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:	Maintained
 F:	Documentation/video4linux/cafe_ccic
-F:	drivers/media/video/cafe_ccic*
+F:	drivers/media/video/marvell-ccic/
 
 CAIF NETWORK LAYER
 M:	Sjur Braendeland <sjur.brandeland@stericsson.com>
-- 
1.7.8.111.gad25c.dirty

Re: [PATCH v3.2 05/10] MAINTAINERS: Update marvell ccic F: patterns

[Mauro Carvalho Chehab]

On 09-12-2011 02:21, Joe Perches wrote:
> Commit f8fc729870ee
> ("[media] marvell-cam: Move cafe-ccic into its own directory")
> moved the files, update the pattern.
>
> CC: Jonathan Corbet<corbet@lwn.net>
> CC: Mauro Carvalho Chehab<mchehab@redhat.com>

As you sent to akpm, c/c me, I'm assuming that Andrew will apply it. So:

Acked-by: Mauro Carvalho Chehab<mchehab@redhat.com>

Andrew,
Please let me know if you prefer to have this on my tree. It won't conflict
to any patch there anyway, so there's no difference on having it coming from
my tree or from yours.

Regards,
Mauro
>
> Signed-off-by: Joe Perches<joe@perches.com>
> ---
>   MAINTAINERS |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index df2bef0..6d98e5e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1671,7 +1671,7 @@ L:	linux-media@vger.kernel.org
>   T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
>   S:	Maintained
>   F:	Documentation/video4linux/cafe_ccic
> -F:	drivers/media/video/cafe_ccic*
> +F:	drivers/media/video/marvell-ccic/
>
>   CAIF NETWORK LAYER
>   M:	Sjur Braendeland<sjur.brandeland@stericsson.com>

[PATCH v3.2 06/10] MAINTAINERS: Update mfd F: patterns

[Joe Perches]

commit 8959e74399c ("mfd: Delete ab3550 driver")
removed the driver, update the patterns.

CC: Linus Walleij <linus.walleij@stericsson.com>

Signed-off-by: Joe Perches <joe@perches.com>
---
 MAINTAINERS |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 6d98e5e..96c354c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1181,7 +1181,6 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
 F:	arch/arm/mach-ux500/
 F:	drivers/dma/ste_dma40*
-F:	drivers/mfd/ab3550*
 F:	drivers/mfd/abx500*
 F:	drivers/mfd/ab8500*
 F:	drivers/mfd/stmpe*
-- 
1.7.8.111.gad25c.dirty

Re: [PATCH v3.2 06/10] MAINTAINERS: Update mfd F: patterns

[Linus Walleij]

On Fri, Dec 9, 2011 at 5:21 AM, Joe Perches <joe@perches.com> wrote:

> commit 8959e74399c ("mfd: Delete ab3550 driver")
> removed the driver, update the patterns.
>
> CC: Linus Walleij <linus.walleij@stericsson.com>
> Signed-off-by: Joe Perches <joe@perches.com>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Thanks Joe!
Linus Walleij

[PATCH v3.2 07/10] MAINTAINERS: Update sdhci F: patterns

[Joe Perches]

commit 38576af1f8c ("mmc: sdhci: make sdhci-of device drivers self registered")
moved the files around. Update the patterns.

CC: Shawn Guo <shawn.guo@linaro.org>
CC: Chris Ball <cjb@laptop.org>
CC: Anton Vorontsov <avorontsov@ru.mvista.com>

Signed-off-by: Joe Perches <joe@perches.com>
---
 MAINTAINERS |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 96c354c..d7a279f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5796,13 +5796,14 @@ L:	linux-mmc@vger.kernel.org
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
 S:	Maintained
 F:	drivers/mmc/host/sdhci.*
+F:	drivers/mmc/host/sdhci-pltfm.[ch]
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
 M:	Anton Vorontsov <avorontsov@ru.mvista.com>
 L:	linuxppc-dev@lists.ozlabs.org
 L:	linux-mmc@vger.kernel.org
 S:	Maintained
-F:	drivers/mmc/host/sdhci-of.*
+F:	drivers/mmc/host/sdhci-pltfm.[ch]
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
 M:	Ben Dooks <ben-linux@fluff.org>
-- 
1.7.8.111.gad25c.dirty

Re: [PATCH v3.2 07/10] MAINTAINERS: Update sdhci F: patterns

[Anton Vorontsov]

On Thu, Dec 08, 2011 at 08:21:45PM -0800, Joe Perches wrote:
> commit 38576af1f8c ("mmc: sdhci: make sdhci-of device drivers self registered")
> moved the files around. Update the patterns.
> 
> CC: Shawn Guo <shawn.guo@linaro.org>
> CC: Chris Ball <cjb@laptop.org>
> CC: Anton Vorontsov <avorontsov@ru.mvista.com>
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Acked-by: Anton Vorontsov <cbouatmailru@gmail.com>

Thanks!

[PATCH v3.2 08/10] MAINTAINERS: Update tulip F: patterns

[Joe Perches]

commit a88394cfb58 ("ewrk3/tulip: Move the DEC - Tulip drivers")
moved the files, update the patterns.

CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: Tobias Ringstrom <tori@unhappy.mine.nu>
CC: Grant Grundler <grundler@parisc-linux.org>
CC: David Davies <davies@maniac.ultranet.com>

Signed-off-by: Joe Perches <joe@perches.com>
---
 MAINTAINERS |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index d7a279f..9926225 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2115,7 +2115,7 @@ DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
 L:	netdev@vger.kernel.org
 S:	Orphan
 F:	Documentation/networking/dmfe.txt
-F:	drivers/net/ethernet/tulip/dmfe.c
+F:	drivers/net/ethernet/dec/tulip/dmfe.c
 
 DC390/AM53C974 SCSI driver
 M:	Kurt Garloff <garloff@suse.de>
@@ -6655,7 +6655,7 @@ TULIP NETWORK DRIVERS
 M:	Grant Grundler <grundler@parisc-linux.org>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/ethernet/tulip/
+F:	drivers/net/ethernet/dec/tulip/
 
 TUN/TAP driver
 M:	Maxim Krasnyansky <maxk@qualcomm.com>
-- 
1.7.8.111.gad25c.dirty

Re: [PATCH v3.2 08/10] MAINTAINERS: Update tulip F: patterns

[Grant Grundler]

On Thu, Dec 8, 2011 at 8:21 PM, Joe Perches <joe@perches.com> wrote:
> commit a88394cfb58 ("ewrk3/tulip: Move the DEC - Tulip drivers")
> moved the files, update the patterns.
>
> CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> CC: Tobias Ringstrom <tori@unhappy.mine.nu>
> CC: Grant Grundler <grundler@parisc-linux.org>
> CC: David Davies <davies@maniac.ultranet.com>
>
> Signed-off-by: Joe Perches <joe@perches.com>

Acked-by: Grant Grundler <grundler@parisc-linux.org>

thanks!
grant

> ---
>  MAINTAINERS |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index d7a279f..9926225 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2115,7 +2115,7 @@ DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
>  L:     netdev@vger.kernel.org
>  S:     Orphan
>  F:     Documentation/networking/dmfe.txt
> -F:     drivers/net/ethernet/tulip/dmfe.c
> +F:     drivers/net/ethernet/dec/tulip/dmfe.c
>
>  DC390/AM53C974 SCSI driver
>  M:     Kurt Garloff <garloff@suse.de>
> @@ -6655,7 +6655,7 @@ TULIP NETWORK DRIVERS
>  M:     Grant Grundler <grundler@parisc-linux.org>
>  L:     netdev@vger.kernel.org
>  S:     Maintained
> -F:     drivers/net/ethernet/tulip/
> +F:     drivers/net/ethernet/dec/tulip/
>
>  TUN/TAP driver
>  M:     Maxim Krasnyansky <maxk@qualcomm.com>
> --
> 1.7.8.111.gad25c.dirty
>

[PATCH v3.2 09/10] MAINTAINERS: Update greth F: patterns

[Joe Perches]

commit 1fe003fd424 ("greth: Move the Aeroflex Gaisler driver")
moved the files, update the patterns.

CC: Kristoffer Glembo <kristoffer@gaisler.com>
CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Signed-off-by: Joe Perches <joe@perches.com>
---
 MAINTAINERS |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9926225..69c5720 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2933,7 +2933,7 @@ GRETH 10/100/1G Ethernet MAC device driver
 M:	Kristoffer Glembo <kristoffer@gaisler.com>
 L:	netdev@vger.kernel.org
 S:	Maintained
-F:	drivers/net/greth*
+F:	drivers/net/ethernet/aeroflex/
 
 GSPCA FINEPIX SUBDRIVER
 M:	Frank Zago <frank@zago.net>
-- 
1.7.8.111.gad25c.dirty

[PATCH v3.2 10/10] MAINTAINERS: Update encrypted-keys F: patterns

[Joe Perches]

commit 61cf45d0199 ("encrypted-keys: create encrypted-keys directory")
moved the files, update the patterns.

CC: Mimi Zohar <zohar@us.ibm.com>

Signed-off-by: Joe Perches <joe@perches.com>
---
 MAINTAINERS |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 69c5720..2173f6b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3873,8 +3873,7 @@ L:	keyrings@linux-nfs.org
 S:	Supported
 F:	Documentation/security/keys-trusted-encrypted.txt
 F:	include/keys/encrypted-type.h
-F:	security/keys/encrypted.c
-F:	security/keys/encrypted.h
+F:	security/keys/encrypted-keys/
 
 KGDB / KDB /debug_core
 M:	Jason Wessel <jason.wessel@windriver.com>
-- 
1.7.8.111.gad25c.dirty