Commit 03d4af82 authored Nov 15, 2017 by Greg Kroah-Hartman

Merge 4.4.98 into android-4.4



Changes in 4.4.98
	adv7604: Initialize drive strength to default when using DT
	video: fbdev: pmag-ba-fb: Remove bad `__init' annotation
	PCI: mvebu: Handle changes to the bridge windows while enabled
	xen/netback: set default upper limit of tx/rx queues to 8
	drm: drm_minor_register(): Clean up debugfs on failure
	KVM: PPC: Book 3S: XICS: correct the real mode ICP rejecting counter
	iommu/arm-smmu-v3: Clear prior settings when updating STEs
	powerpc/corenet: explicitly disable the SDHC controller on kmcoge4
	ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
	crypto: vmx - disable preemption to enable vsx in aes_ctr.c
	iio: trigger: free trigger resource correctly
	phy: increase size of MII_BUS_ID_SIZE and bus_id
	serial: sh-sci: Fix register offsets for the IRDA serial port
	usb: hcd: initialize hcd->flags to 0 when rm hcd
	netfilter: nft_meta: deal with PACKET_LOOPBACK in netdev family
	IPsec: do not ignore crypto err in ah4 input
	Input: mpr121 - handle multiple bits change of status register
	Input: mpr121 - set missing event capability
	IB/ipoib: Change list_del to list_del_init in the tx object
	s390/qeth: issue STARTLAN as first IPA command
	net: dsa: select NET_SWITCHDEV
	platform/x86: hp-wmi: Fix detection for dock and tablet mode
	cdc_ncm: Set NTB format again after altsetting switch for Huawei devices
	KEYS: trusted: sanitize all key material
	KEYS: trusted: fix writing past end of buffer in trusted_read()
	platform/x86: hp-wmi: Fix error value for hp_wmi_tablet_state
	platform/x86: hp-wmi: Do not shadow error values
	x86/uaccess, sched/preempt: Verify access_ok() context
	workqueue: Fix NULL pointer dereference
	crypto: x86/sha1-mb - fix panic due to unaligned access
	KEYS: fix NULL pointer dereference during ASN.1 parsing [ver #2]
	ARM: 8720/1: ensure dump_instr() checks addr_limit
	ALSA: seq: Fix OSS sysex delivery in OSS emulation
	ALSA: seq: Avoid invalid lockdep class warning
	MIPS: microMIPS: Fix incorrect mask in insn_table_MM
	MIPS: Fix CM region target definitions
	MIPS: SMP: Use a completion event to signal CPU up
	MIPS: Fix race on setting and getting cpu_online_mask
	MIPS: SMP: Fix deadlock & online race
	test: firmware_class: report errors properly on failure
	selftests: firmware: add empty string and async tests
	selftests: firmware: send expected errors to /dev/null
	tools: firmware: check for distro fallback udev cancel rule
	MIPS: AR7: Defer registration of GPIO
	MIPS: AR7: Ensure that serial ports are properly set up
	Input: elan_i2c - add ELAN060C to the ACPI table
	drm/vmwgfx: Fix Ubuntu 17.10 Wayland black screen issue
	rbd: use GFP_NOIO for parent stat and data requests
	can: sun4i: handle overrun in RX FIFO
	can: c_can: don't indicate triple sampling support for D_CAN
	x86/oprofile/ppro: Do not use __this_cpu*() in preemptible context
	PKCS#7: fix unitialized boolean 'want'
	Linux 4.4.98

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parents 6b6637fd c4e3d53b

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 97
		SUBLEVEL = 98
		EXTRAVERSION =
		NAME = Blurry Fish Butt

arch/arm/configs/omap2plus_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -221,6 +221,7 @@ CONFIG_SERIO=m
		CONFIG_SERIAL_8250=y
		CONFIG_SERIAL_8250_CONSOLE=y
		CONFIG_SERIAL_8250_NR_UARTS=32
		CONFIG_SERIAL_8250_RUNTIME_UARTS=6
		CONFIG_SERIAL_8250_EXTENDED=y
		CONFIG_SERIAL_8250_MANY_PORTS=y
		CONFIG_SERIAL_8250_SHARE_IRQ=y

arch/arm/kernel/traps.c

+18 −10

Original line number	Diff line number	Diff line
		@@ -132,30 +132,26 @@ static void dump_mem(const char lvl, const char str, unsigned long bottom,
		set_fs(fs);
		}

		static void dump_instr(const char lvl, struct pt_regs regs)
		static void __dump_instr(const char lvl, struct pt_regs regs)
		{
		unsigned long addr = instruction_pointer(regs);
		const int thumb = thumb_mode(regs);
		const int width = thumb ? 4 : 8;
		mm_segment_t fs;
		char str[sizeof("00000000 ") * 5 + 2 + 1], *p = str;
		int i;

		/*
		* We need to switch to kernel mode so that we can use __get_user
		* to safely read from kernel space. Note that we now dump the
		* code first, just in case the backtrace kills us.
		* Note that we now dump the code first, just in case the backtrace
		* kills us.
		*/
		fs = get_fs();
		set_fs(KERNEL_DS);

		for (i = -4; i < 1 + !!thumb; i++) {
		unsigned int val, bad;

		if (thumb)
		bad = __get_user(val, &((u16 *)addr)[i]);
		bad = get_user(val, &((u16 *)addr)[i]);
		else
		bad = __get_user(val, &((u32 *)addr)[i]);
		bad = get_user(val, &((u32 *)addr)[i]);

		if (!bad)
		p += sprintf(p, i == 0 ? "(%0x) " : "%0x ",
		@@ -166,8 +162,20 @@ static void dump_instr(const char lvl, struct pt_regs regs)
		}
		}
		printk("%sCode: %s\n", lvl, str);
		}

		static void dump_instr(const char lvl, struct pt_regs regs)
		{
		mm_segment_t fs;

		if (!user_mode(regs)) {
		fs = get_fs();
		set_fs(KERNEL_DS);
		__dump_instr(lvl, regs);
		set_fs(fs);
		} else {
		__dump_instr(lvl, regs);
		}
		}

		#ifdef CONFIG_ARM_UNWIND

arch/mips/ar7/platform.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -576,6 +576,7 @@ static int __init ar7_register_uarts(void)
		uart_port.type = PORT_AR7;
		uart_port.uartclk = clk_get_rate(bus_clk) / 2;
		uart_port.iotype = UPIO_MEM32;
		uart_port.flags = UPF_FIXED_TYPE;
		uart_port.regshift = 2;

		uart_port.line = 0;
		@@ -654,6 +655,10 @@ static int __init ar7_register_devices(void)
		u32 val;
		int res;

		res = ar7_gpio_init();
		if (res)
		pr_warn("unable to register gpios: %d\n", res);

		res = ar7_register_uarts();
		if (res)
		pr_err("unable to setup uart(s): %d\n", res);

arch/mips/ar7/prom.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -246,8 +246,6 @@ void __init prom_init(void)
		ar7_init_cmdline(fw_arg0, (char **)fw_arg1);
		ar7_init_env((struct env_var *)fw_arg2);
		console_config();

		ar7_gpio_init();
		}

		#define PORT(offset) (KSEG1ADDR(AR7_REGS_UART0 + (offset * 4)))