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

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

Merge 5.4.138 into android11-5.4-lts 



Changes in 5.4.138
	net_sched: check error pointer in tcf_dump_walker()
	x86/asm: Ensure asm/proto.h can be included stand-alone
	btrfs: fix rw device counting in __btrfs_free_extra_devids
	btrfs: mark compressed range uptodate only if all bio succeed
	Revert "ACPI: resources: Add checks for ACPI IRQ override"
	x86/kvm: fix vcpu-id indexed array sizes
	KVM: add missing compat KVM_CLEAR_DIRTY_LOG
	ocfs2: fix zero out valid data
	ocfs2: issue zeroout to EOF blocks
	can: j1939: j1939_xtp_rx_dat_one(): fix rxtimer value between consecutive TP.DT to 750ms
	can: raw: raw_setsockopt(): fix raw_rcv panic for sock UAF
	can: mcba_usb_start(): add missing urb->transfer_dma initialization
	can: usb_8dev: fix memory leak
	can: ems_usb: fix memory leak
	can: esd_usb2: fix memory leak
	HID: wacom: Re-enable touch by default for Cintiq 24HDT / 27QHDT
	NIU: fix incorrect error return, missed in previous revert
	nfc: nfcsim: fix use after free during module unload
	cfg80211: Fix possible memory leak in function cfg80211_bss_update
	netfilter: conntrack: adjust stop timestamp to real expiry value
	netfilter: nft_nat: allow to specify layer 4 protocol NAT only
	i40e: Fix logic of disabling queues
	i40e: Fix firmware LLDP agent related warning
	i40e: Fix queue-to-TC mapping on Tx
	i40e: Fix log TC creation failure when max num of queues is exceeded
	tipc: fix sleeping in tipc accept routine
	net: Set true network header for ECN decapsulation
	mlx4: Fix missing error code in mlx4_load_one()
	net: llc: fix skb_over_panic
	net/mlx5: Fix flow table chaining
	net/mlx5e: Fix nullptr in mlx5e_hairpin_get_mdev()
	sctp: fix return value check in __sctp_rcv_asconf_lookup
	tulip: windbond-840: Fix missing pci_disable_device() in probe and remove
	sis900: Fix missing pci_disable_device() in probe and remove
	can: hi311x: fix a signedness bug in hi3110_cmd()
	PCI: mvebu: Setup BAR0 in order to fix MSI
	powerpc/pseries: Fix regression while building external modules
	Revert "perf map: Fix dso->nsinfo refcounting"
	i40e: Add additional info to PHY type error
	can: j1939: j1939_session_deactivate(): clarify lifetime of session object
	Linux 5.4.138

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I6dc3dcde6ce71425f82f38b01fb5e36b7653de97
parents 758a7acf 7b90d57b

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 137

SUBLEVEL = 138

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/powerpc/platforms/pseries/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
#include "../../../../drivers/pci/pci.h"



DEFINE_STATIC_KEY_FALSE(shared_processor);

EXPORT_SYMBOL_GPL(shared_processor);

EXPORT_SYMBOL(shared_processor);



int CMO_PrPSP = -1;

int CMO_SecPSP = -1;

arch/x86/include/asm/proto.h

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 


#include <asm/ldt.h>



struct task_struct;



/* misc architecture specific prototypes */



void syscall_init(void);

arch/x86/kvm/ioapic.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic, 
static void rtc_irq_eoi_tracking_reset(struct kvm_ioapic *ioapic)

{

	ioapic->rtc_status.pending_eoi = 0;

	bitmap_zero(ioapic->rtc_status.dest_map.map, KVM_MAX_VCPU_ID);

	bitmap_zero(ioapic->rtc_status.dest_map.map, KVM_MAX_VCPU_ID + 1);

}



static void kvm_rtc_eoi_tracking_restore_all(struct kvm_ioapic *ioapic);

arch/x86/kvm/ioapic.h

+2 −2
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ struct kvm_vcpu; 


struct dest_map {

	/* vcpu bitmap where IRQ has been sent */

	DECLARE_BITMAP(map, KVM_MAX_VCPU_ID);

	DECLARE_BITMAP(map, KVM_MAX_VCPU_ID + 1);



	/*

	 * Vector sent to a given vcpu, only valid when

	 * the vcpu's bit in map is set

	 */

	u8 vectors[KVM_MAX_VCPU_ID];

	u8 vectors[KVM_MAX_VCPU_ID + 1];

};