Commit 3ad5d7e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "A bunch of fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  slub: mark the dangling ifdef #else of CONFIG_SLUB_DEBUG
  slub: avoid irqoff/on in bulk allocation
  slub: create new ___slab_alloc function that can be called with irqs disabled
  mm: fix up sparse warning in gfpflags_allow_blocking
  ocfs2: fix umask ignored issue
  PM/OPP: add entry in MAINTAINERS
  kernel/panic.c: turn off locks debug before releasing console lock
  kernel/signal.c: unexport sigsuspend()
  kasan: fix kmemleak false-positive in kasan_module_alloc()
  fat: fix fake_offset handling on error path
  mm/hugetlbfs: fix bugs in fallocate hole punch of areas with holes
  mm/page-writeback.c: initialize m_dirty to avoid compile warning
  various: fix pci_set_dma_mask return value checking
  mm: loosen MADV_NOHUGEPAGE to enable Qemu postcopy on s390
  mm: vmalloc: don't remove inexistent guard hole in remove_vm_area()
  tools/vm/page-types.c: support KPF_IDLE
  ncpfs: don't allow negative timeouts
  configfs: allow dynamic group creation
  MAINTAINERS: add Moritz as reviewer for FPGA Manager Framework
  slab.h: sprinkle __assume_aligned attributes
parents 707b4f49 b4a64718

MAINTAINERS

+13 −0
Original line number Diff line number Diff line
@@ -4411,6 +4411,7 @@ K: fmc_d.*register 


FPGA MANAGER FRAMEWORK

M:	Alan Tull <atull@opensource.altera.com>

R:	Moritz Fischer <moritz.fischer@ettus.com>

S:	Maintained

F:	drivers/fpga/

F:	include/linux/fpga/fpga-mgr.h
@@ -7904,6 +7905,18 @@ S: Maintained 
F:	net/openvswitch/

F:	include/uapi/linux/openvswitch.h



OPERATING PERFORMANCE POINTS (OPP)

M:	Viresh Kumar <vireshk@kernel.org>

M:	Nishanth Menon <nm@ti.com>

M:	Stephen Boyd <sboyd@codeaurora.org>

L:	linux-pm@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git

F:	drivers/base/power/opp/

F:	include/linux/pm_opp.h

F:	Documentation/power/opp.txt

F:	Documentation/devicetree/bindings/opp/



OPL4 DRIVER

M:	Clemens Ladisch <clemens@ladisch.de>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

drivers/media/pci/cx23885/cx23885-core.c

+2 −2
Original line number Diff line number Diff line
@@ -1992,9 +1992,9 @@ static int cx23885_initdev(struct pci_dev *pci_dev, 
		(unsigned long long)pci_resource_start(pci_dev, 0));



	pci_set_master(pci_dev);

	if (!pci_set_dma_mask(pci_dev, 0xffffffff)) {

	err = pci_set_dma_mask(pci_dev, 0xffffffff);

	if (err) {

		printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);

		err = -EIO;

		goto fail_context;

	}

drivers/media/pci/cx25821/cx25821-core.c

+2 −1
Original line number Diff line number Diff line
@@ -1319,7 +1319,8 @@ static int cx25821_initdev(struct pci_dev *pci_dev, 
		dev->pci_lat, (unsigned long long)dev->base_io_addr);



	pci_set_master(pci_dev);

	if (!pci_set_dma_mask(pci_dev, 0xffffffff)) {

	err = pci_set_dma_mask(pci_dev, 0xffffffff);

	if (err) {

		pr_err("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);

		err = -EIO;

		goto fail_irq;

drivers/media/pci/cx88/cx88-alsa.c

+2 −2
Original line number Diff line number Diff line
@@ -890,9 +890,9 @@ static int snd_cx88_create(struct snd_card *card, struct pci_dev *pci, 
		return err;

	}



	if (!pci_set_dma_mask(pci,DMA_BIT_MASK(32))) {

	err = pci_set_dma_mask(pci,DMA_BIT_MASK(32));

	if (err) {

		dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);

		err = -EIO;

		cx88_core_put(core, pci);

		return err;

	}

drivers/media/pci/cx88/cx88-mpeg.c

+2 −1
Original line number Diff line number Diff line
@@ -393,7 +393,8 @@ static int cx8802_init_common(struct cx8802_dev *dev) 
	if (pci_enable_device(dev->pci))

		return -EIO;

	pci_set_master(dev->pci);

	if (!pci_set_dma_mask(dev->pci,DMA_BIT_MASK(32))) {

	err = pci_set_dma_mask(dev->pci,DMA_BIT_MASK(32));

	if (err) {

		printk("%s/2: Oops: no 32bit PCI DMA ???\n",dev->core->name);

		return -EIO;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE