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

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

Merge 4.4.73 into android-4.4 



Changes in 4.4.73
	s390/vmem: fix identity mapping
	partitions/msdos: FreeBSD UFS2 file systems are not recognized
	ARM: dts: imx6dl: Fix the VDD_ARM_CAP voltage for 396MHz operation
	staging: rtl8192e: rtl92e_fill_tx_desc fix write to mapped out memory.
	Call echo service immediately after socket reconnect
	net: xilinx_emaclite: fix freezes due to unordered I/O
	net: xilinx_emaclite: fix receive buffer overflow
	ipv6: Handle IPv4-mapped src to in6addr_any dst.
	ipv6: Inhibit IPv4-mapped src address on the wire.
	NET: Fix /proc/net/arp for AX.25
	NET: mkiss: Fix panic
	net: hns: Fix the device being used for dma mapping during TX
	sierra_net: Skip validating irrelevant fields for IDLE LSIs
	sierra_net: Add support for IPv6 and Dual-Stack Link Sense Indications
	i2c: piix4: Fix request_region size
	ipv6: Fix IPv6 packet loss in scenarios involving roaming + snooping switches
	PM / runtime: Avoid false-positive warnings from might_sleep_if()
	jump label: pass kbuild_cflags when checking for asm goto support
	kasan: respect /proc/sys/kernel/traceoff_on_warning
	log2: make order_base_2() behave correctly on const input value zero
	ethtool: do not vzalloc(0) on registers dump
	fscache: Fix dead object requeue
	fscache: Clear outstanding writes when disabling a cookie
	FS-Cache: Initialise stores_lock in netfs cookie
	ipv6: fix flow labels when the traffic class is non-0
	drm/nouveau: prevent userspace from deleting client object
	drm/nouveau/fence/g84-: protect against concurrent access to semaphore buffers
	net/mlx4_core: Avoid command timeouts during VF driver device shutdown
	gianfar: synchronize DMA API usage by free_skb_rx_queue w/ gfar_new_page
	pinctrl: berlin-bg4ct: fix the value for "sd1a" of pin SCRD0_CRD_PRES
	net: adaptec: starfire: add checks for dma mapping errors
	parisc, parport_gsc: Fixes for printk continuation lines
	drm/nouveau: Don't enabling polling twice on runtime resume
	drm/ast: Fixed system hanged if disable P2A
	ravb: unmap descriptors when freeing rings
	nfs: Fix "Don't increment lock sequence ID after NFS4ERR_MOVED"
	r8152: re-schedule napi for tx
	r8152: fix rtl8152_post_reset function
	r8152: avoid start_xmit to schedule napi when napi is disabled
	sctp: sctp_addr_id2transport should verify the addr before looking up assoc
	romfs: use different way to generate fsid for BLOCK or MTD
	proc: add a schedule point in proc_pid_readdir()
	tipc: ignore requests when the connection state is not CONNECTED
	xtensa: don't use linux IRQ #0
	s390/kvm: do not rely on the ILC on kvm host protection fauls
	sparc64: make string buffers large enough
	Linux 4.4.73

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents fa603779 1bd30958

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 72

SUBLEVEL = 73

EXTRAVERSION =

NAME = Blurry Fish Butt
@@ -789,7 +789,7 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=date-time) 
KBUILD_ARFLAGS := $(call ar-option,D)



# check for 'asm goto'

ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y)

ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)

	KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO

	KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO

endif

arch/arm/boot/dts/imx6dl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
				/* kHz    uV */

				996000  1250000

				792000  1175000

				396000  1075000

				396000  1150000

			>;

			fsl,soc-operating-points = <

				/* ARM kHz  SOC-PU uV */

arch/s390/kernel/entry.S

+13 −6
Original line number Diff line number Diff line
@@ -229,12 +229,17 @@ ENTRY(sie64a) 
	lctlg	%c1,%c1,__LC_USER_ASCE		# load primary asce

.Lsie_done:

# some program checks are suppressing. C code (e.g. do_protection_exception)

# will rewind the PSW by the ILC, which is 4 bytes in case of SIE. Other

# instructions between sie64a and .Lsie_done should not cause program

# interrupts. So lets use a nop (47 00 00 00) as a landing pad.

# will rewind the PSW by the ILC, which is often 4 bytes in case of SIE. There

# are some corner cases (e.g. runtime instrumentation) where ILC is unpredictable.

# Other instructions between sie64a and .Lsie_done should not cause program

# interrupts. So lets use 3 nops as a landing pad for all possible rewinds.

# See also .Lcleanup_sie

.Lrewind_pad:

	nop	0

.Lrewind_pad6:

	nopr	7

.Lrewind_pad4:

	nopr	7

.Lrewind_pad2:

	nopr	7

	.globl sie_exit

sie_exit:

	lg	%r14,__SF_EMPTY+8(%r15)		# load guest register save area
@@ -247,7 +252,9 @@ sie_exit: 
	stg	%r14,__SF_EMPTY+16(%r15)	# set exit reason code

	j	sie_exit



	EX_TABLE(.Lrewind_pad,.Lsie_fault)

	EX_TABLE(.Lrewind_pad6,.Lsie_fault)

	EX_TABLE(.Lrewind_pad4,.Lsie_fault)

	EX_TABLE(.Lrewind_pad2,.Lsie_fault)

	EX_TABLE(sie_exit,.Lsie_fault)

#endif

arch/s390/mm/vmem.c

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ void __init vmem_map_init(void) 
	ro_end = (unsigned long)&_eshared & PAGE_MASK;

	for_each_memblock(memory, reg) {

		start = reg->base;

		end = reg->base + reg->size - 1;

		end = reg->base + reg->size;

		if (start >= ro_end || end <= ro_start)

			vmem_add_mem(start, end - start, 0);

		else if (start >= ro_start && end <= ro_end)

arch/sparc/kernel/traps_64.c

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p) 


void bad_trap(struct pt_regs *regs, long lvl)

{

	char buffer[32];

	char buffer[36];

	siginfo_t info;



	if (notify_die(DIE_TRAP, "bad trap", regs,
@@ -116,7 +116,7 @@ void bad_trap(struct pt_regs *regs, long lvl) 


void bad_trap_tl1(struct pt_regs *regs, long lvl)

{

	char buffer[32];

	char buffer[36];

	

	if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,

		       0, lvl, SIGTRAP) == NOTIFY_STOP)