Merge branch 'uek4/topic/uek-4.1/xen-bug26107942' into uek/uek-next/for-chander-bug26...

 Conflicts:
	arch/x86/xen/enlighten.c
	drivers/net/xen-netfront.c
	fs/proc/generic.c
	fs/proc/internal.h

arch/x86/xen/enlighten.c had one header to not be conditionally include with
CONFIG_KEXEC introduced by commit 28a4be540b ("kexec: allow kdump with
crash_kexec_post_notifiers"); fs/proc/* had required exporting a new
symbol to be used by commit ac7bd1728ac4 ("xenfs: Use
proc_create_mount_point() to create /proc/xen"); finally the
xen-netfront.c had already accounted for the changes introduced by
9e13456b6312 and 0d1d6389b930 - hence we simply retain the topic branch
version.

Signed-off-by: Joao Martins <joao.m.martins@oracle.com>

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc drivers/block/xen-blkback/xenbus.c
Simple merge

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

diff --cc drivers/net/xen-netfront.c
index e442641e8b872a74e95c0c5233fb260a4f335997,fb73ff74487cf6ddd9570c89a8701414bfc70bef..6436e249b8af67e076f328b1c29d803d4c7dc5ee
--- 1/drivers/net/xen-netfront.c
--- 2/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@@ -279,9 -431,9 +431,10 @@@ static struct sk_buff *xennet_alloc_one
  
  static void xennet_alloc_rx_buffers(struct netfront_queue *queue)
  {
+       domid_t otherend_id = queue->info->xbdev->otherend_id;
        RING_IDX req_prod = queue->rx.req_prod_pvt;
        int notify;
 +      int err = 0;
  
        if (unlikely(!netif_carrier_ok(queue->info->netdev)))
                return;
@@@ -289,17 -441,15 +442,17 @@@
        for (req_prod = queue->rx.req_prod_pvt;
             req_prod - queue->rx.rsp_cons < NET_RX_RING_SIZE;
             req_prod++) {
+               struct xen_netif_rx_request *req;
                struct sk_buff *skb;
                unsigned short id;
-               grant_ref_t ref;
                struct page *page;
-               struct xen_netif_rx_request *req;
+               grant_ref_t ref;
  
                skb = xennet_alloc_one_rx_buffer(queue);
 -              if (!skb)
 +              if (!skb) {
 +                      err = -ENOMEM;
                        break;
 +              }
  
                id = xennet_rxidx(req_prod);
  

diff --cc drivers/pci/xen-pcifront.c
Simple merge

diff --cc drivers/xen/events/events_base.c
Simple merge