)]}'
{
  "commit": "03fe2debbb2771fb90881e4ce8109b09cf772a5c",
  "tree": "fbaf8738296b2e9dcba81c6daef2d515b6c4948c",
  "parents": [
    "6686c459e1449a3ee5f3fd313b0a559ace7a700e",
    "f36b7534b83357cf52e747905de6d65b4f7c2512"
  ],
  "author": {
    "name": "David S. Miller",
    "email": "davem@davemloft.net",
    "time": "Fri Mar 23 11:24:57 2018 -0400"
  },
  "committer": {
    "name": "David S. Miller",
    "email": "davem@davemloft.net",
    "time": "Fri Mar 23 11:31:58 2018 -0400"
  },
  "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nFun set of conflict resolutions here...\n\nFor the mac80211 stuff, these were fortunately just parallel\nadds.  Trivially resolved.\n\nIn drivers/net/phy/phy.c we had a bug fix in \u0027net\u0027 that moved the\nfunction phy_disable_interrupts() earlier in the file, whilst in\n\u0027net-next\u0027 the phy_error() call from this function was removed.\n\nIn net/ipv4/xfrm4_policy.c, David Ahern\u0027s changes to remove the\n\u0027rt_table_id\u0027 member of rtable collided with a bug fix in \u0027net\u0027 that\nadded a new struct member \"rt_mtu_locked\" which needs to be copied\nover here.\n\nThe mlxsw driver conflict consisted of net-next separating\nthe span code and definitions into separate files, whilst\na \u0027net\u0027 bug fix made some changes to that moved code.\n\nThe mlx5 infiniband conflict resolution was quite non-trivial,\nthe RDMA tree\u0027s merge commit was used as a guide here, and\nhere are their notes:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\n    Due to bug fixes found by the syzkaller bot and taken into the for-rc\n    branch after development for the 4.17 merge window had already started\n    being taken into the for-next branch, there were fairly non-trivial\n    merge issues that would need to be resolved between the for-rc branch\n    and the for-next branch.  This merge resolves those conflicts and\n    provides a unified base upon which ongoing development for 4.17 can\n    be based.\n\n    Conflicts:\n            drivers/infiniband/hw/mlx5/main.c - Commit 42cea83f9524\n            (IB/mlx5: Fix cleanup order on unload) added to for-rc and\n            commit b5ca15ad7e61 (IB/mlx5: Add proper representors support)\n            add as part of the devel cycle both needed to modify the\n            init/de-init functions used by mlx5.  To support the new\n            representors, the new functions added by the cleanup patch\n            needed to be made non-static, and the init/de-init list\n            added by the representors patch needed to be modified to\n            match the init/de-init list changes made by the cleanup\n            patch.\n    Updates:\n            drivers/infiniband/hw/mlx5/mlx5_ib.h - Update function\n            prototypes added by representors patch to reflect new function\n            names as changed by cleanup patch\n            drivers/infiniband/hw/mlx5/ib_rep.c - Update init/de-init\n            stage list to match new order from cleanup patch\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n",
  "tree_diff": []
}