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

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

Merge 3.18.117 into android-3.18 



Changes in 3.18.117
	x86/MCE: Remove min interval polling limitation
	fat: fix memory allocation failure handling of match_strdup()
	ALSA: rawmidi: Change resized buffers atomically
	ARC: Fix CONFIG_SWAP
	ARC: mm: allow mprotect to make stack mappings executable
	ipv4: Return EINVAL when ping_group_range sysctl doesn't map to user ns
	ptp: fix missing break in switch
	net: Don't copy pfmemalloc flag in __copy_skb_header()
	skbuff: Unconditionally copy pfmemalloc in __skb_clone()
	ip: hash fragments consistently
	net/mlx4_core: Save the qpn from the input modifier in RST2INIT wrapper
	rtnetlink: add rtnl_link_state check in rtnl_configure_link
	tcp: fix dctcp delayed ACK schedule
	tcp: helpers to send special DCTCP ack
	tcp: do not cancel delay-AcK on DCTCP special ACK
	tcp: do not delay ACK in DCTCP upon CE status change
	tcp: avoid collapses in tcp_prune_queue() if possible
	tcp: detect malicious patterns in tcp_collapse_ofo_queue()
	usb: cdc_acm: Add quirk for Castles VEGA3000
	usb: core: handle hub C_PORT_OVER_CURRENT condition
	usb: gadget: f_fs: Only return delayed status when len is 0
	can: xilinx_can: fix RX loop if RXNEMP is asserted without RXOK
	can: xilinx_can: fix device dropping off bus on RX overrun
	can: xilinx_can: keep only 1-2 frames in TX FIFO to fix TX accounting
	can: xilinx_can: fix RX overflow interrupt not being enabled
	ARM: fix put_user() for gcc-8
	turn off -Wattribute-alias
	Linux 3.18.117

Change-Id: Iff429463cfa1f027d3601eec692d88bb1c3f95ca
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 38c73e90 dbba166b

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 116

SUBLEVEL = 117

EXTRAVERSION =

NAME = Diseased Newt
@@ -614,6 +614,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,) 
KBUILD_CFLAGS	+= $(call cc-disable-warning, format-truncation)

KBUILD_CFLAGS	+= $(call cc-disable-warning, format-overflow)

KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)

KBUILD_CFLAGS	+= $(call cc-disable-warning, attribute-alias)

KBUILD_CFLAGS	+= $(call cc-option,-fno-PIE)

KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)

arch/arc/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ typedef unsigned long pgtable_t; 
#define virt_addr_valid(kaddr)  pfn_valid(__pa(kaddr) >> PAGE_SHIFT)



/* Default Permissions for stack/heaps pages (Non Executable) */

#define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE)

#define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)



#define WANT_PAGE_VIRTUAL   1

arch/arc/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, 


/* Decode a PTE containing swap "identifier "into constituents */

#define __swp_type(pte_lookalike)	(((pte_lookalike).val) & 0x1f)

#define __swp_offset(pte_lookalike)	((pte_lookalike).val << 13)

#define __swp_offset(pte_lookalike)	((pte_lookalike).val >> 13)



/* NOPs, to keep generic kernel happy */

#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })

arch/arm/include/asm/uaccess.h

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ extern int __put_user_8(void *, unsigned long long); 
	({								\

		unsigned long __limit = current_thread_info()->addr_limit - 1; \

		const typeof(*(p)) __user *__tmp_p = (p);		\

		register const typeof(*(p)) __r2 asm("r2") = (x);	\

		register typeof(*(p)) __r2 asm("r2") = (x);	\

		register const typeof(*(p)) __user *__p asm("r0") = __tmp_p; \

		register unsigned long __l asm("r1") = __limit;		\

		register int __e asm("r0");				\

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

+0 −3
Original line number Diff line number Diff line
@@ -2240,9 +2240,6 @@ static ssize_t store_int_with_restart(struct device *s, 
	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);