mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-07 08:06:41 +07:00
03fe2debbb
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 |
||
---|---|---|
.. | ||
actions.c | ||
conntrack.c | ||
conntrack.h | ||
datapath.c | ||
datapath.h | ||
dp_notify.c | ||
flow_netlink.c | ||
flow_netlink.h | ||
flow_table.c | ||
flow_table.h | ||
flow.c | ||
flow.h | ||
Kconfig | ||
Makefile | ||
meter.c | ||
meter.h | ||
vport-geneve.c | ||
vport-gre.c | ||
vport-internal_dev.c | ||
vport-internal_dev.h | ||
vport-netdev.c | ||
vport-netdev.h | ||
vport-vxlan.c | ||
vport.c | ||
vport.h |