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

Commit cf1de4e0 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.4.115 (aa856bd8) into msm-4.4"

parents 71de2d96 2fd547e8

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 114

SUBLEVEL = 115

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ config ARM64 
	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_BPF_JIT

	select HAVE_EBPF_JIT

	select HAVE_C_RECORDMCOUNT

	select HAVE_CC_STACKPROTECTOR

	select HAVE_CMPXCHG_DOUBLE

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ config S390 
	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE

	select HAVE_BPF_JIT if PACK_STACK && HAVE_MARCH_Z196_FEATURES

	select HAVE_EBPF_JIT if PACK_STACK && HAVE_MARCH_Z196_FEATURES

	select HAVE_CMPXCHG_DOUBLE

	select HAVE_CMPXCHG_LOCAL

	select HAVE_DEBUG_KMEMLEAK

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ config X86 
	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE

	select HAVE_ARCH_WITHIN_STACK_FRAMES

	select HAVE_EBPF_JIT			if X86_64

	select HAVE_CC_STACKPROTECTOR

	select HAVE_CMPXCHG_DOUBLE

	select HAVE_CMPXCHG_LOCAL

arch/x86/crypto/aesni-intel_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ static int helper_rfc4106_encrypt(struct aead_request *req) 


	if (sg_is_last(req->src) &&

	    req->src->offset + req->src->length <= PAGE_SIZE &&

	    sg_is_last(req->dst) &&

	    sg_is_last(req->dst) && req->dst->length &&

	    req->dst->offset + req->dst->length <= PAGE_SIZE) {

		one_entry_in_sg = 1;

		scatterwalk_start(&src_sg_walk, req->src);