Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were simply overlapping changes. In the net/ipv4/route.c
case the code had simply moved around a little bit and the same fix
was made in both 'net' and 'net-next'.
In the net/sched/sch_generic.c case a fix in 'net' happened at
the same time that a new argument was added to qdisc_hash_add().
Signed-off-by:
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- .mailmap 3 additions, 0 deletions.mailmap
- Documentation/filesystems/Locking 1 addition, 2 deletionsDocumentation/filesystems/Locking
- Documentation/filesystems/porting 6 additions, 0 deletionsDocumentation/filesystems/porting
- Documentation/filesystems/vfs.txt 1 addition, 2 deletionsDocumentation/filesystems/vfs.txt
- Documentation/pinctrl.txt 7 additions, 1 deletionDocumentation/pinctrl.txt
- Documentation/process/stable-kernel-rules.rst 1 addition, 1 deletionDocumentation/process/stable-kernel-rules.rst
- Documentation/virtual/kvm/devices/arm-vgic.txt 6 additions, 0 deletionsDocumentation/virtual/kvm/devices/arm-vgic.txt
- MAINTAINERS 10 additions, 3 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/alpha/kernel/osf_sys.c 1 addition, 1 deletionarch/alpha/kernel/osf_sys.c
- arch/arm/kvm/arm.c 3 additions, 0 deletionsarch/arm/kvm/arm.c
- arch/arm/kvm/mmu.c 20 additions, 3 deletionsarch/arm/kvm/mmu.c
- arch/arm/mm/dma-mapping.c 19 additions, 1 deletionarch/arm/mm/dma-mapping.c
- arch/arm/mm/nommu.c 4 additions, 1 deletionarch/arm/mm/nommu.c
- arch/arm/probes/kprobes/core.c 38 additions, 11 deletionsarch/arm/probes/kprobes/core.c
- arch/arm/probes/kprobes/test-core.c 8 additions, 3 deletionsarch/arm/probes/kprobes/test-core.c
- arch/arm64/mm/fault.c 24 additions, 18 deletionsarch/arm64/mm/fault.c
- arch/arm64/mm/hugetlbpage.c 0 additions, 14 deletionsarch/arm64/mm/hugetlbpage.c
- arch/ia64/include/asm/asm-prototypes.h 29 additions, 0 deletionsarch/ia64/include/asm/asm-prototypes.h
- arch/ia64/lib/Makefile 8 additions, 8 deletionsarch/ia64/lib/Makefile
Please register or sign in to comment