linux-next: manual merge of the net-next tree with Linus' tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/xen-netback/netback.c between commit 94f950c4060c
("xen-netback: don't de-reference vif pointer after having called
xenvif_put()") from Linus' tree and commit e1f00a69ec26 ("xen-netback:
split event channels support for Xen backend driver") from the net-next
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/xen-netback/netback.c
index 8c20935,82576ff..0000000
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@@ -783,9 -789,8 +790,9 @@@ static void xen_netbk_rx_action(struct 
  	}
  
  	list_for_each_entry_safe(vif, tmp, &notify, notify_list) {
- 		notify_remote_via_irq(vif->irq);
+ 		notify_remote_via_irq(vif->rx_irq);
  		list_del_init(&vif->notify_list);
 +		xenvif_put(vif);
  	}
  
  	/* More work to do? */

Attachment: pgpZSzqD7Sbj_.pgp
Description: PGP signature