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

Commit 130faf37 authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'v3.18.26' into linux-linaro-lsk-v3.18 

Linux 3.18.26

# gpg: Signature made Mon 25 Jan 2016 15:06:44 GMT using RSA key ID 97772CDC
# gpg: requesting key 97772CDC from hkp server the.earth.li
# gpg: key 97772CDC: public key "Sasha Levin <sasha.levin@oracle.com>" imported
# gpg: no ultimately trusted keys found
# gpg: Total number processed: 1
# gpg:               imported: 1  (RSA: 1)
# gpg: Good signature from "Sasha Levin <sasha.levin@oracle.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: E27E 5D8A 3403 A2EF 6687  3BBC DEA6 6FF7 9777 2CDC
parents f90ae1b6 707e840c

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 25

SUBLEVEL = 26

EXTRAVERSION =

NAME = Diseased Newt

drivers/block/rbd.c

+16 −20
Original line number Diff line number Diff line
@@ -3394,6 +3394,7 @@ static void rbd_handle_request(struct rbd_device *rbd_dev, struct request *rq) 
		goto err_rq;

	}

	img_request->rq = rq;

	snapc = NULL; /* img_request consumes a ref */



	if (op_type == OBJ_OP_DISCARD)

		result = rbd_img_request_fill(img_request, OBJ_REQUEST_NODATA,
@@ -5172,41 +5173,36 @@ out_err: 
static int rbd_dev_probe_parent(struct rbd_device *rbd_dev)

{

	struct rbd_device *parent = NULL;

	struct rbd_spec *parent_spec;

	struct rbd_client *rbdc;

	int ret;



	if (!rbd_dev->parent_spec)

		return 0;

	/*

	 * We need to pass a reference to the client and the parent

	 * spec when creating the parent rbd_dev.  Images related by

	 * parent/child relationships always share both.

	 */

	parent_spec = rbd_spec_get(rbd_dev->parent_spec);

	rbdc = __rbd_get_client(rbd_dev->rbd_client);



	parent = rbd_dev_create(rbd_dev->rbd_client, rbd_dev->parent_spec);

	if (!parent) {

		ret = -ENOMEM;

	parent = rbd_dev_create(rbdc, parent_spec);

	if (!parent)

		goto out_err;

	}



	/*

	 * Images related by parent/child relationships always share

	 * rbd_client and spec/parent_spec, so bump their refcounts.

	 */

	__rbd_get_client(rbd_dev->rbd_client);

	rbd_spec_get(rbd_dev->parent_spec);



	ret = rbd_dev_image_probe(parent, false);

	if (ret < 0)

		goto out_err;



	rbd_dev->parent = parent;

	atomic_set(&rbd_dev->parent_ref, 1);



	return 0;



out_err:

	if (parent) {

	rbd_dev_unparent(rbd_dev);

	if (parent)

		rbd_dev_destroy(parent);

	} else {

		rbd_put_client(rbdc);

		rbd_spec_put(parent_spec);

	}



	return ret;

}

drivers/firewire/ohci.c

+5 −0
Original line number Diff line number Diff line
@@ -3682,6 +3682,11 @@ static int pci_probe(struct pci_dev *dev, 


	reg_write(ohci, OHCI1394_IsoXmitIntMaskSet, ~0);

	ohci->it_context_support = reg_read(ohci, OHCI1394_IsoXmitIntMaskSet);

	/* JMicron JMB38x often shows 0 at first read, just ignore it */

	if (!ohci->it_context_support) {

		ohci_notice(ohci, "overriding IsoXmitIntMask\n");

		ohci->it_context_support = 0xf;

	}

	reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, ~0);

	ohci->it_context_mask = ohci->it_context_support;

	ohci->n_it = hweight32(ohci->it_context_mask);

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+3 −4
Original line number Diff line number Diff line
@@ -1014,13 +1014,12 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter) 
		sizeof(struct atl1c_recv_ret_status) * rx_desc_count +

		8 * 4;



	ring_header->desc = pci_alloc_consistent(pdev, ring_header->size,

				&ring_header->dma);

	ring_header->desc = dma_zalloc_coherent(&pdev->dev, ring_header->size,

						&ring_header->dma, GFP_KERNEL);

	if (unlikely(!ring_header->desc)) {

		dev_err(&pdev->dev, "pci_alloc_consistend failed\n");

		dev_err(&pdev->dev, "could not get memory for DMA buffer\n");

		goto err_nomem;

	}

	memset(ring_header->desc, 0, ring_header->size);

	/* init TPD ring */



	tpd_ring[0].dma = roundup(ring_header->dma, 8);

drivers/net/ethernet/qualcomm/qca_spi.c

+2 −3
Original line number Diff line number Diff line
@@ -737,9 +737,8 @@ qcaspi_netdev_tx_timeout(struct net_device *dev) 
	netdev_info(qca->net_dev, "Transmit timeout at %ld, latency %ld\n",

		    jiffies, jiffies - dev->trans_start);

	qca->net_dev->stats.tx_errors++;

	/* wake the queue if there is room */

	if (qcaspi_tx_ring_has_space(&qca->txr))

		netif_wake_queue(dev);

	/* Trigger tx queue flush and QCA7000 reset */

	qca->sync = QCASPI_SYNC_UNKNOWN;

}



static int