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

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

Merge 4.14.59 into android-4.14 



Changes in 4.14.59
	Revert "cifs: Fix slab-out-of-bounds in send_set_info() on SMB2 ACE setting"
	MIPS: ath79: fix register address in ath79_ddr_wb_flush()
	MIPS: Fix off-by-one in pci_resource_to_user()
	xen/PVH: Set up GS segment for stack canary
	KVM: PPC: Check if IOMMU page is contained in the pinned physical page
	drm/nouveau/drm/nouveau: Fix runtime PM leak in nv50_disp_atomic_commit()
	drm/nouveau: Set DRIVER_ATOMIC cap earlier to fix debugfs
	bonding: set default miimon value for non-arp modes if not set
	ip: hash fragments consistently
	ip: in cmsg IP(V6)_ORIGDSTADDR call pskb_may_pull
	net/mlx4_core: Save the qpn from the input modifier in RST2INIT wrapper
	net: skb_segment() should not return NULL
	net/mlx5: Adjust clock overflow work period
	net/mlx5e: Don't allow aRFS for encapsulated packets
	net/mlx5e: Fix quota counting in aRFS expire flow
	net/ipv6: Fix linklocal to global address with VRF
	multicast: do not restore deleted record source filter mode to new one
	net: phy: consider PHY_IGNORE_INTERRUPT in phy_start_aneg_priv
	sock: fix sg page frag coalescing in sk_alloc_sg
	rtnetlink: add rtnl_link_state check in rtnl_configure_link
	vxlan: add new fdb alloc and create helpers
	vxlan: make netlink notify in vxlan_fdb_destroy optional
	vxlan: fix default fdb entry netlink notify ordering during netdev create
	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: free batches of packets in tcp_prune_ofo_queue()
	tcp: avoid collapses in tcp_prune_queue() if possible
	tcp: detect malicious patterns in tcp_collapse_ofo_queue()
	tcp: call tcp_drop() from tcp_data_queue_ofo()
	tcp: add tcp_ooo_try_coalesce() helper
	staging: speakup: fix wraparound in uaccess length check
	usb: cdc_acm: Add quirk for Castles VEGA3000
	usb: core: handle hub C_PORT_OVER_CURRENT condition
	usb: dwc2: Fix DMA alignment to start at allocated boundary
	usb: gadget: f_fs: Only return delayed status when len is 0
	driver core: Partially revert "driver core: correct device's shutdown order"
	can: xilinx_can: fix RX loop if RXNEMP is asserted without RXOK
	can: xilinx_can: fix power management handling
	can: xilinx_can: fix recovery from error states not being propagated
	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 incorrect clear of non-processed interrupts
	can: xilinx_can: fix RX overflow interrupt not being enabled
	can: peak_canfd: fix firmware < v3.3.0: limit allocation to 32-bit DMA addr only
	can: m_can.c: fix setup of CCCR register: clear CCCR NISO bit before checking can.ctrlmode
	turn off -Wattribute-alias
	Linux 4.14.59

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents da1b997e 53208e12

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 58

SUBLEVEL = 59

EXTRAVERSION =

NAME = Petit Gorille
@@ -658,6 +658,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)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= $(call cc-option,-Oz,-Os)

arch/mips/ath79/common.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ EXPORT_SYMBOL_GPL(ath79_ddr_ctrl_init); 


void ath79_ddr_wb_flush(u32 reg)

{

	void __iomem *flush_reg = ath79_ddr_wb_flush_base + reg;

	void __iomem *flush_reg = ath79_ddr_wb_flush_base + (reg * 4);



	/* Flush the DDR write buffer. */

	__raw_writel(0x1, flush_reg);

arch/mips/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -54,5 +54,5 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar, 
	phys_addr_t size = resource_size(rsrc);



	*start = fixup_bigphys_addr(rsrc->start, size);

	*end = rsrc->start + size;

	*end = rsrc->start + size - 1;

}

arch/powerpc/include/asm/mmu_context.h

+2 −2
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ extern struct mm_iommu_table_group_mem_t *mm_iommu_lookup_rm( 
extern struct mm_iommu_table_group_mem_t *mm_iommu_find(struct mm_struct *mm,

		unsigned long ua, unsigned long entries);

extern long mm_iommu_ua_to_hpa(struct mm_iommu_table_group_mem_t *mem,

		unsigned long ua, unsigned long *hpa);

		unsigned long ua, unsigned int pageshift, unsigned long *hpa);

extern long mm_iommu_ua_to_hpa_rm(struct mm_iommu_table_group_mem_t *mem,

		unsigned long ua, unsigned long *hpa);

		unsigned long ua, unsigned int pageshift, unsigned long *hpa);

extern long mm_iommu_mapped_inc(struct mm_iommu_table_group_mem_t *mem);

extern void mm_iommu_mapped_dec(struct mm_iommu_table_group_mem_t *mem);

#endif

arch/powerpc/kvm/book3s_64_vio.c

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ long kvmppc_tce_iommu_map(struct kvm *kvm, struct iommu_table *tbl, 
		/* This only handles v2 IOMMU type, v1 is handled via ioctl() */

		return H_TOO_HARD;



	if (WARN_ON_ONCE(mm_iommu_ua_to_hpa(mem, ua, &hpa)))

	if (WARN_ON_ONCE(mm_iommu_ua_to_hpa(mem, ua, tbl->it_page_shift, &hpa)))

		return H_HARDWARE;



	if (mm_iommu_mapped_inc(mem))