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

Commit 9252e333 authored by Chetan C R's avatar Chetan C R
Browse files

Merge google common 'android-3.18' into 'msm-3.18' 



Merge with google common 'android-3.18' at
c0f6f0e4 into 'msm-3.18'

* quic/tmp-c0f6f0e4:
  Linux 3.18.100
  fixup: sctp: verify size of a new chunk in _sctp_make_chunk()
  serial: 8250_pci: Add Brainboxes UC-260 4 port serial device
  staging: android: ashmem: Fix lockdep issue during llseek
  uas: fix comparison for error code
  tty/serial: atmel: add new version check for usart
  serial: sh-sci: prevent lockup on full TTY buffers
  x86: Treat R_X86_64_PLT32 as R_X86_64_PC32
  x86/module: Detect and skip invalid relocations
  scripts: recordmcount: break hardlinks
  ubi: Fix race condition between ubi volume creation and udev
  netfilter: ipv6: fix use-after-free Write in nf_nat_ipv6_manip_pkt
  netfilter: bridge: ebt_among: add missing match size checks
  netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets
  netfilter: IDLETIMER: be syzkaller friendly
  netfilter: nat: cope with negative port range
  netfilter: x_tables: fix missing timer initialization in xt_LED
  ALSA: seq: More protection for concurrent write and ioctl races
  ALSA: seq: Don't allow resizing pool in use
  x86/MCE: Serialize sysfs changes
  Input: matrix_keypad - fix race when disabling interrupts
  MIPS: BMIPS: Do not mask IPIs during suspend
  scsi: qla2xxx: Fix NULL pointer crash due to active timer for ABTS
  FROMLIST: f2fs: don't put dentry page in pagecache into highmem
  timekeeping: Remove unused variable from tk_update_ktime_data
  Linux 3.18.99
  dm io: fix duplicate bio completion due to missing ref count
  fib_semantics: Don't match route with mismatching tclassid
  net: ipv4: don't allow setting net.ipv4.route.min_pmtu below 68
  sctp: verify size of a new chunk in _sctp_make_chunk()
  s390/qeth: fix IPA command submission race
  s390/qeth: fix SETIP command handling
  sctp: fix dst refcnt leak in sctp_v6_get_dst()
  udplite: fix partial checksum initialization
  ppp: prevent unregistered channels from connecting to PPP units
  netlink: ensure to loop over all netns in genlmsg_multicast_allns()
  net: fix race on decreasing number of TX queues
  ipv6 sit: work around bogus gcc-8 -Wrestrict warning
  hdlc_ppp: carrier detect ok, don't turn off negotiation
  bridge: check brport attr show in brport_show
  leds: do not overflow sysfs buffer in led_trigger_show
  net: fec: introduce fec_ptp_stop and use in probe fail path
  ARM: mvebu: Fix broken PL310_ERRATA_753970 selects
  cpufreq: s3c24xx: Fix broken s3c_cpufreq_init()
  ALSA: usb-audio: Add a quirck for B&W PX headphones
  tpm_i2c_nuvoton: fix potential buffer overruns caused by bit glitches on the bus
  tpm_i2c_infineon: fix potential buffer overruns caused by bit glitches on the bus

USB related changes were ignored as per the feedback
from the USB team.

Conflicts:
	drivers/usb/core/quirks.c
	drivers/usb/storage/uas.c
	include/linux/usb/quirks.h

Change-Id: I5a618ad31dc1ed847b2f51bbc80df596a755d530
Signed-off-by: default avatarChetan C R <cravin@codeaurora.org>
parents df2063e5 c0f6f0e4

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 98

SUBLEVEL = 100

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/mach-mvebu/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ config MACH_ARMADA_370 
config MACH_ARMADA_375

	bool "Marvell Armada 375 boards" if ARCH_MULTI_V7

	select ARM_ERRATA_720789

	select ARM_ERRATA_753970

	select PL310_ERRATA_753970

	select ARM_GIC

	select ARMADA_375_CLK

	select HAVE_ARM_SCU
