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

Fun set of conflict resolutions here...

For the mac80211 stuff, these were fortunately just parallel
adds.  Trivially resolved.

In drivers/net/phy/phy.c we had a bug fix in 'net' that moved the
function phy_disable_interrupts() earlier in the file, whilst in
'net-next' the phy_error() call from this function was removed.

In net/ipv4/xfrm4_policy.c, David Ahern's changes to remove the
'rt_table_id' member of rtable collided with a bug fix in 'net' that
added a new struct member "rt_mtu_locked" which needs to be copied
over here.

The mlxsw driver conflict consisted of net-next separating
the span code and definitions into separate files, whilst
a 'net' bug fix made some changes to that moved code.

The mlx5 infiniband conflict resolution was quite non-trivial,
the RDMA tree's merge commit was used as a guide here, and
here are their notes:

====================

    Due to bug fixes found by the syzkaller bot and taken into the for-rc
    branch after development for the 4.17 merge window had already started
    being taken into the for-next branch, there were fairly non-trivial
    merge issues that would need to be resolved between the for-rc branch
    and the for-next branch.  This merge resolves those conflicts and
    provides a unified base upon which ongoing development for 4.17 can
    be based.

    Conflicts:
            drivers/infiniband/hw/mlx5/main.c - Commit 42cea83f9524
            (IB/mlx5: Fix cleanup order on unload) added to for-rc and
            commit b5ca15ad7e61 (IB/mlx5: Add proper representors support)
            add as part of the devel cycle both needed to modify the
            init/de-init functions used by mlx5.  To support the new
            representors, the new functions added by the cleanup patch
            needed to be made non-static, and the init/de-init list
            added by the representors patch needed to be modified to
            match the init/de-init list changes made by the cleanup
            patch.
    Updates:
            drivers/infiniband/hw/mlx5/mlx5_ib.h - Update function
            prototypes added by representors patch to reflect new function
            names as changed by cleanup patch
            drivers/infiniband/hw/mlx5/ib_rep.c - Update init/de-init
            stage list to match new order from cleanup patch
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 27 insertions, 0 deletions

diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c
index 337462e1569f..038509e5d031 100644
--- a/drivers/misc/ocxl/file.c
+++ b/drivers/misc/ocxl/file.c
@@ -102,10 +102,32 @@ static long afu_ioctl_attach(struct ocxl_context *ctx,
         return rc;
 }
 
+static long afu_ioctl_get_metadata(struct ocxl_context *ctx,
+                struct ocxl_ioctl_metadata __user *uarg)
+{
+        struct ocxl_ioctl_metadata arg;
+
+        memset(&arg, 0, sizeof(arg));
+
+        arg.version = 0;
+
+        arg.afu_version_major = ctx->afu->config.version_major;
+        arg.afu_version_minor = ctx->afu->config.version_minor;
+        arg.pasid = ctx->pasid;
+        arg.pp_mmio_size = ctx->afu->config.pp_mmio_stride;
+        arg.global_mmio_size = ctx->afu->config.global_mmio_size;
+
+        if (copy_to_user(uarg, &arg, sizeof(arg)))
+                return -EFAULT;
+
+        return 0;
+}
+
 #define CMD_STR(x) (x == OCXL_IOCTL_ATTACH ? "ATTACH" :                 \
                         x == OCXL_IOCTL_IRQ_ALLOC ? "IRQ_ALLOC" :       \
                         x == OCXL_IOCTL_IRQ_FREE ? "IRQ_FREE" :         \
                         x == OCXL_IOCTL_IRQ_SET_FD ? "IRQ_SET_FD" :     \
+                        x == OCXL_IOCTL_GET_METADATA ? "GET_METADATA" : \
                         "UNKNOWN")
 
 static long afu_ioctl(struct file *file, unsigned int cmd,
@@ -159,6 +181,11 @@ static long afu_ioctl(struct file *file, unsigned int cmd,
                                         irq_fd.eventfd);
                 break;
 
+        case OCXL_IOCTL_GET_METADATA:
+                rc = afu_ioctl_get_metadata(ctx,
+                                (struct ocxl_ioctl_metadata __user *) args);
+                break;
+
         default:
                 rc = -EINVAL;
         }