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

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

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



Overlapping changes all over.

The mini-qdisc bits were a little bit tricky, however.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7018d1b3 8cbab92d

Documentation/ABI/testing/sysfs-devices-system-cpu

+16 −0
Original line number Diff line number Diff line
@@ -375,3 +375,19 @@ Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org> 
Description:	information about CPUs heterogeneity.



		cpu_capacity: capacity of cpu#.



What:		/sys/devices/system/cpu/vulnerabilities

		/sys/devices/system/cpu/vulnerabilities/meltdown

		/sys/devices/system/cpu/vulnerabilities/spectre_v1

		/sys/devices/system/cpu/vulnerabilities/spectre_v2

Date:		January 2018

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Information about CPU vulnerabilities



		The files are named after the code names of CPU

		vulnerabilities. The output of those files reflects the

		state of the CPUs in the system. Possible output values:



		"Not affected"	  CPU is not affected by the vulnerability

		"Vulnerable"	  CPU is affected and no mitigation in effect

		"Mitigation: $M"  CPU is affected and mitigation $M is in effect

Documentation/admin-guide/kernel-parameters.txt

+48 −10
Original line number Diff line number Diff line
@@ -713,9 +713,6 @@ 
			It will be ignored when crashkernel=X,high is not used

			or memory reserved is below 4G.



	crossrelease_fullstack

			[KNL] Allow to record full stack trace in cross-release



	cryptomgr.notests

                        [KNL] Disable crypto self-tests
@@ -2626,6 +2623,11 @@ 
	nosmt		[KNL,S390] Disable symmetric multithreading (SMT).

			Equivalent to smt=1.



	nospectre_v2	[X86] Disable all mitigations for the Spectre variant 2

			(indirect branch prediction) vulnerability. System may

			allow data leaks with this option, which is equivalent

			to spectre_v2=off.



	noxsave		[BUGS=X86] Disables x86 extended register state save

			and restore using xsave. The kernel will fallback to

			enabling legacy floating-point and sse state.
@@ -2712,8 +2714,6 @@ 
			steal time is computed, but won't influence scheduler

			behaviour



	nopti		[X86-64] Disable kernel page table isolation



	nolapic		[X86-32,APIC] Do not enable or use the local APIC.



	nolapic_timer	[X86-32,APIC] Do not use the local APIC timer.
@@ -3100,6 +3100,12 @@ 
		pcie_scan_all	Scan all possible PCIe devices.  Otherwise we

				only look for one device below a PCIe downstream

				port.

		big_root_window	Try to add a big 64bit memory window to the PCIe

				root complex on AMD CPUs. Some GFX hardware

				can resize a BAR to allow access to all VRAM.

				Adding the window is slightly risky (it may

				conflict with unreported devices), so this

				taints the kernel.



	pcie_aspm=	[PCIE] Forcibly enable or disable PCIe Active State Power

			Management.
@@ -3288,11 +3294,20 @@ 
	pt.		[PARIDE]

			See Documentation/blockdev/paride.txt.



	pti=		[X86_64]

			Control user/kernel address space isolation:

			on - enable

			off - disable

			auto - default setting

	pti=		[X86_64] Control Page Table Isolation of user and

			kernel address spaces.  Disabling this feature

			removes hardening, but improves performance of

			system calls and interrupts.



			on   - unconditionally enable

			off  - unconditionally disable

			auto - kernel detects whether your CPU model is

			       vulnerable to issues that PTI mitigates



			Not specifying this option is equivalent to pti=auto.



	nopti		[X86_64]

			Equivalent to pti=off



	pty.legacy_count=

			[KNL] Number of legacy pty's. Overwrites compiled-in
@@ -3943,6 +3958,29 @@ 
	sonypi.*=	[HW] Sony Programmable I/O Control Device driver

			See Documentation/laptops/sonypi.txt



	spectre_v2=	[X86] Control mitigation of Spectre variant 2

			(indirect branch speculation) vulnerability.



			on   - unconditionally enable

			off  - unconditionally disable

			auto - kernel detects whether your CPU model is

			       vulnerable



			Selecting 'on' will, and 'auto' may, choose a

			mitigation method at run time according to the

			CPU, the available microcode, the setting of the

			CONFIG_RETPOLINE configuration option, and the

			compiler with which the kernel was built.



			Specific mitigations can also be selected manually:



			retpoline	  - replace indirect branches

			retpoline,generic - google's original retpoline

			retpoline,amd     - AMD-specific minimal thunk



			Not specifying this option is equivalent to

			spectre_v2=auto.



	spia_io_base=	[HW,MTD]

	spia_fio_base=

	spia_pedr=

Documentation/filesystems/nilfs2.txt

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ available from the following download page. At least "mkfs.nilfs2", 
cleaner or garbage collector) are required.  Details on the tools are

described in the man pages included in the package.



Project web page:    http://nilfs.sourceforge.net/

Download page:       http://nilfs.sourceforge.net/en/download.html

Project web page:    https://nilfs.sourceforge.io/

Download page:       https://nilfs.sourceforge.io/en/download.html

List info:           http://vger.kernel.org/vger-lists.html#linux-nilfs



Caveats

Documentation/kbuild/kconfig-language.txt

+15 −8
Original line number Diff line number Diff line
@@ -200,10 +200,14 @@ module state. Dependency expressions have the following syntax: 
<expr> ::= <symbol>                             (1)

           <symbol> '=' <symbol>                (2)

           <symbol> '!=' <symbol>               (3)

           '(' <expr> ')'                       (4)

           '!' <expr>                           (5)

           <expr> '&&' <expr>                   (6)

           <expr> '||' <expr>                   (7)

           <symbol1> '<' <symbol2>              (4)

           <symbol1> '>' <symbol2>              (4)

           <symbol1> '<=' <symbol2>             (4)

           <symbol1> '>=' <symbol2>             (4)

           '(' <expr> ')'                       (5)

           '!' <expr>                           (6)

           <expr> '&&' <expr>                   (7)

           <expr> '||' <expr>                   (8)



Expressions are listed in decreasing order of precedence.
@@ -214,10 +218,13 @@ Expressions are listed in decreasing order of precedence. 
    otherwise 'n'.

(3) If the values of both symbols are equal, it returns 'n',

    otherwise 'y'.

(4) Returns the value of the expression. Used to override precedence.

(5) Returns the result of (2-/expr/).

(6) Returns the result of min(/expr/, /expr/).

(7) Returns the result of max(/expr/, /expr/).

(4) If value of <symbol1> is respectively lower, greater, lower-or-equal,

    or greater-or-equal than value of <symbol2>, it returns 'y',

    otherwise 'n'.

(5) Returns the value of the expression. Used to override precedence.

(6) Returns the result of (2-/expr/).

(7) Returns the result of min(/expr/, /expr/).

(8) Returns the result of max(/expr/, /expr/).



An expression can have a value of 'n', 'm' or 'y' (or 0, 1, 2

respectively for calculations). A menu entry becomes visible when its

Documentation/usb/gadget-testing.txt

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ such specification consists of a number of lines with an inverval value 
in each line. The rules stated above are best illustrated with an example:



# mkdir functions/uvc.usb0/control/header/h

# cd functions/uvc.usb0/control/header/h

# cd functions/uvc.usb0/control/

# ln -s header/h class/fs

# ln -s header/h class/ss

# mkdir -p functions/uvc.usb0/streaming/uncompressed/u/360p