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

Commit 471422f3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18.7 into android-3.18 



Changes in 3.18.7:
	gpio: sysfs: fix memory leak in gpiod_export_link
	gpio: sysfs: fix memory leak in gpiod_sysfs_set_active_low
	gpio: mcp23s08: handle default gpio base
	PCI: designware: Reject MSI-X IRQs
	PCI: Add NEC variants to Stratus ftServer PCIe DMI check
	PCI: Handle read-only BARs on AMD CS553x devices
	spi: spi-fsl-dspi: Remove usage of devm_kzalloc
	spi: imx: use pio mode for i.mx6dl
	sd: Fix max transfer length for 4k disks
	MIPS: Fix C0_Pagegrain[IEC] support.
	MIPS: IRQ: Fix disable_irq on CPU IRQs
	MIPS: OCTEON: fix kernel crash when offlining a CPU
	MIPS: Fix kernel lockup or crash after CPU offline/online
	MIPS: mipsregs.h: Add write_32bit_cp1_register()
	MIPS: traps: Fix inline asm ctc1 missing .set hardfloat
	ARM: 8299/1: mm: ensure local active ASID is marked as allocated on rollover
	Complete oplock break jobs before closing file handle
	md/raid5: fix another livelock caused by non-aligned writes.
	mm: pagewalk: call pte_hole() for VM_PFNMAP during walk_page_range
	lib/checksum.c: fix carry in csum_tcpudp_nofold
	memcg, shmem: fix shmem migration to use lrucare
	nilfs2: fix deadlock of segment constructor over I_SYNC flag
	drm/radeon: don't init gpuvm if accel is disabled (v3)
	drm/radeon: fix PLLs on RS880 and older v2
	drm/radeon: fix the crash in benchmark functions
	drm/radeon: fix the crash in test functions
	drm/radeon: properly set vm fragment size for TN/RL
	kconfig: Fix warning "‘jump’ may be used uninitialized"
	arm64: Fix up /proc/cpuinfo
	lib/checksum.c: fix build for generic csum_tcpudp_nofold
	ASoC: atmel_ssc_dai: fix start event for I2S mode
	ASoC: sgtl5000: add delay before first I2C access
	ALSA: ak411x: Fix stall in work callback
	ARM: dts: Fix I2S1, I2S2 compatible for exynos4 SoCs
	x86, microcode: Return error from driver init code when loader is disabled
	smpboot: Add missing get_online_cpus() in smpboot_register_percpu_thread()
	hrtimer: Fix incorrect tai offset calculation for non high-res timer systems
	tracing: Add condition check to RCU lockdep checks
	x86/tlb/trace: Do not trace on CPU that is offline
	x86: mm: move mmap_sem unlock from mm_fault_error() to caller
	Linux 3.18.7

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 6e96a859 a17f9bf1

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 6

SUBLEVEL = 7

EXTRAVERSION =

NAME = Shuffling Zombie Juror

arch/arm/boot/dts/exynos4.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ 
	};



	i2s1: i2s@13960000 {

		compatible = "samsung,s5pv210-i2s";

		compatible = "samsung,s3c6410-i2s";

		reg = <0x13960000 0x100>;

		clocks = <&clock CLK_I2S1>;

		clock-names = "iis";
@@ -378,7 +378,7 @@ 
	};



	i2s2: i2s@13970000 {

		compatible = "samsung,s5pv210-i2s";

		compatible = "samsung,s3c6410-i2s";

		reg = <0x13970000 0x100>;

		clocks = <&clock CLK_I2S2>;

		clock-names = "iis";

arch/arm/mm/context.c

+11 −15
Original line number Diff line number Diff line
@@ -144,9 +144,6 @@ static void flush_context(unsigned int cpu) 
	/* Update the list of reserved ASIDs and the ASID bitmap. */

	bitmap_clear(asid_map, 0, NUM_USER_ASIDS);

	for_each_possible_cpu(i) {

		if (i == cpu) {

			asid = 0;

		} else {

		asid = atomic64_xchg(&per_cpu(active_asids, i), 0);

		/*

		 * If this CPU has already been through a
@@ -158,7 +155,6 @@ static void flush_context(unsigned int cpu) 
		if (asid == 0)

			asid = per_cpu(reserved_asids, i);

		__set_bit(asid & ~ASID_MASK, asid_map);

		}

		per_cpu(reserved_asids, i) = asid;

	}

arch/arm64/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <linux/of_fdt.h>

#include <linux/of_platform.h>

#include <linux/efi.h>

#include <linux/personality.h>



#include <asm/fixmap.h>

#include <asm/cpu.h>

arch/mips/cavium-octeon/smp.c

+0 −2
Original line number Diff line number Diff line
@@ -240,9 +240,7 @@ static int octeon_cpu_disable(void) 


	set_cpu_online(cpu, false);

	cpu_clear(cpu, cpu_callin_map);

	local_irq_disable();

	octeon_fixup_irqs();

	local_irq_enable();



	flush_cache_all();

	local_flush_tlb_all();