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

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

Merge "Merge android-4.19-q.67 (dc878384) into msm-4.19"

parents 98d6de1a e6d80b29

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 66

SUBLEVEL = 67

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/bcm47094-linksys-panamera.dts

+3 −0
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ 
	};



	mdio-bus-mux {

		#address-cells = <1>;

		#size-cells = <0>;



		/* BIT(9) = 1 => external mdio */

		mdio_ext: mdio@200 {

			reg = <0x200>;

arch/arm/mach-davinci/sleep.S

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#define DEEPSLEEP_SLEEPENABLE_BIT	BIT(31)



	.text

	.arch	armv5te

/*

 * Move DaVinci into deep sleep state

 *

arch/powerpc/kvm/powerpc.c

+5 −0
Original line number Diff line number Diff line
@@ -61,6 +61,11 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *v) 
	return !!(v->arch.pending_exceptions) || kvm_request_pending(v);

}



bool kvm_arch_dy_runnable(struct kvm_vcpu *vcpu)

{

	return kvm_arch_vcpu_runnable(vcpu);

}



bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu)

{

	return false;

arch/s390/include/asm/page.h

+2 −0
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ static inline int devmem_is_allowed(unsigned long pfn) 
#define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | \

				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)



#define ARCH_ZONE_DMA_BITS	31



#include <asm-generic/memory_model.h>

#include <asm-generic/getorder.h>