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

Browse source

Conflicts:
	drivers/net/vxlan.c
	drivers/vhost/net.c
	include/linux/if_vlan.h
	net/core/dev.c

The net/core/dev.c conflict was the overlap of one commit marking an
existing function static whilst another was adding a new function.

In the include/linux/if_vlan.h case, the type used for a local
variable was changed in 'net', whereas the function got rewritten
to fix a stacked vlan bug in 'net-next'.

In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next'
overlapped with an endainness fix for VHOST 1.0 in 'net'.

In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter
in 'net-next' whereas in 'net' there was a bug fix to pass in the
correct network namespace pointer in calls to this function.

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2015-02-05 14:33:28 -08:00

parent db79a62183 9d82f5eb33

commit 6e03f896b5

280 changed files with 2574 additions and 1653 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

Documentation/devicetree/bindings/i2c/i2c-st.txt

View file

1

Documentation/devicetree/bindings/i2c/trivial-devices.txt

View file

13

Documentation/networking/netlink_mmap.txt

View file

11

MAINTAINERS

View file

2

Makefile

View file

2

arch/alpha/mm/fault.c

View file

2

arch/arc/mm/fault.c

View file

39

arch/arm/boot/compressed/head.S

View file

20

arch/arm/boot/dts/sun4i-a10.dtsi

View file

6

arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts

View file

8

arch/arm/boot/dts/sun5i-a10s.dtsi

View file

4

arch/arm/boot/dts/sun5i-a13-hsg-h702.dts

View file

4

arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts

View file

4

arch/arm/boot/dts/sun5i-a13-olinuxino.dts

View file

9

arch/arm/boot/dts/sun5i-a13.dtsi

View file

6

arch/arm/boot/dts/sun6i-a31.dtsi

View file

6

arch/arm/boot/dts/sun7i-a20-bananapi.dts

View file

8

arch/arm/boot/dts/sun7i-a20-hummingbird.dts

View file

3

arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts

View file

8

arch/arm/boot/dts/sun7i-a20.dtsi

View file

4

arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts

View file

9

arch/arm/boot/dts/sun8i-a23.dtsi

View file

5

arch/arm/boot/dts/sun9i-a80-optimus.dts

View file

10

arch/arm/boot/dts/sun9i-a80.dtsi

View file

10

arch/arm/include/asm/kvm_emulate.h

View file

3

arch/arm/include/asm/kvm_host.h

View file

77

arch/arm/include/asm/kvm_mmu.h

View file

2

arch/arm/kernel/entry-v7m.S

View file

10

arch/arm/kvm/arm.c

View file

70

arch/arm/kvm/coproc.c

View file

6

arch/arm/kvm/coproc.h

View file

2

arch/arm/kvm/coproc_a15.c

View file

2

arch/arm/kvm/coproc_a7.c

View file

164

arch/arm/kvm/mmu.c

View file

39

arch/arm/kvm/trace.h

View file

7

arch/arm/mach-mvebu/coherency.c

View file

20

arch/arm/mach-shmobile/board-ape6evm.c

View file

13

arch/arm/mach-shmobile/board-lager.c

View file

2

arch/arm/mach-shmobile/setup-rcar-gen2.c

View file

12

arch/arm/mach-shmobile/timer.c

View file

1

arch/arm/mm/Kconfig

View file

26

arch/arm/mm/context.c

View file

62

arch/arm/mm/dma-mapping.c

View file

10

arch/arm64/include/asm/kvm_emulate.h

View file

3

arch/arm64/include/asm/kvm_host.h

View file

34

arch/arm64/include/asm/kvm_mmu.h

View file

75

arch/arm64/kvm/sys_regs.c

View file

2

arch/avr32/mm/fault.c

View file

2

arch/cris/mm/fault.c

View file

2

arch/frv/mm/fault.c

View file

2

arch/ia64/mm/fault.c

View file

2

arch/m32r/mm/fault.c

View file

2

arch/m68k/mm/fault.c

View file

2

arch/metag/mm/fault.c

View file

2

arch/microblaze/mm/fault.c

View file

2

arch/mips/mm/fault.c

View file

2

arch/mn10300/mm/fault.c

View file

2

arch/nios2/mm/fault.c

View file

2

arch/openrisc/mm/fault.c

View file

2

arch/parisc/mm/fault.c

View file

2

arch/powerpc/mm/copro_fault.c

View file

2

arch/powerpc/mm/fault.c

View file

6

arch/s390/mm/fault.c

View file

2

arch/score/mm/fault.c

View file

2

arch/sh/mm/fault.c

View file

2

arch/sparc/mm/fault_32.c

View file

2

arch/sparc/mm/fault_64.c

View file

2

arch/tile/mm/fault.c

View file

2

arch/um/kernel/trap.c

View file

1

arch/x86/kernel/cpu/perf_event_intel.c

View file

2

arch/x86/kernel/cpu/perf_event_intel_rapl.c

View file

9

arch/x86/kernel/cpu/perf_event_intel_uncore.c

View file

18

arch/x86/kernel/cpu/perf_event_intel_uncore.h

View file

3

arch/x86/kvm/lapic.c

View file

2

arch/x86/mm/fault.c

View file

16

arch/x86/pci/common.c

View file

2

arch/xtensa/mm/fault.c

View file

25

block/blk-mq-sysfs.c

View file

23

block/blk-mq.c

View file

2

block/blk-mq.h

View file

2

block/blk-sysfs.c

View file

2

drivers/Kconfig

View file

35

drivers/acpi/acpi_lpss.c

View file

25

drivers/block/rbd.c

View file

17

drivers/gpio/gpio-mcp23s08.c

View file

39

drivers/gpio/gpio-omap.c

View file

3

drivers/gpio/gpiolib-sysfs.c

View file

6

drivers/gpu/drm/amd/amdkfd/kfd_device.c

View file

78

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

View file

1

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h

View file

27

drivers/gpu/drm/amd/amdkfd/kfd_module.c

View file

2

drivers/gpu/drm/amd/amdkfd/kfd_pasid.c

View file

17

drivers/gpu/drm/amd/amdkfd/kfd_priv.h

View file

18

drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c

View file

3

drivers/gpu/drm/cirrus/cirrus_drv.c

View file

3

drivers/gpu/drm/cirrus/cirrus_drv.h

View file

2

drivers/gpu/drm/cirrus/cirrus_main.c

View file

9

drivers/gpu/drm/cirrus/cirrus_mode.c

View file

30

drivers/gpu/drm/drm_fb_helper.c

View file

52

drivers/gpu/drm/i2c/tda998x_drv.c

View file

Some files were not shown because too many files have changed in this diff Show more