Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next
Conflicts: drivers/iommu/Kconfig drivers/iommu/Makefile
No related branches found
No related tags found
Showing
- include/linux/quota.h 45 additions, 2 deletionsinclude/linux/quota.h
- include/linux/quotaops.h 2 additions, 2 deletionsinclude/linux/quotaops.h
- include/net/ip.h 6 additions, 5 deletionsinclude/net/ip.h
- include/trace/events/iommu.h 18 additions, 13 deletionsinclude/trace/events/iommu.h
- kernel/bpf/syscall.c 17 additions, 8 deletionskernel/bpf/syscall.c
- kernel/cgroup.c 1 addition, 1 deletionkernel/cgroup.c
- kernel/events/core.c 13 additions, 2 deletionskernel/events/core.c
- kernel/sched/core.c 2 additions, 3 deletionskernel/sched/core.c
- mm/gup.c 2 additions, 2 deletionsmm/gup.c
- mm/ksm.c 1 addition, 1 deletionmm/ksm.c
- mm/memcontrol.c 2 additions, 2 deletionsmm/memcontrol.c
- mm/memory.c 1 addition, 1 deletionmm/memory.c
- mm/page_alloc.c 35 additions, 47 deletionsmm/page_alloc.c
- mm/vmscan.c 1 addition, 1 deletionmm/vmscan.c
- net/dsa/slave.c 1 addition, 0 deletionsnet/dsa/slave.c
- net/ipv4/ip_forward.c 2 additions, 1 deletionnet/ipv4/ip_forward.c
- net/ipv4/ping.c 4 additions, 1 deletionnet/ipv4/ping.c
- net/ipv4/route.c 5 additions, 4 deletionsnet/ipv4/route.c
- net/ipv4/udp_diag.c 3 additions, 1 deletionnet/ipv4/udp_diag.c
- net/ipv6/ip6_fib.c 26 additions, 19 deletionsnet/ipv6/ip6_fib.c
Loading
Please register or sign in to comment