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

Commit 291db2dc authored by Matt Wagantall's avatar Matt Wagantall
Browse files

Merge tag 'v3.18.6' into msm-3.18 



This is the 3.18.6 stable release

Resolve conflicts in arch_timer code related to inclusion of the
local change 22953ce9 ("ARM: arch_timer: resurrect cntpct for
MSM users") and upstream change b2f21d1b ("clocksource: arch_timer:
Only use the virtual counter (CNTVCT) on arm64"), as well as a
trivial context conflict in soc-compress.c.

Conflicts:
	drivers/clocksource/arm_arch_timer.c
	sound/soc/soc-compress.c

Change-Id: I1057739415e6fdbc450432fe8b5f5450cfd80a15
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parents 1725e323 99609149

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 5

SUBLEVEL = 6

EXTRAVERSION =

NAME = Shuffling Zombie Juror

arch/alpha/mm/fault.c

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ retry: 
	if (unlikely(fault & VM_FAULT_ERROR)) {

		if (fault & VM_FAULT_OOM)

			goto out_of_memory;

		else if (fault & VM_FAULT_SIGSEGV)

			goto bad_area;

		else if (fault & VM_FAULT_SIGBUS)

			goto do_sigbus;

		BUG();

arch/arc/mm/fault.c

+2 −0
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ good_area: 


	if (fault & VM_FAULT_OOM)

		goto out_of_memory;

	else if (fault & VM_FAULT_SIGSEGV)

		goto bad_area;

	else if (fault & VM_FAULT_SIGBUS)

		goto do_sigbus;

arch/arm/include/asm/xen/page.h

+4 −0
Original line number Diff line number Diff line
@@ -107,4 +107,8 @@ static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn) 
#define xen_remap(cookie, size) ioremap_cache((cookie), (size))

#define xen_unmap(cookie) iounmap((cookie))



bool xen_arch_need_swiotlb(struct device *dev,

			   unsigned long pfn,

			   unsigned long mfn);



#endif /* _ASM_ARM_XEN_PAGE_H */

arch/arm/mach-mvebu/coherency.c

+7 −0
Original line number Diff line number Diff line
@@ -341,6 +341,13 @@ static void __init armada_375_380_coherency_init(struct device_node *np) 
	coherency_cpu_base = of_iomap(np, 0);

	arch_ioremap_caller = armada_pcie_wa_ioremap_caller;



	/*

	 * We should switch the PL310 to I/O coherency mode only if

	 * I/O coherency is actually enabled.

	 */

	if (!coherency_available())

		return;



	/*

	 * Add the PL310 property "arm,io-coherent". This makes sure the

	 * outer sync operation is not used, which allows to