From 2b8e7333431f90be12a6ef5c44f2efbc3625e7bf Mon Sep 17 00:00:00 2001 From: Laurent Navet Date: Tue, 30 Jun 2015 14:59:33 -0700 Subject: MAINTAINERS: update Emulex ocrdma email addresses @emulex.com addresses respond to use @avagotech.com. Signed-off-by: Laurent Navet Acked-By: Devesh Sharma Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 0e6b09150aad..90878f323457 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9091,9 +9091,9 @@ S: Supported F: drivers/net/ethernet/emulex/benet/ EMULEX ONECONNECT ROCE DRIVER -M: Selvin Xavier -M: Devesh Sharma -M: Mitesh Ahuja +M: Selvin Xavier +M: Devesh Sharma +M: Mitesh Ahuja L: linux-rdma@vger.kernel.org W: http://www.emulex.com S: Supported -- cgit v1.2.3 From 712c0347902843c6a467e6c7ef90d0ee34eca110 Mon Sep 17 00:00:00 2001 From: Sudip Mukherjee Date: Tue, 30 Jun 2015 14:59:36 -0700 Subject: MAINTAINERS: remove website for paride The webpage mentioned is not working, Signed-off-by: Sudip Mukherjee Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 90878f323457..875d9d69b43d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7647,7 +7647,6 @@ F: arch/*/include/asm/paravirt.h PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES M: Tim Waugh L: linux-parport@lists.infradead.org (subscribers-only) -W: http://www.torque.net/linux-pp.html S: Maintained F: Documentation/blockdev/paride.txt F: drivers/block/paride/ -- cgit v1.2.3 From e8e1225da568eef733d69033ba1647237fbd3c45 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 30 Jun 2015 14:59:39 -0700 Subject: MAINTAINERS: update sound soc intel patterns Commit 2106241a6803 ("ASoC: Intel: create common folder and move common files in") moved the files around. Update the patterns. Signed-off-by: Joe Perches Cc: Jie Yang Acked-by: Jie Yang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 875d9d69b43d..2243d9142c06 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5285,11 +5285,10 @@ INTEL ASoC BDW/HSW DRIVERS M: Jie Yang L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Supported -F: sound/soc/intel/sst-haswell* -F: sound/soc/intel/sst-dsp* -F: sound/soc/intel/sst-firmware.c -F: sound/soc/intel/broadwell.c -F: sound/soc/intel/haswell.c +F: sound/soc/intel/common/sst-dsp* +F: sound/soc/intel/common/sst-firmware.c +F: sound/soc/intel/boards/broadwell.c +F: sound/soc/intel/haswell/ INTEL C600 SERIES SAS CONTROLLER DRIVER M: Intel SCU Linux support -- cgit v1.2.3 From 338808de6cc8f2952ac15f71ddbb9230d95fa4f6 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 30 Jun 2015 14:59:42 -0700 Subject: MAINTAINERS: update brcm dts pattern Commit 8c0b9ee8665c ("MIPS: Move device-trees into vendor sub-directories") moved the files, update the pattern. Signed-off-by: Joe Perches Cc: Andrew Bresticker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 2243d9142c06..6de33075d8f7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2280,7 +2280,7 @@ S: Maintained F: arch/mips/bmips/* F: arch/mips/include/asm/mach-bmips/* F: arch/mips/kernel/*bmips* -F: arch/mips/boot/dts/bcm*.dts* +F: arch/mips/boot/dts/brcm/bcm*.dts* F: drivers/irqchip/irq-bcm7* F: drivers/irqchip/irq-brcmstb* -- cgit v1.2.3 From 1db12cde4c5b0ba586f29cd90387b654497faf45 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 30 Jun 2015 14:59:45 -0700 Subject: MAINTAINERS: update brcm gpio filename pattern Commit 23a71fd616bf ("dt-bindings: brcm: rationalize Broadcom documentation naming") renamed the file, update the pattern. Signed-off-by: Joe Perches Acked-by: Scott Branden Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 6de33075d8f7..44c63e54c9d7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2339,7 +2339,7 @@ M: Ray Jui L: bcm-kernel-feedback-list@broadcom.com S: Supported F: drivers/gpio/gpio-bcm-kona.c -F: Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt +F: Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt BROADCOM NVRAM DRIVER M: Rafał Miłecki -- cgit v1.2.3 From 70a116dca45a8480429c4d0803e129a18f035c6e Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 30 Jun 2015 14:59:48 -0700 Subject: MAINTAINERS: remove unused nbd.h pattern Commit 13e71d69cc74 ("nbd: Remove kernel internal header") deleted the file, remove the pattern. Signed-off-by: Joe Perches Acked-by: Markus Pargmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 44c63e54c9d7..c8a392659dff 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7018,7 +7018,6 @@ L: nbd-general@lists.sourceforge.net T: git git://git.pengutronix.de/git/mpa/linux-nbd.git F: Documentation/blockdev/nbd.txt F: drivers/block/nbd.c -F: include/linux/nbd.h F: include/uapi/linux/nbd.h NETWORK DROP MONITOR -- cgit v1.2.3 From 2b0d8f03d8211058babaa2122ccbc58e0f6e9d39 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 30 Jun 2015 14:59:51 -0700 Subject: MAINTAINERS: move Jens Osterkamp to CREDITS Jens' email address bounces, so move his name and entry to CREDITS. Signed-off-by: Joe Perches Cc: Ishizaki Kou Cc: Jens Osterkamp Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- CREDITS | 4 ++++ MAINTAINERS | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/CREDITS b/CREDITS index 4df764ebe217..1d616640bbf6 100644 --- a/CREDITS +++ b/CREDITS @@ -2740,6 +2740,10 @@ S: C/ Mieses 20, 9-B S: Valladolid 47009 S: Spain +N: Jens Osterkamp +E: jens@de.ibm.com +D: Maintainer of Spidernet network driver for Cell + N: Gadi Oxman E: gadio@netvision.net.il D: Original author and maintainer of IDE/ATAPI floppy/tape drivers diff --git a/MAINTAINERS b/MAINTAINERS index c8a392659dff..67afc4de50ce 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9590,7 +9590,6 @@ F: include/uapi/linux/spi/ SPIDERNET NETWORK DRIVER for CELL M: Ishizaki Kou -M: Jens Osterkamp L: netdev@vger.kernel.org S: Supported F: Documentation/networking/spider_net.txt -- cgit v1.2.3 From d1aa1ab33dcb0922e9088e37989a6d28d8702540 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 30 Jun 2015 14:59:54 -0700 Subject: MAINTAINERS: BCACHE: Kent Overstreet has changed email address Kent's email address in MAINTAINERS seems to be invalid. This was his last sign-off address, so use that if appropriate. Fix the S: status entry while there. Signed-off-by: Joe Perches Acked-by: Kent Overstreet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 4 ++-- drivers/md/bcache/journal.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 67afc4de50ce..79faf013c2ba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2026,10 +2026,10 @@ S: Maintained F: drivers/net/hamradio/baycom* BCACHE (BLOCK LAYER CACHE) -M: Kent Overstreet +M: Kent Overstreet L: linux-bcache@vger.kernel.org W: http://bcache.evilpiepirate.org -S: Maintained: +S: Maintained F: drivers/md/bcache/ BDISP ST MEDIA DRIVER diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c index fe080ad0e558..ce64fc851251 100644 --- a/drivers/md/bcache/journal.c +++ b/drivers/md/bcache/journal.c @@ -157,7 +157,7 @@ int bch_journal_read(struct cache_set *c, struct list_head *list) for_each_cache(ca, c, iter) { struct journal_device *ja = &ca->journal; - unsigned long bitmap[SB_JOURNAL_BUCKETS / BITS_PER_LONG]; + DECLARE_BITMAP(bitmap, SB_JOURNAL_BUCKETS); unsigned i, l, r, m; uint64_t seq; -- cgit v1.2.3 From 2026302909b5dc1b3834a89654315abd8b4e040c Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Tue, 30 Jun 2015 14:59:57 -0700 Subject: MAINTAINERS: add zpool Add entry for zpool to MAINTAINERS file. Signed-off-by: Dan Streetman Cc: Seth Jennings Cc: Minchan Kim Cc: Nitin Gupta Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 79faf013c2ba..af61ea8d2162 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11343,6 +11343,13 @@ L: zd1211-devs@lists.sourceforge.net (subscribers-only) S: Maintained F: drivers/net/wireless/zd1211rw/ +ZPOOL COMPRESSED PAGE STORAGE API +M: Dan Streetman +L: linux-mm@kvack.org +S: Maintained +F: mm/zpool.c +F: include/linux/zpool.h + ZR36067 VIDEO FOR LINUX DRIVER L: mjpeg-users@lists.sourceforge.net L: linux-media@vger.kernel.org -- cgit v1.2.3