mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
c0cc53162a
Minor overlapping changes in the conflicts. In the macsec case, the change of the default ID macro name overlapped with the 64-bit netlink attribute alignment fixes in net-next. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
cxgb3 | ||
cxgb4 | ||
i40iw | ||
mlx4 | ||
mlx5 | ||
mthca | ||
nes | ||
ocrdma | ||
qib | ||
usnic | ||
Makefile |