Skip to content
  • Stephen Rothwell's avatar
    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git · 2c85ef42
    Stephen Rothwell authored
    # Conflicts:
    #	arch/arm64/include/asm/vdso/compat_gettimeofday.h
    #	arch/arm64/include/asm/vdso/vsyscall.h
    #	arch/powerpc/include/asm/vdso/gettimeofday.h
    #	arch/riscv/include/asm/io.h
    #	arch/s390/kernel/time.c
    #	arch/x86/include/asm/vdso/getrandom.h
    #	arch/x86/include/asm/vdso/gettimeofday.h
    #	arch/x86/kernel/paravirt.c
    #	arch/x86/mm/pgtable.c
    #	drivers/gpu/drm/i915/i915_pmu.c
    #	drivers/mailbox/mailbox.c
    #	include/asm-generic/vdso/vsyscall.h
    #	include/vdso/datapage.h
    #	include/vdso/helpers.h
    #	kernel/sysctl.c
    #	kernel/time/namespace.c
    #	kernel/time/vsyscall.c
    #	lib/vdso/datastore.c
    #	lib/vdso/gettimeofday.c
    #	net/core/dev.c
    2c85ef42
Loading