Hi all,

Today's linux-next merge of the net tree got a conflict in:

  drivers/net/xen-netback/rx.c

between commit:

  74e7e1efdad4 ("xen/netback: don't call kfree_skb() with interrupts disabled")

from Linus' tree and commit:

  9e6246518592 ("xen/netback: don't call kfree_skb() under spin_lock_irqsave()")

from the net tree.

I fixed it up (I just used the version from Linus' tree) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell