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

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

Merge 4.14.25 into android-4.14



Changes in 4.14.25
	Bluetooth: btusb: Use DMI matching for QCA reset_resume quirking
	ixgbe: fix crash in build_skb Rx code path
	tpm: st33zp24: fix potential buffer overruns caused by bit glitches on the bus
	tpm: fix potential buffer overruns caused by bit glitches on the bus
	tpm_i2c_infineon: fix potential buffer overruns caused by bit glitches on the bus
	tpm_i2c_nuvoton: fix potential buffer overruns caused by bit glitches on the bus
	tpm_tis: fix potential buffer overruns caused by bit glitches on the bus
	tpm: constify transmit data pointers
	tpm_tis_spi: Use DMA-safe memory for SPI transfers
	ALSA: usb-audio: Add a quirck for B&W PX headphones
	ALSA: control: Fix memory corruption risk in snd_ctl_elem_read
	ALSA: x86: Fix missing spinlock and mutex initializations
	ALSA: hda: Add a power_save blacklist
	ALSA: hda - Fix pincfg at resume on Lenovo T470 dock
	mmc: sdhci-pci: Fix S0i3 for Intel BYT-based controllers
	mmc: dw_mmc-k3: Fix out-of-bounds access through DT alias
	mmc: dw_mmc: Avoid accessing registers in runtime suspended state
	mmc: dw_mmc: Factor out dw_mci_init_slot_caps
	mmc: dw_mmc: Fix out-of-bounds access for slot's caps
	timers: Forward timer base before migrating timers
	parisc: Use cr16 interval timers unconditionally on qemu
	parisc: Reduce irq overhead when run in qemu
	parisc: Fix ordering of cache and TLB flushes
	btrfs: use proper endianness accessors for super_copy
	block: fix the count of PGPGOUT for WRITE_SAME
	block: kyber: fix domain token leak during requeue
	vfio: disable filesystem-dax page pinning
	cpufreq: s3c24xx: Fix broken s3c_cpufreq_init()
	dax: fix vma_is_fsdax() helper
	direct-io: Fix sleep in atomic due to sync AIO
	x86/xen: Zero MSR_IA32_SPEC_CTRL before suspend
	x86/platform/intel-mid: Handle Intel Edison reboot correctly
	x86/cpu_entry_area: Sync cpu_entry_area to initial_page_table
	bridge: check brport attr show in brport_show
	fib_semantics: Don't match route with mismatching tclassid
	hdlc_ppp: carrier detect ok, don't turn off negotiation
	ipv6 sit: work around bogus gcc-8 -Wrestrict warning
	net: amd-xgbe: fix comparison to bitshift when dealing with a mask
	net: ethernet: ti: cpsw: fix net watchdog timeout
	net: fix race on decreasing number of TX queues
	net: ipv4: don't allow setting net.ipv4.route.min_pmtu below 68
	netlink: ensure to loop over all netns in genlmsg_multicast_allns()
	net: sched: report if filter is too large to dump
	ppp: prevent unregistered channels from connecting to PPP units
	sctp: verify size of a new chunk in _sctp_make_chunk()
	udplite: fix partial checksum initialization
	net/mlx5e: Fix TCP checksum in LRO buffers
	sctp: fix dst refcnt leak in sctp_v4_get_dst
	mlxsw: spectrum_switchdev: Check success of FDB add operation
	net/mlx5e: Specify numa node when allocating drop rq
	net: phy: fix phy_start to consider PHY_IGNORE_INTERRUPT
	tcp: Honor the eor bit in tcp_mtu_probe
	rxrpc: Fix send in rxrpc_send_data_packet()
	tcp_bbr: better deal with suboptimal GSO
	doc: Change the min default value of tcp_wmem/tcp_rmem.
	net/mlx5e: Fix loopback self test when GRO is off
	net_sched: gen_estimator: fix broken estimators based on percpu stats
	net/sched: cls_u32: fix cls_u32 on filter replace
	sctp: do not pr_err for the duplicated node in transport rhlist
	tcp: revert F-RTO middle-box workaround
	tcp: revert F-RTO extension to detect more spurious timeouts
	mlxsw: spectrum_router: Fix error path in mlxsw_sp_vr_create
	net: ipv4: Set addr_type in hash_keys for forwarded case
	sctp: fix dst refcnt leak in sctp_v6_get_dst()
	bridge: Fix VLAN reference count problem
	net/mlx5e: Verify inline header size do not exceed SKB linear size
	amd-xgbe: Restore PCI interrupt enablement setting on resume
	cls_u32: fix use after free in u32_destroy_key()
	mlxsw: spectrum_router: Do not unconditionally clear route offload indication
	netlink: put module reference if dump start fails
	tcp: purge write queue upon RST
	tuntap: correctly add the missing XDP flush
	tuntap: disable preemption during XDP processing
	virtio-net: disable NAPI only when enabled during XDP set
	s390/qeth: fix underestimated count of buffer elements
	s390/qeth: fix SETIP command handling
	s390/qeth: fix overestimated count of buffer elements
	s390/qeth: fix IP removal on offline cards
	s390/qeth: fix double-free on IP add/remove race
	Revert "s390/qeth: fix using of ref counter for rxip addresses"
	s390/qeth: fix IP address lookup for L3 devices
	s390/qeth: fix IPA command submission race
	blk-mq: don't call io sched's .requeue_request when requeueing rq to ->dispatch
	media: m88ds3103: don't call a non-initalized function
	EDAC, sb_edac: Fix out of bound writes during DIMM configuration on KNL
	KVM: s390: take care of clock-comparator sign control
	KVM: s390: provide only a single function for setting the tod (fix SCK)
	KVM: s390: consider epoch index on hotplugged CPUs
	KVM: s390: consider epoch index on TOD clock syncs
	nospec: Allow index argument to have const-qualified type
	x86/mm: Fix {pmd,pud}_{set,clear}_flags()
	ARM: orion: fix orion_ge00_switch_board_info initialization
	ARM: dts: rockchip: Remove 1.8 GHz operation point from phycore som
	ARM: mvebu: Fix broken PL310_ERRATA_753970 selects
	ARM: kvm: fix building with gcc-8
	KVM: x86: extend usage of RET_MMIO_PF_* constants
	KVM: X86: Fix SMRAM accessing even if VM is shutdown
	KVM: mmu: Fix overlap between public and private memslots
	KVM/x86: Remove indirect MSR op calls from SPEC_CTRL
	KVM: x86: move LAPIC initialization after VMCS creation
	KVM/VMX: Optimize vmx_vcpu_run() and svm_vcpu_run() by marking the RDMSR path as unlikely()
	KVM: x86: fix vcpu initialization with userspace lapic
	PCI/ASPM: Deal with missing root ports in link state handling
	KVM/x86: Fix wrong macro references of X86_CR0_PG_BIT and X86_CR4_PAE_BIT in kvm_valid_sregs()
	KVM/x86: remove WARN_ON() for when vm_munmap() fails
	ACPI / bus: Parse tables as term_list for Dell XPS 9570 and Precision M5530
	ARM: dts: LogicPD SOM-LV: Fix I2C1 pinmux
	ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux
	md: only allow remove_and_add_spares when no sync_thread running.
	nvme-rdma: don't suppress send completions
	Linux 4.14.25

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 3253a29a 8773f9bf
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max
	min: Minimal size of receive buffer used by TCP sockets.
	It is guaranteed to each TCP socket, even under moderate memory
	pressure.
	Default: 1 page
	Default: 4K

	default: initial size of receive buffer used by TCP sockets.
	This value overrides net.core.rmem_default used by other protocols.
