iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Conflicts:
	net/bridge/br_mdb.c

br_mdb.c conflict was a function call being removed to fix a bug in
'net' but whose signature was changed in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2015-07-23 00:41:16 -07:00
parent 0528318799 c5dfd654d0
commit c5e40ee287
544 changed files with 4160 additions and 3355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/xen-netback/netback.c
View File

@ -1566,13 +1566,13 @@ static inline void xenvif_tx_dealloc_action(struct xenvif_queue *queue)
smp_rmb();
while (dc != dp) {
BUG_ON(gop - queue->tx_unmap_ops > MAX_PENDING_REQS);
BUG_ON(gop - queue->tx_unmap_ops >= MAX_PENDING_REQS);
pending_idx =
queue->dealloc_ring[pending_index(dc++)];
pending_idx_release[gop-queue->tx_unmap_ops] =
pending_idx_release[gop - queue->tx_unmap_ops] =
pending_idx;
queue->pages_to_unmap[gop-queue->tx_unmap_ops] =
queue->pages_to_unmap[gop - queue->tx_unmap_ops] =
queue->mmap_pages[pending_idx];
gnttab_set_unmap_op(gop,
idx_to_kaddr(queue, pending_idx),