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

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

Merge 5.4.125 into android11-5.4-lts 



Changes in 5.4.125
	btrfs: tree-checker: do not error out if extent ref hash doesn't match
	net: usb: cdc_ncm: don't spew notifications
	ALSA: usb: update old-style static const declaration
	nl80211: validate key indexes for cfg80211_registered_device
	hwmon: (dell-smm-hwmon) Fix index values
	netfilter: conntrack: unregister ipv4 sockopts on error unwind
	efi: Allow EFI_MEMORY_XP and EFI_MEMORY_RO both to be cleared
	efi: cper: fix snprintf() use in cper_dimm_err_location()
	vfio/pci: Fix error return code in vfio_ecap_init()
	vfio/pci: zap_vma_ptes() needs MMU
	samples: vfio-mdev: fix error handing in mdpy_fb_probe()
	vfio/platform: fix module_put call in error flow
	ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service
	HID: pidff: fix error return code in hid_pidff_init()
	HID: i2c-hid: fix format string mismatch
	net/sched: act_ct: Fix ct template allocation for zone 0
	ACPICA: Clean up context mutex during object deletion
	netfilter: nft_ct: skip expectations for confirmed conntrack
	netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches
	ieee802154: fix error return code in ieee802154_add_iface()
	ieee802154: fix error return code in ieee802154_llsec_getparams()
	ixgbevf: add correct exception tracing for XDP
	ipv6: Fix KASAN: slab-out-of-bounds Read in fib6_nh_flush_exceptions
	ice: write register with correct offset
	ice: Fix VFR issues for AVF drivers that expect ATQLEN cleared
	ice: Allow all LLDP packets from PF to Tx
	i2c: qcom-geni: Add shutdown callback for i2c
	i40e: optimize for XDP_REDIRECT in xsk path
	i40e: add correct exception tracing for XDP
	arm64: dts: ls1028a: fix memory node
	arm64: dts: zii-ultra: fix 12V_MAIN voltage
	ARM: dts: imx7d-meerkat96: Fix the 'tuning-step' property
	ARM: dts: imx7d-pico: Fix the 'tuning-step' property
	ARM: dts: imx: emcon-avari: Fix nxp,pca8574 #gpio-cells
	bus: ti-sysc: Fix flakey idling of uarts and stop using swsup_sidle_act
	tipc: add extack messages for bearer/media failure
	tipc: fix unique bearer names sanity check
	Bluetooth: fix the erroneous flush_work() order
	Bluetooth: use correct lock to prevent UAF of hdev object
	net: caif: added cfserl_release function
	net: caif: add proper error handling
	net: caif: fix memory leak in caif_device_notify
	net: caif: fix memory leak in cfusbl_device_notify
	HID: i2c-hid: Skip ELAN power-on command after reset
	HID: magicmouse: fix NULL-deref on disconnect
	HID: multitouch: require Finger field to mark Win8 reports as MT
	ALSA: timer: Fix master timer notification
	ALSA: hda: Fix for mute key LED for HP Pavilion 15-CK0xx
	ARM: dts: imx6dl-yapp4: Fix RGMII connection to QCA8334 switch
	ARM: dts: imx6q-dhcom: Add PU,VDD1P1,VDD2P5 regulators
	ext4: fix bug on in ext4_es_cache_extent as ext4_split_extent_at failed
	usb: dwc2: Fix build in periphal-only mode
	pid: take a reference when initializing `cad_pid`
	ocfs2: fix data corruption by fallocate
	nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect
	drm/amdgpu: Don't query CE and UE errors
	drm/amdgpu: make sure we unpin the UVD BO
	x86/apic: Mark _all_ legacy interrupts when IO/APIC is missing
	btrfs: mark ordered extent and inode with error if we fail to finish
	btrfs: fix error handling in btrfs_del_csums
	btrfs: return errors from btrfs_del_csums in cleanup_ref_head
	btrfs: fixup error handling in fixup_inode_link_counts
	mm, hugetlb: fix simple resv_huge_pages underflow on UFFDIO_COPY
	bnxt_en: Remove the setting of dev_port.
	mm: add thp_order
	XArray: add xa_get_order
	XArray: add xas_split
	mm/filemap: fix storing to a THP shadow entry
	btrfs: fix unmountable seed device after fstrim
	KVM: SVM: Truncate GPR value for DR and CR accesses in !64-bit mode
	KVM: arm64: Fix debug register indexing
	x86/kvm: Teardown PV features on boot CPU as well
	x86/kvm: Disable kvmclock on all CPUs on shutdown
	x86/kvm: Disable all PV features on crash
	lib/lz4: explicitly support in-place decompression
	xen-pciback: redo VF placement in the virtual topology
	i2c: qcom-geni: Suspend and resume the bus during SYSTEM_SLEEP_PM ops
	neighbour: allow NUD_NOARP entries to be forced GCed
	Linux 5.4.125

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I7228d64dfff6856a9a277bf07acf84a87f947466
parents a0b0dc25 3909e237

Documentation/core-api/xarray.rst

+9 −7
Original line number Diff line number Diff line
@@ -461,13 +461,15 @@ or iterations will move the index to the first index in the range. 
Each entry will only be returned once, no matter how many indices it

occupies.



Using xas_next() or xas_prev() with a multi-index xa_state

is not supported.  Using either of these functions on a multi-index entry

will reveal sibling entries; these should be skipped over by the caller.



Storing ``NULL`` into any index of a multi-index entry will set the entry

at every index to ``NULL`` and dissolve the tie.  Splitting a multi-index

entry into entries occupying smaller ranges is not yet supported.

Using xas_next() or xas_prev() with a multi-index xa_state is not

supported.  Using either of these functions on a multi-index entry will

reveal sibling entries; these should be skipped over by the caller.



Storing ``NULL`` into any index of a multi-index entry will set the

entry at every index to ``NULL`` and dissolve the tie.  A multi-index

entry can be split into entries occupying smaller ranges by calling

xas_split_alloc() without the xa_lock held, followed by taking the lock

and calling xas_split().



Functions and structures

========================

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 124

SUBLEVEL = 125

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/boot/dts/imx6dl-yapp4-common.dtsi

+5 −1
Original line number Diff line number Diff line
@@ -99,9 +99,13 @@ 
	phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;

	phy-reset-duration = <20>;

	phy-supply = <&sw2_reg>;

	phy-handle = <&ethphy0>;

	status = "okay";



	fixed-link {

		speed = <1000>;

		full-duplex;

	};



	mdio {

		#address-cells = <1>;

		#size-cells = <0>;

arch/arm/boot/dts/imx6q-dhcom-som.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -408,6 +408,18 @@ 
	vin-supply = <&sw1_reg>;

};



&reg_pu {

	vin-supply = <&sw1_reg>;

};



&reg_vdd1p1 {

	vin-supply = <&sw2_reg>;

};



&reg_vdd2p5 {

	vin-supply = <&sw2_reg>;

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart1>;

arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ 
		compatible = "nxp,pca8574";

		reg = <0x3a>;

		gpio-controller;

		#gpio-cells = <1>;

		#gpio-cells = <2>;

	};

};