Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e800072c authored by David S. Miller's avatar David S. Miller
Browse files

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



In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e8ed77df b507146b

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ Jean Tourrilhes <jt@hpl.hp.com> 
Jeff Garzik <jgarzik@pretzel.yyz.us>

Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

<josh@joshtriplett.org> <josh@freedesktop.org>

<josh@joshtriplett.org> <josh@kernel.org>

Documentation/devicetree/bindings/ata/ahci-platform.txt

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ Optional properties: 
- target-supply     : regulator for SATA target power

- phys              : reference to the SATA PHY node

- phy-names         : must be "sata-phy"

- ports-implemented : Mask that indicates which ports that the HBA supports

		      are available for software to use. Useful if PORTS_IMPL

		      is not programmed by the BIOS, which is true with

		      some embedded SOC's.



Required properties when using sub-nodes:

- #address-cells    : number of cells to encode an address

Documentation/networking/checksum-offloads.txt

+7 −7
Original line number Diff line number Diff line
@@ -69,18 +69,18 @@ LCO: Local Checksum Offload 
LCO is a technique for efficiently computing the outer checksum of an

 encapsulated datagram when the inner checksum is due to be offloaded.

The ones-complement sum of a correctly checksummed TCP or UDP packet is

 equal to the sum of the pseudo header, because everything else gets

 'cancelled out' by the checksum field.  This is because the sum was

 equal to the complement of the sum of the pseudo header, because everything

 else gets 'cancelled out' by the checksum field.  This is because the sum was

 complemented before being written to the checksum field.

More generally, this holds in any case where the 'IP-style' ones complement

 checksum is used, and thus any checksum that TX Checksum Offload supports.

That is, if we have set up TX Checksum Offload with a start/offset pair, we

 know that _after the device has filled in that checksum_, the ones

 know that after the device has filled in that checksum, the ones

 complement sum from csum_start to the end of the packet will be equal to

 _whatever value we put in the checksum field beforehand_.  This allows us

 to compute the outer checksum without looking at the payload: we simply

 stop summing when we get to csum_start, then add the 16-bit word at

 (csum_start + csum_offset).

 the complement of whatever value we put in the checksum field beforehand.

 This allows us to compute the outer checksum without looking at the payload:

 we simply stop summing when we get to csum_start, then add the complement of

 the 16-bit word at (csum_start + csum_offset).

Then, when the true inner checksum is filled in (either by hardware or by

 skb_checksum_help()), the outer checksum will become correct by virtue of

 the arithmetic.

MAINTAINERS

+27 −27
Original line number Diff line number Diff line
@@ -872,9 +872,9 @@ F: drivers/perf/arm_pmu.c 
F:	include/linux/perf/arm_pmu.h



ARM PORT

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.arm.linux.org.uk/

W:	http://www.armlinux.org.uk/

S:	Maintained

F:	arch/arm/
@@ -886,35 +886,35 @@ F: arch/arm/plat-*/ 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git



ARM PRIMECELL AACI PL041 DRIVER

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

S:	Maintained

F:	sound/arm/aaci.*



ARM PRIMECELL CLCD PL110 DRIVER

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

S:	Maintained

F:	drivers/video/fbdev/amba-clcd.*



ARM PRIMECELL KMI PL050 DRIVER

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

S:	Maintained

F:	drivers/input/serio/ambakmi.*

F:	include/linux/amba/kmi.h



ARM PRIMECELL MMCI PL180/1 DRIVER

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

S:	Maintained

F:	drivers/mmc/host/mmci.*

F:	include/linux/amba/mmci.h



ARM PRIMECELL UART PL010 AND PL011 DRIVERS

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

S:	Maintained

F:	drivers/tty/serial/amba-pl01*.c

F:	include/linux/amba/serial.h



ARM PRIMECELL BUS SUPPORT

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

S:	Maintained

F:	drivers/amba/

F:	include/linux/amba/bus.h
@@ -1036,7 +1036,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained



ARM/CLKDEV SUPPORT

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/include/asm/clkdev.h
@@ -1093,9 +1093,9 @@ F: arch/arm/boot/dts/cx92755* 
N:	digicolor



ARM/EBSA110 MACHINE SUPPORT

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.arm.linux.org.uk/

W:	http://www.armlinux.org.uk/

S:	Maintained

F:	arch/arm/mach-ebsa110/

