forked from luck/tmp_suning_uos_patched
2295cddf99
Minor conflicts in net/mptcp/protocol.h and tools/testing/selftests/net/Makefile. In both cases code was added on both sides in the same place so just keep both. Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
||
---|---|---|
.. | ||
gsi_private.h | ||
gsi_reg.h | ||
gsi_trans.c | ||
gsi_trans.h | ||
gsi.c | ||
gsi.h | ||
ipa_clock.c | ||
ipa_clock.h | ||
ipa_cmd.c | ||
ipa_cmd.h | ||
ipa_data-sc7180.c | ||
ipa_data-sdm845.c | ||
ipa_data.h | ||
ipa_endpoint.c | ||
ipa_endpoint.h | ||
ipa_gsi.c | ||
ipa_gsi.h | ||
ipa_interrupt.c | ||
ipa_interrupt.h | ||
ipa_main.c | ||
ipa_mem.c | ||
ipa_mem.h | ||
ipa_modem.c | ||
ipa_modem.h | ||
ipa_qmi_msg.c | ||
ipa_qmi_msg.h | ||
ipa_qmi.c | ||
ipa_qmi.h | ||
ipa_reg.c | ||
ipa_reg.h | ||
ipa_smp2p.c | ||
ipa_smp2p.h | ||
ipa_table.c | ||
ipa_table.h | ||
ipa_uc.c | ||
ipa_uc.h | ||
ipa_version.h | ||
ipa.h | ||
Kconfig | ||
Makefile |