Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d01eedf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge third patchbomb from Andrew Morton:

 - the rest of MM

 - scripts/gdb updates

 - ipc/ updates

 - lib/ updates

 - MAINTAINERS updates

 - various other misc things

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (67 commits)
  genalloc: rename of_get_named_gen_pool() to of_gen_pool_get()
  genalloc: rename dev_get_gen_pool() to gen_pool_get()
  x86: opt into HAVE_COPY_THREAD_TLS, for both 32-bit and 64-bit
  MAINTAINERS: add zpool
  MAINTAINERS: BCACHE: Kent Overstreet has changed email address
  MAINTAINERS: move Jens Osterkamp to CREDITS
  MAINTAINERS: remove unused nbd.h pattern
  MAINTAINERS: update brcm gpio filename pattern
  MAINTAINERS: update brcm dts pattern
  MAINTAINERS: update sound soc intel patterns
  MAINTAINERS: remove website for paride
  MAINTAINERS: update Emulex ocrdma email addresses
  bcache: use kvfree() in various places
  libcxgbi: use kvfree() in cxgbi_free_big_mem()
  target: use kvfree() in session alloc and free
  IB/ehca: use kvfree() in ipz_queue_{cd}tor()
  drm/nouveau/gem: use kvfree() in u_free()
  drm: use kvfree() in drm_free_large()
  cxgb4: use kvfree() in t4_free_mem()
  cxgb3: use kvfree() in cxgb_free_mem()
  ...
parents 6ac15baa abdd4a70

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -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

MAINTAINERS

+18 −15
Original line number Diff line number Diff line
@@ -2026,10 +2026,10 @@ S: Maintained 
F:	drivers/net/hamradio/baycom*



BCACHE (BLOCK LAYER CACHE)

M:	Kent Overstreet <kmo@daterainc.com>

M:	Kent Overstreet <kent.overstreet@gmail.com>

L:	linux-bcache@vger.kernel.org

W:	http://bcache.evilpiepirate.org

S:	Maintained:

S:	Maintained

F:	drivers/md/bcache/



BDISP ST MEDIA DRIVER
@@ -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*
@@ -2339,7 +2339,7 @@ M: Ray Jui <rjui@broadcom.com> 
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 <zajec5@gmail.com>
@@ -5285,11 +5285,10 @@ INTEL ASoC BDW/HSW DRIVERS 
M:	Jie Yang <yang.jie@linux.intel.com>

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 <intel-linux-scu@intel.com>
@@ -7019,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
@@ -7647,7 +7645,6 @@ F: arch/*/include/asm/paravirt.h 
PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES

M:	Tim Waugh <tim@cyberelk.net>

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/
@@ -9091,9 +9088,9 @@ S: Supported 
F:	drivers/net/ethernet/emulex/benet/



EMULEX ONECONNECT ROCE DRIVER

M:	Selvin Xavier <selvin.xavier@emulex.com>

M:	Devesh Sharma <devesh.sharma@emulex.com>

M:	Mitesh Ahuja <mitesh.ahuja@emulex.com>

M:	Selvin Xavier <selvin.xavier@avagotech.com>

M:	Devesh Sharma <devesh.sharma@avagotech.com>

M:	Mitesh Ahuja <mitesh.ahuja@avagotech.com>

L:	linux-rdma@vger.kernel.org

W:	http://www.emulex.com

S:	Supported
@@ -9593,7 +9590,6 @@ F: include/uapi/linux/spi/ 


SPIDERNET NETWORK DRIVER for CELL

M:	Ishizaki Kou <kou.ishizaki@toshiba.co.jp>

M:	Jens Osterkamp <jens@de.ibm.com>

L:	netdev@vger.kernel.org

S:	Supported

F:	Documentation/networking/spider_net.txt
@@ -11354,6 +11350,13 @@ L: zd1211-devs@lists.sourceforge.net (subscribers-only) 
S:	Maintained

F:	drivers/net/wireless/zd1211rw/



ZPOOL COMPRESSED PAGE STORAGE API

M:	Dan Streetman <ddstreet@ieee.org>

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

arch/arc/include/asm/dma-mapping.h

+7 −5
Original line number Diff line number Diff line
@@ -157,22 +157,24 @@ dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle, 
}



static inline void

dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,

dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sglist, int nelems,

		    enum dma_data_direction dir)

{

	int i;

	struct scatterlist *sg;



	for (i = 0; i < nelems; i++, sg++)

	for_each_sg(sglist, sg, nelems, i)

		_dma_cache_sync((unsigned int)sg_virt(sg), sg->length, dir);

}



static inline void

dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,

		       enum dma_data_direction dir)

dma_sync_sg_for_device(struct device *dev, struct scatterlist *sglist,

		       int nelems, enum dma_data_direction dir)

{

	int i;

	struct scatterlist *sg;



	for (i = 0; i < nelems; i++, sg++)

	for_each_sg(sglist, sg, nelems, i)

		_dma_cache_sync((unsigned int)sg_virt(sg), sg->length, dir);

}

arch/arm/mach-at91/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static void __init at91_pm_sram_init(void) 
		return;

	}



	sram_pool = dev_get_gen_pool(&pdev->dev);

	sram_pool = gen_pool_get(&pdev->dev);

	if (!sram_pool) {

		pr_warn("%s: sram pool unavailable!\n", __func__);

		return;

arch/arm/mach-imx/pm-imx5.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int __init imx_suspend_alloc_ocram( 
		goto put_node;

	}



	ocram_pool = dev_get_gen_pool(&pdev->dev);

	ocram_pool = gen_pool_get(&pdev->dev);

	if (!ocram_pool) {

		pr_warn("%s: ocram pool unavailable!\n", __func__);

		ret = -ENODEV;