@@ -52,7 +52,7 @@ config MACH_ARMADA_375 
config MACH_ARMADA_38X

	bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7

	select ARM_ERRATA_720789

	select ARM_ERRATA_753970

	select PL310_ERRATA_753970

	select ARM_GIC

	select ARMADA_38X_CLK

	select HAVE_ARM_SCU

arch/mips/kernel/smp-bmips.c

+4 −4
Original line number Diff line number Diff line
@@ -159,11 +159,11 @@ static void bmips_prepare_cpus(unsigned int max_cpus) 
		return;

	}



	if (request_irq(IPI0_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,

			"smp_ipi0", NULL))

	if (request_irq(IPI0_IRQ, bmips_ipi_interrupt,

			IRQF_PERCPU | IRQF_NO_SUSPEND, "smp_ipi0", NULL))

		panic("Can't request IPI0 interrupt");

	if (request_irq(IPI1_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,

			"smp_ipi1", NULL))

	if (request_irq(IPI1_IRQ, bmips_ipi_interrupt,

			IRQF_PERCPU | IRQF_NO_SUSPEND, "smp_ipi1", NULL))

		panic("Can't request IPI1 interrupt");

}

arch/x86/kernel/cpu/mcheck/mce.c

+21 −1
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ static DEFINE_MUTEX(mce_chrdev_read_mutex); 
			      rcu_read_lock_sched_held() || \

			      lockdep_is_held(&mce_chrdev_read_mutex))



/* sysfs synchronization */

static DEFINE_MUTEX(mce_sysfs_mutex);



#define CREATE_TRACE_POINTS

#include <trace/events/mce.h>
@@ -2183,6 +2186,7 @@ static ssize_t set_ignore_ce(struct device *s, 
	if (kstrtou64(buf, 0, &new) < 0)

		return -EINVAL;



	mutex_lock(&mce_sysfs_mutex);

	if (mca_cfg.ignore_ce ^ !!new) {

		if (new) {

			/* disable ce features */
@@ -2195,6 +2199,8 @@ static ssize_t set_ignore_ce(struct device *s, 
			on_each_cpu(mce_enable_ce, (void *)1, 1);

		}

	}

	mutex_unlock(&mce_sysfs_mutex);



	return size;

}
@@ -2207,6 +2213,7 @@ static ssize_t set_cmci_disabled(struct device *s, 
	if (kstrtou64(buf, 0, &new) < 0)

		return -EINVAL;



	mutex_lock(&mce_sysfs_mutex);

	if (mca_cfg.cmci_disabled ^ !!new) {

		if (new) {

			/* disable cmci */
@@ -2218,6 +2225,8 @@ static ssize_t set_cmci_disabled(struct device *s, 
			on_each_cpu(mce_enable_ce, NULL, 1);

		}

	}

	mutex_unlock(&mce_sysfs_mutex);



	return size;

}
@@ -2225,8 +2234,19 @@ static ssize_t store_int_with_restart(struct device *s, 
				      struct device_attribute *attr,

				      const char *buf, size_t size)

{

	ssize_t ret = device_store_int(s, attr, buf, size);

	unsigned long old_check_interval = check_interval;

	ssize_t ret = device_store_ulong(s, attr, buf, size);



	if (check_interval == old_check_interval)

		return ret;



	if (check_interval < 1)

		check_interval = 1;



	mutex_lock(&mce_sysfs_mutex);

	mce_restart();

	mutex_unlock(&mce_sysfs_mutex);



	return ret;

}

arch/x86/kernel/machine_kexec_64.c

+1 −0
Original line number Diff line number Diff line
@@ -516,6 +516,7 @@ int arch_kexec_apply_relocations_add(const Elf64_Ehdr *ehdr, 
				goto overflow;

			break;

		case R_X86_64_PC32:

		case R_X86_64_PLT32:

			value -= (u64)address;

			*(u32 *)location = value;

			break;