Trivial conflict in net/core/filter.c, a locally computed
'sdif' is now an argument to the function.
Signed-off-by: 
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- CREDITS 4 additions, 0 deletionsCREDITS
- Documentation/core-api/xarray.rst 41 additions, 11 deletionsDocumentation/core-api/xarray.rst
- Documentation/devicetree/bindings/spi/spi-uniphier.txt 8 additions, 6 deletionsDocumentation/devicetree/bindings/spi/spi-uniphier.txt
- Documentation/input/event-codes.rst 1 addition, 10 deletionsDocumentation/input/event-codes.rst
- MAINTAINERS 63 additions, 3 deletionsMAINTAINERS
- Makefile 2 additions, 2 deletionsMakefile
- arch/arm64/net/bpf_jit_comp.c 17 additions, 9 deletionsarch/arm64/net/bpf_jit_comp.c
- arch/ia64/include/asm/numa.h 3 additions, 1 deletionarch/ia64/include/asm/numa.h
- arch/ia64/kernel/acpi.c 3 additions, 3 deletionsarch/ia64/kernel/acpi.c
- arch/ia64/mm/numa.c 6 additions, 0 deletionsarch/ia64/mm/numa.c
- arch/powerpc/kvm/book3s_hv.c 1 addition, 0 deletionsarch/powerpc/kvm/book3s_hv.c
- arch/powerpc/net/bpf_jit_comp64.c 38 additions, 19 deletionsarch/powerpc/net/bpf_jit_comp64.c
- arch/sparc/net/bpf_jit_comp_64.c 68 additions, 29 deletionsarch/sparc/net/bpf_jit_comp_64.c
- arch/x86/include/asm/kvm_host.h 2 additions, 1 deletionarch/x86/include/asm/kvm_host.h
- arch/x86/kvm/lapic.c 6 additions, 1 deletionarch/x86/kvm/lapic.c
- arch/x86/kvm/mmu.c 9 additions, 18 deletionsarch/x86/kvm/mmu.c
- arch/x86/kvm/svm.c 29 additions, 15 deletionsarch/x86/kvm/svm.c
- arch/x86/kvm/vmx.c 65 additions, 33 deletionsarch/x86/kvm/vmx.c
- arch/x86/kvm/x86.c 6 additions, 4 deletionsarch/x86/kvm/x86.c
- arch/xtensa/kernel/asm-offsets.c 8 additions, 8 deletionsarch/xtensa/kernel/asm-offsets.c
Loading
Please register or sign in to comment