kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Browse source 
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>
This commit is contained in:
Jakub Kicinski 2021-06-18 19:47:02 -07:00
commit adc2e56ebe
858 changed files with 9191 additions and 4065 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/ptp_clock_kernel.h
View file

@ -191,7 +191,7 @@ struct ptp_clock_event {
*
* @ppm: Parts per million, but with a 16 bit binary fractional field
*/
static inline s32 scaled_ppm_to_ppb(long ppm)
static inline long scaled_ppm_to_ppb(long ppm)
{
/*
* The 'freq' field in the 'struct timex' is in parts per
@ -209,7 +209,7 @@ static inline s32 scaled_ppm_to_ppb(long ppm)
ppb *= 125;
ppb >>= 13;
return (s32)ppb;
return (long)ppb;
}
#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)