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

Commit 1e525b68 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.19.31 (bb418a14) into msm-4.19"

parents 38e82d2e 6f910c4e

Documentation/arm64/silicon-errata.txt

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ stable kernels. 


| Implementor    | Component       | Erratum ID      | Kconfig                     |

+----------------+-----------------+-----------------+-----------------------------+

| Allwinner      | A64/R18         | UNKNOWN1        | SUN50I_ERRATUM_UNKNOWN1     |

|                |                 |                 |                             |

| ARM            | Cortex-A53      | #826319         | ARM64_ERRATUM_826319        |

| ARM            | Cortex-A53      | #827319         | ARM64_ERRATUM_827319        |

| ARM            | Cortex-A53      | #824069         | ARM64_ERRATUM_824069        |

Documentation/process/stable-kernel-rules.rst

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ Procedure for submitting patches to the -stable tree 
 - If the patch covers files in net/ or drivers/net please follow netdev stable

   submission guidelines as described in

   :ref:`Documentation/networking/netdev-FAQ.rst <netdev-FAQ>`

   after first checking the stable networking queue at

   https://patchwork.ozlabs.org/bundle/davem/stable/?series=&submitter=&state=*&q=&archive=

   to ensure the requested patch is not already queued up.

 - Security patches should not be handled (solely) by the -stable review

   process but should follow the procedures in

   :ref:`Documentation/admin-guide/security-bugs.rst <securitybugs>`.

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 30

SUBLEVEL = 31

EXTRAVERSION =

NAME = "People's Front"

arch/arc/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -420,6 +420,14 @@ config ARC_HAS_ACCL_REGS 
	  (also referred to as r58:r59). These can also be used by gcc as GPR so

	  kernel needs to save/restore per process



config ARC_IRQ_NO_AUTOSAVE

	bool "Disable hardware autosave regfile on interrupts"

	default n

	help

	  On HS cores, taken interrupt auto saves the regfile on stack.

	  This is programmable and can be optionally disabled in which case

	  software INTERRUPT_PROLOGUE/EPILGUE do the needed work



endif	# ISA_ARCV2



endmenu   # "ARC CPU Configuration"

arch/arc/include/asm/arcregs.h

+8 −0
Original line number Diff line number Diff line
@@ -151,6 +151,14 @@ struct bcr_isa_arcv2 { 
#endif

};



struct bcr_uarch_build_arcv2 {

#ifdef CONFIG_CPU_BIG_ENDIAN

	unsigned int pad:8, prod:8, maj:8, min:8;

#else

	unsigned int min:8, maj:8, prod:8, pad:8;

#endif

};



struct bcr_mpy {

#ifdef CONFIG_CPU_BIG_ENDIAN

	unsigned int pad:8, x1616:8, dsp:4, cycles:2, type:2, ver:8;