mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18:45 +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
|
||
|---|---|---|
| .. | ||
| cmd.h | ||
| core_acl_flex_actions.c | ||
| core_acl_flex_actions.h | ||
| core_acl_flex_keys.c | ||
| core_acl_flex_keys.h | ||
| core_hwmon.c | ||
| core_thermal.c | ||
| core.c | ||
| core.h | ||
| emad.h | ||
| i2c.c | ||
| i2c.h | ||
| ib.h | ||
| item.h | ||
| Kconfig | ||
| Makefile | ||
| minimal.c | ||
| pci_hw.h | ||
| pci.c | ||
| pci.h | ||
| port.h | ||
| reg.h | ||
| resources.h | ||
| spectrum_acl_flex_actions.c | ||
| spectrum_acl_flex_actions.h | ||
| spectrum_acl_flex_keys.h | ||
| spectrum_acl_tcam.c | ||
| spectrum_acl.c | ||
| spectrum_buffers.c | ||
| spectrum_cnt.c | ||
| spectrum_cnt.h | ||
| spectrum_dcb.c | ||
| spectrum_dpipe.c | ||
| spectrum_dpipe.h | ||
| spectrum_fid.c | ||
| spectrum_flower.c | ||
| spectrum_ipip.c | ||
| spectrum_ipip.h | ||
| spectrum_kvdl.c | ||
| spectrum_mr_tcam.c | ||
| spectrum_mr_tcam.h | ||
| spectrum_mr.c | ||
| spectrum_mr.h | ||
| spectrum_qdisc.c | ||
| spectrum_router.c | ||
| spectrum_router.h | ||
| spectrum_span.c | ||
| spectrum_span.h | ||
| spectrum_switchdev.c | ||
| spectrum.c | ||
| spectrum.h | ||
| switchib.c | ||
| switchx2.c | ||
| trap.h | ||
| txheader.h | ||