F:	drivers/net/ethernet/amd/am79c961a.*
@@ -1124,9 +1124,9 @@ T: git git://git.berlios.de/gemini-board 
F:	arch/arm/mm/*-fa*



ARM/FOOTBRIDGE ARCHITECTURE

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.arm.linux.org.uk/

W:	http://www.armlinux.org.uk/

S:	Maintained

F:	arch/arm/include/asm/hardware/dec21285.h

F:	arch/arm/mach-footbridge/
@@ -1457,7 +1457,7 @@ S: Maintained 
ARM/PT DIGITAL BOARD PORT

M:	Stefan Eletzhofer <stefan.eletzhofer@eletztrick.de>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.arm.linux.org.uk/

W:	http://www.armlinux.org.uk/

S:	Maintained



ARM/QUALCOMM SUPPORT
@@ -1493,9 +1493,9 @@ S: Supported 
F:	arch/arm64/boot/dts/renesas/



ARM/RISCPC ARCHITECTURE

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.arm.linux.org.uk/

W:	http://www.armlinux.org.uk/

S:	Maintained

F:	arch/arm/include/asm/hardware/entry-macro-iomd.S

F:	arch/arm/include/asm/hardware/ioc.h
@@ -1773,9 +1773,9 @@ F: drivers/clk/versatile/clk-vexpress-osc.c 
F:	drivers/clocksource/versatile.c



ARM/VFP SUPPORT

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.arm.linux.org.uk/

W:	http://www.armlinux.org.uk/

S:	Maintained

F:	arch/arm/vfp/
@@ -2924,7 +2924,7 @@ F: mm/cleancache.c 
F:	include/linux/cleancache.h



CLK API

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

L:	linux-clk@vger.kernel.org

S:	Maintained

F:	include/linux/clk.h
@@ -3358,9 +3358,9 @@ S: Supported 
F:	drivers/net/ethernet/stmicro/stmmac/



CYBERPRO FB DRIVER

M:	Russell King <linux@arm.linux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.arm.linux.org.uk/

W:	http://www.armlinux.org.uk/

S:	Maintained

F:	drivers/video/fbdev/cyber2000fb.*
@@ -3885,7 +3885,7 @@ F: Documentation/devicetree/bindings/display/st,stih4xx.txt 


DRM DRIVERS FOR VIVANTE GPU IP

M:	Lucas Stach <l.stach@pengutronix.de>

R:	Russell King <linux+etnaviv@arm.linux.org.uk>

R:	Russell King <linux+etnaviv@armlinux.org.uk>

R:	Christian Gmeiner <christian.gmeiner@gmail.com>

L:	dri-devel@lists.freedesktop.org

S:	Maintained
@@ -4227,8 +4227,8 @@ F: Documentation/efi-stub.txt 
F:	arch/ia64/kernel/efi.c

F:	arch/x86/boot/compressed/eboot.[ch]

F:	arch/x86/include/asm/efi.h

F:	arch/x86/platform/efi/*

F:	drivers/firmware/efi/*

F:	arch/x86/platform/efi/

F:	drivers/firmware/efi/

F:	include/linux/efi*.h



EFI VARIABLE FILESYSTEM
@@ -6902,7 +6902,7 @@ L: linux-man@vger.kernel.org 
S:	Maintained



MARVELL ARMADA DRM SUPPORT

M:	Russell King <rmk+kernel@arm.linux.org.uk>

M:	Russell King <rmk+kernel@armlinux.org.uk>

S:	Maintained

F:	drivers/gpu/drm/armada/
@@ -7902,7 +7902,7 @@ S: Supported 
F:	drivers/nfc/nxp-nci



NXP TDA998X DRM DRIVER

M:	Russell King <rmk+kernel@arm.linux.org.uk>

M:	Russell King <rmk+kernel@armlinux.org.uk>

S:	Supported

F:	drivers/gpu/drm/i2c/tda998x_drv.c

F:	include/drm/i2c/tda998x.h
@@ -7975,7 +7975,7 @@ F: arch/arm/*omap*/*pm* 
F:	drivers/cpufreq/omap-cpufreq.c



OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT

M:	Rajendra Nayak <rnayak@ti.com>

M:	Rajendra Nayak <rnayak@codeaurora.org>

M:	Paul Walmsley <paul@pwsan.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 6

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Charred Weasel



# *DOCUMENTATION*