mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-01-27 09:14:43 +07:00
4fbef95af4
Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/usb/qmi_wwan.c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/netfilter/nf_conntrack_synproxy.h include/net/secure_seq.h The conflicts are of two varieties: 1) Conflicts with Joe Perches's 'extern' removal from header file function declarations. Usually it's an argument signature change or a function being added/removed. The resolutions are trivial. 2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds a new value, another changes an existing value. That sort of thing. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
a2mp.h | ||
amp.h | ||
bluetooth.h | ||
hci_core.h | ||
hci_mon.h | ||
hci.h | ||
l2cap.h | ||
mgmt.h | ||
rfcomm.h | ||
sco.h | ||
smp.h |