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

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

Merge "Merge remote-tracking branch 'remotes/origin/tmp-0a91e84c' into msm-4.14"

parents dc9226c4 2ba985d8

Documentation/arm64/silicon-errata.txt

+2 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ stable kernels. 
| Hisilicon      | Hip0{5,6,7}     | #161010101      | HISILICON_ERRATUM_161010101 |

| Hisilicon      | Hip0{6,7}       | #161010701      | N/A                         |

|                |                 |                 |                             |

| Qualcomm Tech. | Falkor v1       | E1003           | QCOM_FALKOR_ERRATUM_1003    |

| Qualcomm Tech. | Kryo/Falkor v1  | E1003           | QCOM_FALKOR_ERRATUM_1003    |

| Qualcomm Tech. | Falkor v1       | E1009           | QCOM_FALKOR_ERRATUM_1009    |

| Qualcomm Tech. | QDF2400 ITS     | E0065           | QCOM_QDF2400_ERRATUM_0065   |

| Qualcomm Tech. | Falkor v{1,2}   | E1041           | QCOM_FALKOR_ERRATUM_1041    |

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 19

SUBLEVEL = 20

EXTRAVERSION =

NAME = Petit Gorille
@@ -420,7 +420,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/alpha/include/asm/futex.h

+4 −4
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
	"3:	.subsection 2\n"				\

	"4:	br	1b\n"					\

	"	.previous\n"					\

	EXC(1b,3b,%1,$31)					\

	EXC(2b,3b,%1,$31)					\

	EXC(1b,3b,$31,%1)					\

	EXC(2b,3b,$31,%1)					\

	:	"=&r" (oldval), "=&r"(ret)			\

	:	"r" (uaddr), "r"(oparg)				\

	:	"memory")
@@ -82,8 +82,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, 
	"3:	.subsection 2\n"

	"4:	br	1b\n"

	"	.previous\n"

	EXC(1b,3b,%0,$31)

	EXC(2b,3b,%0,$31)

	EXC(1b,3b,$31,%0)

	EXC(2b,3b,$31,%0)

	:	"+r"(ret), "=&r"(prev), "=&r"(cmp)

	:	"r"(uaddr), "r"((long)(int)oldval), "r"(newval)

	:	"memory");

arch/alpha/kernel/osf_sys.c

+2 −2
Original line number Diff line number Diff line
@@ -964,8 +964,8 @@ static inline long 
put_tv32(struct timeval32 __user *o, struct timeval *i)

{

	return copy_to_user(o, &(struct timeval32){

				.tv_sec = o->tv_sec,

				.tv_usec = o->tv_usec},

				.tv_sec = i->tv_sec,

				.tv_usec = i->tv_usec},

			    sizeof(struct timeval32));

}

arch/alpha/kernel/pci_impl.h

+2 −1
Original line number Diff line number Diff line
@@ -144,7 +144,8 @@ struct pci_iommu_arena 
};



#if defined(CONFIG_ALPHA_SRM) && \

    (defined(CONFIG_ALPHA_CIA) || defined(CONFIG_ALPHA_LCA))

    (defined(CONFIG_ALPHA_CIA) || defined(CONFIG_ALPHA_LCA) || \

     defined(CONFIG_ALPHA_AVANTI))

# define NEED_SRM_SAVE_RESTORE

#else

# undef NEED_SRM_SAVE_RESTORE