Merge branch 'topic/uek-4.1/xen' of git://ca-git.us.oracle.com/linux-uek into uek...

* 'topic/uek-4.1/xen' of git://ca-git.us.oracle.com/linux-uek:
  xen-netfront: respect user provided max_queues
  net/xen-netfront: only napi_synchronize() if running
  net/xen-netfront: only clean up queues if present
  xen-netback: respect user provided max_queues
  xen-netback: require fewer guest Rx slots when not using GSO
  xen-netback: add support for multicast control
  xen/netback: Wake dealloc thread after completing zerocopy work
  xen-netback: Allocate fraglist early to avoid complex rollback
  net/xen-netback: off by one in BUG_ON() condition
  xen-netback: remove duplicated function definition
  net/xen-netback: Don't mix hexa and decimal with 0x in the printf format
  net/xen-netback: Remove unused code in xenvif_rx_action

diff --cc drivers/net/xen-netback/xenbus.c
Simple merge