linux/tools/include/uapi
Jakub Kicinski adc2e56ebe Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
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>
2021-06-18 19:47:02 -07:00
..
asm ia64: tools: remove inclusion of ia64-specific version of errno.h header 2021-04-16 16:10:37 -07:00
asm-generic tools headers UAPI: Sync files changed by landlock, quotactl_path and mount_settattr new syscalls 2021-05-10 09:01:00 -03:00
drm tools headers UAPI: Sync drm/i915_drm.h with the kernel sources 2021-05-10 09:00:59 -03:00
linux Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-06-18 19:47:02 -07:00
sound tools include UAPI: Sync sound/asound.h copy 2020-02-12 11:04:23 -03:00