Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (310655b0) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/accounting/psi.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -56,12 +56,12 @@ situation from a state where some tasks are stalled but the CPU is
		still doing productive work. As such, time spent in this subset of the
		stall state is tracked separately and exported in the "full" averages.

		The ratios are tracked as recent trends over ten, sixty, and three
		hundred second windows, which gives insight into short term events as
		well as medium and long term trends. The total absolute stall time is
		tracked and exported as well, to allow detection of latency spikes
		which wouldn't necessarily make a dent in the time averages, or to
		average trends over custom time frames.
		The ratios (in %) are tracked as recent trends over ten, sixty, and
		three hundred second windows, which gives insight into short term events
		as well as medium and long term trends. The total absolute stall time
		(in us) is tracked and exported as well, to allow detection of latency
		spikes which wouldn't necessarily make a dent in the time averages,
		or to average trends over custom time frames.

		Cgroup2 interface
		=================

+5 −3

Original line number	Diff line number	Diff line
		@@ -102,9 +102,11 @@ Byte sequences
		dictionary which is empty, and that it will always be
		invalid at this place.

		17 : bitstream version. If the first byte is 17, the next byte
		gives the bitstream version (version 1 only). If the first byte
		is not 17, the bitstream version is 0.
		17 : bitstream version. If the first byte is 17, and compressed
		stream length is at least 5 bytes (length of shortest possible
		versioned bitstream), the next byte gives the bitstream version
		(version 1 only).
		Otherwise, the bitstream version is 0.

		18..21 : copy 0..3 literals
		state = (byte - 17) = 0..3 [ copy <state> literals ]

+4 −3

Original line number	Diff line number	Diff line
		@@ -1893,14 +1893,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
		ARM/NUVOTON NPCM ARCHITECTURE
		M: Avi Fishman <avifishman70@gmail.com>
		M: Tomer Maimon <tmaimon77@gmail.com>
		M: Tali Perry <tali.perry1@gmail.com>
		R: Patrick Venture <venture@google.com>
		R: Nancy Yuen <yuenn@google.com>
		R: Brendan Higgins <brendanhiggins@google.com>
		R: Benjamin Fair <benjaminfair@google.com>
		L: openbmc@lists.ozlabs.org (moderated for non-subscribers)
		S: Supported
		F: arch/arm/mach-npcm/
		F: arch/arm/boot/dts/nuvoton-npcm*
		F: include/dt-bindings/clock/nuvoton,npcm7xx-clks.h
		F: include/dt-bindings/clock/nuvoton,npcm7xx-clock.h
		F: drivers//npcm*
		F: Documentation/devicetree/bindings//npcm*
		F: Documentation/devicetree/bindings///npcm
		@@ -7518,7 +7519,7 @@ F: include/net/mac802154.h
		F: include/net/af_ieee802154.h
		F: include/net/cfg802154.h
		F: include/net/ieee802154_netdev.h
		F: Documentation/networking/ieee802154.txt
		F: Documentation/networking/ieee802154.rst

		IFE PROTOCOL
		M: Yotam Gigi <yotam.gi@gmail.com>

+1 −1

+3 −4

Original line number	Diff line number	Diff line
		@@ -55,12 +55,11 @@ syscall_set_return_value(struct task_struct task, struct pt_regs regs,
		*/
		static inline void
		syscall_get_arguments(struct task_struct task, struct pt_regs regs,
		unsigned int i, unsigned int n, unsigned long *args)
		unsigned long *args)
		{
		unsigned long *inside_ptregs = &(regs->r0);
		inside_ptregs -= i;

		BUG_ON((i + n) > 6);
		unsigned int n = 6;
		unsigned int i = 0;

		while (n--) {
		args[i++] = (*inside_ptregs);