Commit 56495a24 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 657bc1d1 4d02da97

.mailmap

+4 −1
Original line number Diff line number Diff line
@@ -82,7 +82,10 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com> 
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>

<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>

Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Dmitry Baryshkov <dbaryshkov@gmail.com>

Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>

Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>

Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_eremin@mentor.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>

Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>

CREDITS

+36 −26
Original line number Diff line number Diff line
@@ -849,6 +849,12 @@ D: trivial hack to add variable address length routing to Rose. 
D: AX25-HOWTO, HAM-HOWTO, IPX-HOWTO, NET-2-HOWTO

D: ax25-utils maintainer.



N: Kamil Debski

E: kamil@wypas.org

D: Samsung S5P 2D graphics acceleration and Multi Format Codec drivers

D: Samsung USB2 phy drivers

D: PWM fan driver



N: Helge Deller

E: deller@gmx.de

W: http://www.parisc-linux.org/
@@ -2843,6 +2849,10 @@ D: IPX development and support 
N: Venkatesh Pallipadi (Venki)

D: x86/HPET



N: Kyungmin Park

E: kyungmin.park@samsung.com

D: Samsung S5Pv210 and Exynos4210 mobile platforms



N: David Parsons

E: orc@pell.chi.il.us

D: improved memory detection code.

Documentation/admin-guide/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -2858,6 +2858,8 @@ 
					       mds=off [X86]

					       tsx_async_abort=off [X86]

					       kvm.nx_huge_pages=off [X86]

					       no_entry_flush [PPC]

					       no_uaccess_flush [PPC]



				Exceptions:

					       This does not have any effect on
@@ -3186,6 +3188,8 @@ 


	noefi		Disable EFI runtime services support.



	no_entry_flush  [PPC] Don't flush the L1-D cache when entering the kernel.



	noexec		[IA-64]



	noexec		[X86]
@@ -3235,6 +3239,9 @@ 
	nospec_store_bypass_disable

			[HW] Disable all mitigations for the Speculative Store Bypass vulnerability



	no_uaccess_flush

	                [PPC] Don't flush the L1-D cache after accessing user data.



	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.

Documentation/dev-tools/kunit/faq.rst

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ things to try. 
   re-run kunit_tool.

5. Try to run ``make ARCH=um defconfig`` before running ``kunit.py run``. This

   may help clean up any residual config items which could be causing problems.

6. Finally, try running KUnit outside UML. KUnit and KUnit tests can run be

6. Finally, try running KUnit outside UML. KUnit and KUnit tests can be

   built into any kernel, or can be built as a module and loaded at runtime.

   Doing so should allow you to determine if UML is causing the issue you're

   seeing. When tests are built-in, they will execute when the kernel boots, and

Documentation/dev-tools/kunit/style.rst

+9 −9
Original line number Diff line number Diff line
@@ -183,9 +183,9 @@ An example Kconfig entry: 
		  This builds unit tests for foo.



		  For more information on KUnit and unit tests in general, please refer

                    to the KUnit documentation in Documentation/dev-tools/kunit

		  to the KUnit documentation in Documentation/dev-tools/kunit/.



                    If unsure, say N

		  If unsure, say N.





Test File and Module Names