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

Commit ff1591e9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9.121 (681e57bb) into msm-4.9"

parents 6af70c71 1f33e242

Documentation/Changes

+7 −12
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ GNU C 3.2 gcc --version 
GNU make               3.80             make --version

binutils               2.12             ld -v

util-linux             2.10o            fdformat --version

module-init-tools      0.9.10           depmod -V

kmod                   13               depmod -V

e2fsprogs              1.41.4           e2fsck -V

jfsutils               1.1.3            fsck.jfs -V

reiserfsprogs          3.6.3            reiserfsck -V
@@ -143,12 +143,6 @@ is not build with ``CONFIG_KALLSYMS`` and you have no way to rebuild and 
reproduce the Oops with that option, then you can still decode that Oops

with ksymoops.



Module-Init-Tools

-----------------



A new module loader is now in the kernel that requires ``module-init-tools``

to use.  It is backward compatible with the 2.4.x series kernels.



Mkinitrd

--------
@@ -363,16 +357,17 @@ Util-linux 


- <ftp://ftp.kernel.org/pub/linux/utils/util-linux/>



Kmod

----



- <https://www.kernel.org/pub/linux/utils/kernel/kmod/>

- <https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git>



Ksymoops

--------



- <ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/>



Module-Init-Tools

-----------------



- <ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/>



Mkinitrd

--------

Makefile

+3 −2
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 120

SUBLEVEL = 121

EXTRAVERSION =

NAME = Roaring Lionus
@@ -422,7 +422,8 @@ export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE 
export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS



export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS

export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_KASAN CFLAGS_UBSAN

export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE

export CFLAGS_KASAN CFLAGS_KASAN_NOSANITIZE CFLAGS_UBSAN

export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE

export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE

export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL

arch/arm64/mm/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -862,12 +862,12 @@ int pmd_clear_huge(pmd_t *pmd) 
	return 1;

}



int pud_free_pmd_page(pud_t *pud)

int pud_free_pmd_page(pud_t *pud, unsigned long addr)

{

	return pud_none(*pud);

}



int pmd_free_pte_page(pmd_t *pmd)

int pmd_free_pte_page(pmd_t *pmd, unsigned long addr)

{

	return pmd_none(*pmd);

}

arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ ENTRY(sha256_mb_mgr_get_comp_job_avx2) 
	vpinsrd	$1, _args_digest+1*32(state, idx, 4), %xmm0, %xmm0

	vpinsrd	$2, _args_digest+2*32(state, idx, 4), %xmm0, %xmm0

	vpinsrd	$3, _args_digest+3*32(state, idx, 4), %xmm0, %xmm0

	vmovd   _args_digest(state , idx, 4) , %xmm0

	vmovd	_args_digest+4*32(state, idx, 4), %xmm1

	vpinsrd	$1, _args_digest+5*32(state, idx, 4), %xmm1, %xmm1

	vpinsrd	$2, _args_digest+6*32(state, idx, 4), %xmm1, %xmm1

	vpinsrd	$3, _args_digest+7*32(state, idx, 4), %xmm1, %xmm1

arch/x86/include/asm/i8259.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _ASM_X86_I8259_H



#include <linux/delay.h>

#include <asm/io.h>



extern unsigned int cached_irq_mask;