adc2e56ebe
Trivial conflicts in net/can/isotp.c and tools/testing/selftests/net/mptcp/mptcp_connect.sh scaled_ppm_to_ppb() was moved from drivers/ptp/ptp_clock.c to include/linux/ptp_clock_kernel.h in -next so re-apply the fix there. Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
||
|---|---|---|
| .. | ||
| alchemy | ||
| ar7 | ||
| ath25 | ||
| ath79 | ||
| bcm47xx | ||
| bcm63xx | ||
| bmips | ||
| boot | ||
| cavium-octeon | ||
| cobalt | ||
| configs | ||
| crypto | ||
| dec | ||
| fw | ||
| generic | ||
| include | ||
| ingenic | ||
| jazz | ||
| kernel | ||
| kvm | ||
| lantiq | ||
| lib | ||
| loongson2ef | ||
| loongson32 | ||
| loongson64 | ||
| math-emu | ||
| mm | ||
| mti-malta | ||
| n64 | ||
| net | ||
| netlogic | ||
| pci | ||
| pic32 | ||
| pistachio | ||
| power | ||
| ralink | ||
| rb532 | ||
| sgi-ip22 | ||
| sgi-ip27 | ||
| sgi-ip30 | ||
| sgi-ip32 | ||
| sibyte | ||
| sni | ||
| tools | ||
| txx9 | ||
| vdso | ||
| vr41xx | ||
| Kbuild | ||
| Kbuild.platforms | ||
| Kconfig | ||
| Kconfig.debug | ||
| Makefile | ||
| Makefile.postlink | ||