mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-13 23:26:41 +07:00
6b6cbc1471
Conflicts were simply overlapping changes. In the net/ipv4/route.c case the code had simply moved around a little bit and the same fix was made in both 'net' and 'net-next'. In the net/sched/sch_generic.c case a fix in 'net' happened at the same time that a new argument was added to qdisc_hash_add(). Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
function | ||
legacy | ||
udc | ||
composite.c | ||
config.c | ||
configfs.c | ||
configfs.h | ||
epautoconf.c | ||
functions.c | ||
Kconfig | ||
Makefile | ||
u_f.c | ||
u_f.h | ||
u_os_desc.h | ||
usbstring.c |