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

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



xdp_umem.c had overlapping changes between the 64-bit math fix
for the calculation of npgs and the removal of the zerocopy
memory type which got rid of the chunk_size_nohdr member.

The mlx5 Kconfig conflict is a case where we just take the
net-next copy of the Kconfig entry dependency as it takes on
the ESWITCH dependency by one level of indirection which is
what the 'net' conflicting change is trying to ensure.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1079a34c bdc48fa1

Documentation/process/coding-style.rst

+14 −9
Original line number Diff line number Diff line
@@ -84,15 +84,20 @@ Get a decent editor and don't leave whitespace at the end of lines. 
Coding style is all about readability and maintainability using commonly

available tools.



The limit on the length of lines is 80 columns and this is a strongly

preferred limit.



Statements longer than 80 columns will be broken into sensible chunks, unless

exceeding 80 columns significantly increases readability and does not hide

information. Descendants are always substantially shorter than the parent and

are placed substantially to the right. The same applies to function headers

with a long argument list. However, never break user-visible strings such as

printk messages, because that breaks the ability to grep for them.

The preferred limit on the length of a single line is 80 columns.



Statements longer than 80 columns should be broken into sensible chunks,

unless exceeding 80 columns significantly increases readability and does

not hide information.



Descendants are always substantially shorter than the parent and are

are placed substantially to the right.  A very commonly used style

is to align descendants to a function open parenthesis.



These same rules are applied to function headers with a long argument list.



However, never break user-visible strings such as printk messages because

that breaks the ability to grep for them.





3) Placing Braces and Spaces

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 5

PATCHLEVEL = 7

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Kleptomaniac Octopus



# *DOCUMENTATION*

arch/arm/boot/compressed/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ SECTIONS 
  }

  .table : ALIGN(4) {

    _table_start = .;

    LONG(ZIMAGE_MAGIC(2))

    LONG(ZIMAGE_MAGIC(4))

    LONG(ZIMAGE_MAGIC(0x5a534c4b))

    LONG(ZIMAGE_MAGIC(__piggy_size_addr - _start))

    LONG(ZIMAGE_MAGIC(_kernel_bss_size))

arch/arm/boot/dts/am437x-gp-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ 


&cpsw_emac0 {

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-rxid";

};



&elm {

arch/arm/boot/dts/am437x-idk-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ 


&cpsw_emac0 {

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-rxid";

};



&rtc {

CRA Git | Maintained and supported by SUSTech CRA and CCSE