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

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

Merge 4.4.119 into android-4.4 



Changes in 4.4.119
	netfilter: drop outermost socket lock in getsockopt()
	powerpc/64s: Fix RFI flush dependency on HARDLOCKUP_DETECTOR
	PCI: keystone: Fix interrupt-controller-node lookup
	ip_tunnel: replace dst_cache with generic implementation
	ip_tunnel: fix preempt warning in ip tunnel creation/updating
	scsi: ibmvfc: fix misdefined reserved field in ibmvfc_fcp_rsp_info
	cfg80211: fix cfg80211_beacon_dup
	iio: buffer: check if a buffer has been set up when poll is called
	iio: adis_lib: Initialize trigger before requesting interrupt
	x86/oprofile: Fix bogus GCC-8 warning in nmi_setup()
	irqchip/gic-v3: Use wmb() instead of smb_wmb() in gic_raise_softirq()
	usb: ohci: Proper handling of ed_rm_list to handle race condition between usb_kill_urb() and finish_unlinks()
	arm64: Disable unhandled signal log messages by default
	Add delay-init quirk for Corsair K70 RGB keyboards
	drm/edid: Add 6 bpc quirk for CPT panel in Asus UX303LA
	usb: dwc3: gadget: Set maxpacket size for ep0 IN
	usb: ldusb: add PIDs for new CASSY devices supported by this driver
	usb: gadget: f_fs: Process all descriptors during bind
	usb: renesas_usbhs: missed the "running" flag in usb_dmac with rx path
	drm/amdgpu: Avoid leaking PM domain on driver unbind (v2)
	binder: add missing binder_unlock()
	Linux 4.4.119

Change-Id: Ie2b40ffed3554beef8db7b0e41d2a17d12f1a12c
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 239a415f 5e0c4113

Makefile

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

VERSION = 4

PATCHLEVEL = 4

PATCHLEVEL = 4

SUBLEVEL = 118

SUBLEVEL = 119

EXTRAVERSION =

EXTRAVERSION =

NAME = Blurry Fish Butt

NAME = Blurry Fish Butt

arch/arm64/kernel/traps.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ static const char *handler[]= { 
	"Error"

	"Error"

};

};





int show_unhandled_signals = 1;

int show_unhandled_signals = 0;





/*

/*

 * Dump out the contents of some memory nicely...

 * Dump out the contents of some memory nicely...

arch/powerpc/kernel/setup_64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -835,6 +835,7 @@ static int __init disable_hardlockup_detector(void) 
	return 0;

	return 0;

}

}

early_initcall(disable_hardlockup_detector);

early_initcall(disable_hardlockup_detector);

#endif





#ifdef CONFIG_PPC_BOOK3S_64

#ifdef CONFIG_PPC_BOOK3S_64

static enum l1d_flush_type enabled_flush_types;

static enum l1d_flush_type enabled_flush_types;
@@ -973,4 +974,3 @@ ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, cha 
	return sprintf(buf, "Vulnerable\n");

	return sprintf(buf, "Vulnerable\n");

}

}

#endif /* CONFIG_PPC_BOOK3S_64 */
 
#endif /* CONFIG_PPC_BOOK3S_64 */
 
#endif

arch/x86/oprofile/nmi_int.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -471,7 +471,7 @@ static int nmi_setup(void) 
		goto fail;

		goto fail;





	for_each_possible_cpu(cpu) {

	for_each_possible_cpu(cpu) {

		if (!cpu)

		if (!IS_ENABLED(CONFIG_SMP) || !cpu)

			continue;

			continue;





		memcpy(per_cpu(cpu_msrs, cpu).counters,

		memcpy(per_cpu(cpu_msrs, cpu).counters,

drivers/android/binder.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -4574,8 +4574,10 @@ static unsigned int binder_poll(struct file *filp, 
	bool wait_for_proc_work;

	bool wait_for_proc_work;





	thread = binder_get_thread(proc);

	thread = binder_get_thread(proc);

	if (!thread)

	if (!thread) {

		binder_unlock(__func__);

		return POLLERR;

		return POLLERR;

	}





	binder_inner_proc_lock(thread->proc);

	binder_inner_proc_lock(thread->proc);

	thread->looper |= BINDER_LOOPER_STATE_POLL;

	thread->looper |= BINDER_LOOPER_STATE_POLL;