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

Commit 816f245a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14.180 into android-4.14-stable 



Changes in 4.14.180
	vhost: vsock: kick send_pkt worker once device is started
	powerpc/pci/of: Parse unassigned resources
	ASoC: topology: Check return value of pcm_new_ver
	selftests/ipc: Fix test failure seen after initial test run
	ASoC: sgtl5000: Fix VAG power-on handling
	ASoC: rsnd: Fix HDMI channel mapping for multi-SSI mode
	ASoC: codecs: hdac_hdmi: Fix incorrect use of list_for_each_entry
	wimax/i2400m: Fix potential urb refcnt leak
	net: stmmac: fix enabling socfpga's ptp_ref_clock
	net: stmmac: Fix sub-second increment
	cifs: protect updating server->dstaddr with a spinlock
	s390/ftrace: fix potential crashes when switching tracers
	scripts/config: allow colons in option strings for sed
	net: dsa: b53: Rework ARL bin logic
	lib/mpi: Fix building for powerpc with clang
	net: bcmgenet: suppress warnings on failed Rx SKB allocations
	net: systemport: suppress warnings on failed Rx SKB allocations
	sctp: Fix SHUTDOWN CTSN Ack in the peer restart case
	tracing: Reverse the order of trace_types_lock and event_mutex
	ALSA: hda: Match both PCI ID and SSID for driver blacklist
	mac80211: add ieee80211_is_any_nullfunc()
	cgroup, netclassid: remove double cond_resched
	Linux 4.14.180

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I97fba604c23f3f7324a1d8f883606ed563459b47
parents 01558dbf ab9dfda2

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 179

SUBLEVEL = 180

EXTRAVERSION =

NAME = Petit Gorille

arch/powerpc/kernel/pci_of_scan.c

+10 −2
Original line number Diff line number Diff line
@@ -82,10 +82,16 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev) 
	const __be32 *addrs;

	u32 i;

	int proplen;

	bool mark_unset = false;



	addrs = of_get_property(node, "assigned-addresses", &proplen);

	if (!addrs)

	if (!addrs || !proplen) {

		addrs = of_get_property(node, "reg", &proplen);

		if (!addrs || !proplen)

			return;

		mark_unset = true;

	}



	pr_debug("    parse addresses (%d bytes) @ %p\n", proplen, addrs);

	for (; proplen >= 20; proplen -= 20, addrs += 5) {

		flags = pci_parse_of_flags(of_read_number(addrs, 1), 0);
@@ -110,6 +116,8 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev) 
			continue;

		}

		res->flags = flags;

		if (mark_unset)

			res->flags |= IORESOURCE_UNSET;

		res->name = pci_name(dev);

		region.start = base;

		region.end = base + size - 1;

arch/s390/kernel/diag.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ void diag_stat_inc(enum diag_stat_enum nr) 
}

EXPORT_SYMBOL(diag_stat_inc);



void diag_stat_inc_norecursion(enum diag_stat_enum nr)

void notrace diag_stat_inc_norecursion(enum diag_stat_enum nr)

{

	this_cpu_inc(diag_stat.counter[nr]);

	trace_s390_diagnose_norecursion(diag_map[nr].code);

arch/s390/kernel/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ int smp_find_processor_id(u16 address) 
	return -1;

}



bool arch_vcpu_is_preempted(int cpu)

bool notrace arch_vcpu_is_preempted(int cpu)

{

	if (test_cpu_flag_of(CIF_ENABLED_WAIT, cpu))

		return false;
@@ -416,7 +416,7 @@ bool arch_vcpu_is_preempted(int cpu) 
}

EXPORT_SYMBOL(arch_vcpu_is_preempted);



void smp_yield_cpu(int cpu)

void notrace smp_yield_cpu(int cpu)

{

	if (MACHINE_HAS_DIAG9C) {

		diag_stat_inc_norecursion(DIAG_STAT_X09C);

arch/s390/kernel/trace.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ EXPORT_TRACEPOINT_SYMBOL(s390_diagnose); 


static DEFINE_PER_CPU(unsigned int, diagnose_trace_depth);



void trace_s390_diagnose_norecursion(int diag_nr)

void notrace trace_s390_diagnose_norecursion(int diag_nr)

{

	unsigned long flags;

	unsigned int *depth;