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

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

Merge 5.4.272 into android11-5.4-lts 



Changes in 5.4.272
	lan78xx: Fix white space and style issues
	lan78xx: Add missing return code checks
	lan78xx: Fix partial packet errors on suspend/resume
	lan78xx: Fix race conditions in suspend/resume handling
	net: lan78xx: fix runtime PM count underflow on link stop
	ixgbe: {dis, en}able irqs in ixgbe_txrx_ring_{dis, en}able
	geneve: make sure to pull inner header in geneve_rx()
	net: ice: Fix potential NULL pointer dereference in ice_bridge_setlink()
	net/ipv6: avoid possible UAF in ip6_route_mpath_notify()
	net/rds: fix WARNING in rds_conn_connect_if_down
	netfilter: nft_ct: fix l3num expectations with inet pseudo family
	netfilter: nf_conntrack_h323: Add protection for bmp length out of range
	netrom: Fix a data-race around sysctl_netrom_default_path_quality
	netrom: Fix a data-race around sysctl_netrom_obsolescence_count_initialiser
	netrom: Fix data-races around sysctl_netrom_network_ttl_initialiser
	netrom: Fix a data-race around sysctl_netrom_transport_timeout
	netrom: Fix a data-race around sysctl_netrom_transport_maximum_tries
	netrom: Fix a data-race around sysctl_netrom_transport_acknowledge_delay
	netrom: Fix a data-race around sysctl_netrom_transport_busy_delay
	netrom: Fix a data-race around sysctl_netrom_transport_requested_window_size
	netrom: Fix a data-race around sysctl_netrom_transport_no_activity_timeout
	netrom: Fix a data-race around sysctl_netrom_routing_control
	netrom: Fix a data-race around sysctl_netrom_link_fails_count
	netrom: Fix data-races around sysctl_net_busy_read
	selftests: mm: fix map_hugetlb failure on 64K page size systems
	um: allow not setting extra rpaths in the linux binary
	serial: max310x: Use devm_clk_get_optional() to get the input clock
	serial: max310x: Try to get crystal clock rate from property
	serial: max310x: fail probe if clock crystal is unstable
	serial: max310x: Make use of device properties
	serial: max310x: use regmap methods for SPI batch operations
	serial: max310x: use a separate regmap for each port
	serial: max310x: prevent infinite while() loop in port startup
	Input: i8042 - fix strange behavior of touchpad on Clevo NS70PU
	hv_netvsc: Make netvsc/VF binding check both MAC and serial number
	hv_netvsc: use netif_is_bond_master() instead of open code
	hv_netvsc: Register VF in netvsc_probe if NET_DEVICE_REGISTER missed
	y2038: rusage: use __kernel_old_timeval
	getrusage: add the "signal_struct *sig" local variable
	getrusage: move thread_group_cputime_adjusted() outside of lock_task_sighand()
	getrusage: use __for_each_thread()
	getrusage: use sig->stats_lock rather than lock_task_sighand()
	serial: max310x: Unprepare and disable clock in error path
	regmap: allow to define reg_update_bits for no bus configuration
	regmap: Add bulk read/write callbacks into regmap_config
	serial: max310x: make accessing revision id interface-agnostic
	serial: max310x: implement I2C support
	serial: max310x: fix IO data corruption in batched operations
	arm64: dts: qcom: add PDC interrupt controller for SDM845
	arm64: dts: qcom: sdm845: fix USB DP/DM HS PHY interrupts
	Linux 5.4.272

Change-Id: Ia3f453dd3f080776d3fdd46b1ea58c6554a70fd6
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 79ed7de6 84075826

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 271

SUBLEVEL = 272

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/alpha/kernel/osf_sys.c

+1 −1
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ put_tv32(struct timeval32 __user *o, struct timespec64 *i) 
}



static inline long

put_tv_to_tv32(struct timeval32 __user *o, struct timeval *i)

put_tv_to_tv32(struct timeval32 __user *o, struct __kernel_old_timeval *i)

{

	return copy_to_user(o, &(struct timeval32){

				.tv_sec = i->tv_sec,

arch/um/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -85,6 +85,19 @@ config LD_SCRIPT_DYN 
	depends on !LD_SCRIPT_STATIC

	select MODULE_REL_CRCS if MODVERSIONS



config LD_SCRIPT_DYN_RPATH

	bool "set rpath in the binary" if EXPERT

	default y

	depends on LD_SCRIPT_DYN

	help

	  Add /lib (and /lib64 for 64-bit) to the linux binary's rpath

	  explicitly.



	  You may need to turn this off if compiling for nix systems

	  that have their libraries in random /nix directories and

	  might otherwise unexpected use libraries from /lib or /lib64

	  instead of the desired ones.



config HOSTFS

	tristate "Host filesystem"

	help

arch/um/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -118,7 +118,8 @@ archprepare: 
	$(Q)$(MAKE) $(build)=$(HOST_DIR)/um include/generated/user_constants.h



LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static

LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib $(call cc-option, -no-pie)

LINK-$(CONFIG_LD_SCRIPT_DYN) += $(call cc-option, -no-pie)

LINK-$(CONFIG_LD_SCRIPT_DYN_RPATH) += -Wl,-rpath,/lib



CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) \

	$(call cc-option, -fno-stack-protector,) \

arch/x86/Makefile.um

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ ELF_FORMAT := elf64-x86-64 


# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.



LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64

LINK-$(CONFIG_LD_SCRIPT_DYN_RPATH) += -Wl,-rpath,/lib64

LINK-y += -m64



endif