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

Commit 13f9a373 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge commit 'v3.0' into x86/cpu

parents 17edf2d7 02f8c6ae

Documentation/filesystems/nilfs2.txt

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ Features which NILFS2 does not support yet: 
	- POSIX ACLs

	- quotas

	- fsck

	- resize

	- defragmentation



Mount options

Documentation/networking/ip-sysctl.txt

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ tcp_orphan_retries - INTEGER 
	when RTO retransmissions remain unacknowledged.

	See tcp_retries2 for more details.



	The default value is 7.

	The default value is 8.

	If your machine is a loaded WEB server,

	you should think about lowering this value, such sockets

	may consume significant resources. Cf. tcp_max_orphans.

Documentation/x86/boot.txt

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ Protocol: 2.10+ 


Field name:	init_size

Type:		read

Offset/size:	0x25c/4

Offset/size:	0x260/4



  This field indicates the amount of linear contiguous memory starting

  at the kernel runtime start address that the kernel needs before it

Makefile

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

PATCHLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION =

NAME = Sneaky Weasel



# *DOCUMENTATION*

arch/arm/mach-davinci/board-dm365-evm.c

+2 −2
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ static void __init evm_init_cpld(void) 
	 */

	if (have_imager()) {

		label = "HD imager";

		mux |= 1;

		mux |= 2;



		/* externally mux MMC1/ENET/AIC33 to imager */

		mux |= BIT(6) | BIT(5) | BIT(3);
@@ -540,7 +540,7 @@ static void __init evm_init_cpld(void) 
		resets &= ~BIT(1);



		if (have_tvp7002()) {

			mux |= 2;

			mux |= 1;

			resets &= ~BIT(2);

			label = "tvp7002 HD";

		} else {