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

Commit f654f0fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "14 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  kernel/sysctl.c: fix out-of-bounds access when setting file-max
  mm/util.c: fix strndup_user() comment
  sh: fix multiple function definition build errors
  MAINTAINERS: add maintainer and replacing reviewer ARM/NUVOTON NPCM
  MAINTAINERS: fix bad pattern in ARM/NUVOTON NPCM
  mm: writeback: use exact memcg dirty counts
  psi: clarify the units used in pressure files
  mm/huge_memory.c: fix modifying of page protection by insert_pfn_pmd()
  hugetlbfs: fix memory leak for resv_map
  mm: fix vm_fault_t cast in VM_FAULT_GET_HINDEX()
  lib/lzo: fix bugs for very short or empty input
  include/linux/bitrev.h: fix constant bitrev
  kmemleak: powerpc: skip scanning holes in the .bss section
  lib/string.c: implement a basic bcmp
parents 4f1cbe07 9002b214

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

=================

Documentation/lzo.txt

+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 ]

MAINTAINERS

+3 −2
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*

arch/powerpc/kernel/kvm.c

+7 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/kvm_host.h>

#include <linux/init.h>

#include <linux/export.h>

#include <linux/kmemleak.h>

#include <linux/kvm_para.h>

#include <linux/slab.h>

#include <linux/of.h>
@@ -712,6 +713,12 @@ static void kvm_use_magic_page(void) 


static __init void kvm_free_tmp(void)

{

	/*

	 * Inform kmemleak about the hole in the .bss section since the

	 * corresponding pages will be unmapped with DEBUG_PAGEALLOC=y.

	 */

	kmemleak_free_part(&kvm_tmp[kvm_tmp_index],

			   ARRAY_SIZE(kvm_tmp) - kvm_tmp_index);

	free_reserved_area(&kvm_tmp[kvm_tmp_index],

			   &kvm_tmp[ARRAY_SIZE(kvm_tmp)], -1, NULL);

}

arch/sh/boards/of-generic.c

+2 −2
Original line number Diff line number Diff line
@@ -164,10 +164,10 @@ static struct sh_machine_vector __initmv sh_of_generic_mv = { 


struct sh_clk_ops;



void __init arch_init_clk_ops(struct sh_clk_ops **ops, int idx)

void __init __weak arch_init_clk_ops(struct sh_clk_ops **ops, int idx)

{

}



void __init plat_irq_setup(void)

void __init __weak plat_irq_setup(void)

{

}