@@ -676,7 +676,7 @@ tcp_window_scaling - BOOLEAN
tcp_wmem - vector of 3 INTEGERs: min, default, max
	min: Amount of memory reserved for send buffers for TCP sockets.
	Each TCP socket has rights to use it due to fact of its birth.
	Default: 1 page
	Default: 4K

	default: initial size of send buffer used by TCP sockets.  This
	value overrides net.core.wmem_default used by other protocols.
+1 −1
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 14
SUBLEVEL = 24
SUBLEVEL = 25
EXTRAVERSION =
NAME = Petit Gorille

+8 −1
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@
};

&i2c1 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c1_pins>;
	clock-frequency = <2600000>;

	twl: twl@48 {
@@ -215,7 +217,12 @@
		>;
	};


	i2c1_pins: pinmux_i2c1_pins {
		pinctrl-single,pins = <
			OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0)        /* i2c1_scl.i2c1_scl */
			OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0)        /* i2c1_sda.i2c1_sda */
		>;
	};
};

&omap3_pmx_wkup {
+8 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@
};

&i2c1 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c1_pins>;
	clock-frequency = <2600000>;

	twl: twl@48 {
@@ -211,6 +213,12 @@
			OMAP3_CORE1_IOPAD(0x21b8, PIN_INPUT | MUX_MODE0)	/* hsusb0_data7.hsusb0_data7 */
		>;
	};
	i2c1_pins: pinmux_i2c1_pins {
		pinctrl-single,pins = <
			OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0)        /* i2c1_scl.i2c1_scl */
			OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0)        /* i2c1_sda.i2c1_sda */
		>;
	};
};

&uart2 {
+0 −20
Original line number Diff line number Diff line
@@ -110,26 +110,6 @@
	};
};

&cpu0 {
	cpu0-supply = <&vdd_cpu>;
	operating-points = <
		/* KHz    uV */
		1800000	1400000
		1608000	1350000
		1512000 1300000
		1416000 1200000
		1200000 1100000
		1008000 1050000
		 816000 1000000
		 696000  950000
		 600000  900000
		 408000  900000
		 312000  900000
		 216000  900000
		 126000  900000
	>;
};

&emmc {
	status = "okay";
	bus-width = <8>;
Loading