linux-next: manual merge of the staging tree with the net tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/et131x/et1310_tx.c between commit bf3f1a6081aa ("et131x:
convert to SKB paged frag API") from the net tree and commit 10f00a49b048
("staging: et131x: Rename var name 'etdev' to 'adapter' throughout
module") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/staging/et131x/et1310_tx.c
index 03e7a4e,2ecb934..0000000
--- a/drivers/staging/et131x/et1310_tx.c
+++ b/drivers/staging/et131x/et1310_tx.c
@@@ -519,12 -392,12 +392,12 @@@ static int nic_send_packet(struct et131
  			 * returned by pci_map_page() is always 32-bit
  			 * addressable (as defined by the pci/dma subsystem)
  			 */
 -			desc[frag++].addr_lo =
 -			    pci_map_page(adapter->pdev,
 -					 frags[i - 1].page,
 -					 frags[i - 1].page_offset,
 -					 frags[i - 1].size,
 -					 PCI_DMA_TODEVICE);
 +			desc[frag++].addr_lo = skb_frag_dma_map(
- 							&etdev->pdev->dev,
++							&adapter->pdev->dev,
 +							&frags[i - 1],
 +							0,
 +							frags[i - 1].size,
 +							PCI_DMA_TODEVICE);
  		}
  	}

Attachment: pgp00000.pgp
Description: PGP signature