mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18:45 +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> |
||
|---|---|---|
| .. | ||
| alchemy | ||
| ar7 | ||
| ath25 | ||
| ath79 | ||
| bcm47xx | ||
| bcm63xx | ||
| bmips | ||
| boot | ||
| cavium-octeon | ||
| cobalt | ||
| configs | ||
| dec | ||
| emma | ||
| fw | ||
| generic | ||
| include | ||
| jazz | ||
| jz4740 | ||
| kernel | ||
| kvm | ||
| lantiq | ||
| lasat | ||
| lib | ||
| loongson32 | ||
| loongson64 | ||
| math-emu | ||
| mm | ||
| mti-malta | ||
| net | ||
| netlogic | ||
| oprofile | ||
| paravirt | ||
| pci | ||
| pic32 | ||
| pistachio | ||
| pmcs-msp71xx | ||
| pnx833x | ||
| power | ||
| ralink | ||
| rb532 | ||
| sgi-ip22 | ||
| sgi-ip27 | ||
| sgi-ip32 | ||
| sibyte | ||
| sni | ||
| txx9 | ||
| vdso | ||
| vr41xx | ||
| xilfpga | ||
| Kbuild | ||
| Kbuild.platforms | ||
| Kconfig | ||
| Kconfig.debug | ||
| Makefile | ||
| Makefile.postlink | ||