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

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

Merge 5.4.237 into android11-5.4-lts 



Changes in 5.4.237
	fs: prevent out-of-bounds array speculation when closing a file descriptor
	x86/CPU/AMD: Disable XSAVES on AMD family 0x17
	drm/connector: print max_requested_bpc in state debugfs
	ext4: fix RENAME_WHITEOUT handling for inline directories
	ext4: fix another off-by-one fsmap error on 1k block filesystems
	ext4: move where set the MAY_INLINE_DATA flag is set
	ext4: fix WARNING in ext4_update_inline_data
	ext4: zero i_disksize when initializing the bootloader inode
	nfc: change order inside nfc_se_io error path
	iommu/amd: Add PCI segment support for ivrs_[ioapic/hpet/acpihid] commands
	iommu/amd: Fix ill-formed ivrs_ioapic, ivrs_hpet and ivrs_acpihid options
	iommu/amd: Add a length limitation for the ivrs_acpihid command-line parameter
	ipmi:ssif: make ssif_i2c_send() void
	ipmi:ssif: resend_msg() cannot fail
	ipmi:ssif: Remove rtc_us_timer
	ipmi:ssif: Increase the message retry time
	ipmi:ssif: Add a timer between request retries
	irqdomain: Change the type of 'size' in __irq_domain_add() to be consistent
	irqdomain: Fix domain registration race
	iommu/vt-d: Fix PASID directory pointer coherency
	SMB3: Backup intent flag missing from some more ops
	cifs: Fix uninitialized memory read in smb3_qfs_tcon()
	scsi: core: Remove the /proc/scsi/${proc_name} directory earlier
	ext4: Fix possible corruption when moving a directory
	drm/msm/a5xx: fix setting of the CP_PREEMPT_ENABLE_LOCAL register
	nfc: fdp: add null check of devm_kmalloc_array in fdp_nci_i2c_read_device_properties
	ila: do not generate empty messages in ila_xlat_nl_cmd_get_mapping()
	selftests: nft_nat: ensuring the listening side is up before starting the client
	net: usb: lan78xx: Remove lots of set but unused 'ret' variables
	net: lan78xx: fix accessing the LAN7800's internal phy specific registers from the MAC driver
	net: caif: Fix use-after-free in cfusbl_device_notify()
	bnxt_en: Avoid order-5 memory allocation for TPA data
	netfilter: tproxy: fix deadlock due to missing BH disable
	btf: fix resolving BTF_KIND_VAR after ARRAY, STRUCT, UNION, PTR
	scsi: megaraid_sas: Update max supported LD IDs to 240
	net/smc: fix fallback failed while sendmsg with fastopen
	riscv: Use READ_ONCE_NOCHECK in imprecise unwinding stack mode
	ext4: Fix deadlock during directory rename
	MIPS: Fix a compilation issue
	alpha: fix R_ALPHA_LITERAL reloc for large modules
	macintosh: windfarm: Use unsigned type for 1-bit bitfields
	PCI: Add SolidRun vendor ID
	media: ov5640: Fix analogue gain control
	ipmi/watchdog: replace atomic_add() and atomic_sub()
	ipmi:watchdog: Set panic count to proper value on a panic
	drm/i915: Don't use BAR mappings for ring buffers with LLC
	x86, vmlinux.lds: Add RUNTIME_DISCARD_EXIT to generic DISCARDS
	arch: fix broken BuildID for arm64 and riscv
	powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT
	powerpc/vmlinux.lds: Don't discard .rela* for relocatable builds
	s390: define RUNTIME_DISCARD_EXIT to fix link error with GNU ld < 2.36
	sh: define RUNTIME_DISCARD_EXIT
	UML: define RUNTIME_DISCARD_EXIT
	s390/dasd: add missing discipline function
	Linux 5.4.237

Change-Id: Ic3637e3e33d2e4e109773803306c3941219152d7
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents fd02046f e4b5c766

Documentation/admin-guide/kernel-parameters.txt

+42 −9
Original line number Diff line number Diff line
@@ -1944,24 +1944,57 @@ 


	ivrs_ioapic	[HW,X86_64]

			Provide an override to the IOAPIC-ID<->DEVICE-ID

			mapping provided in the IVRS ACPI table. For

			example, to map IOAPIC-ID decimal 10 to

			PCI device 00:14.0 write the parameter as:

			mapping provided in the IVRS ACPI table.

			By default, PCI segment is 0, and can be omitted.



			For example, to map IOAPIC-ID decimal 10 to

			PCI segment 0x1 and PCI device 00:14.0,

			write the parameter as:

				ivrs_ioapic=10@0001:00:14.0



			Deprecated formats:

			* To map IOAPIC-ID decimal 10 to PCI device 00:14.0

			  write the parameter as:

				ivrs_ioapic[10]=00:14.0

			* To map IOAPIC-ID decimal 10 to PCI segment 0x1 and

			  PCI device 00:14.0 write the parameter as:

				ivrs_ioapic[10]=0001:00:14.0



	ivrs_hpet	[HW,X86_64]

			Provide an override to the HPET-ID<->DEVICE-ID

			mapping provided in the IVRS ACPI table. For

			example, to map HPET-ID decimal 0 to

			PCI device 00:14.0 write the parameter as:

			mapping provided in the IVRS ACPI table.

			By default, PCI segment is 0, and can be omitted.



			For example, to map HPET-ID decimal 10 to

			PCI segment 0x1 and PCI device 00:14.0,

			write the parameter as:

				ivrs_hpet=10@0001:00:14.0



			Deprecated formats:

			* To map HPET-ID decimal 0 to PCI device 00:14.0

			  write the parameter as:

				ivrs_hpet[0]=00:14.0

			* To map HPET-ID decimal 10 to PCI segment 0x1 and

			  PCI device 00:14.0 write the parameter as:

				ivrs_ioapic[10]=0001:00:14.0



	ivrs_acpihid	[HW,X86_64]

			Provide an override to the ACPI-HID:UID<->DEVICE-ID

			mapping provided in the IVRS ACPI table. For

			example, to map UART-HID:UID AMD0020:0 to

			PCI device 00:14.5 write the parameter as:

			mapping provided in the IVRS ACPI table.

			By default, PCI segment is 0, and can be omitted.



			For example, to map UART-HID:UID AMD0020:0 to

			PCI segment 0x1 and PCI device ID 00:14.5,

			write the parameter as:

				ivrs_acpihid=AMD0020:0@0001:00:14.5



			Deprecated formats:

			* To map UART-HID:UID AMD0020:0 to PCI segment is 0,

			  PCI device ID 00:14.5, write the parameter as:

				ivrs_acpihid[00:14.5]=AMD0020:0

			* To map UART-HID:UID AMD0020:0 to PCI segment 0x1 and

			  PCI device ID 00:14.5, write the parameter as:

				ivrs_acpihid[0001:00:14.5]=AMD0020:0



	js=		[HW,JOY] Analog joystick

			See Documentation/input/joydev/joystick.rst.

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 236

SUBLEVEL = 237

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/alpha/kernel/module.c

+1 −3
Original line number Diff line number Diff line
@@ -146,10 +146,8 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab, 
	base = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr;

	symtab = (Elf64_Sym *)sechdrs[symindex].sh_addr;



	/* The small sections were sorted to the end of the segment.

	   The following should definitely cover them.  */

	gp = (u64)me->core_layout.base + me->core_layout.size - 0x8000;

	got = sechdrs[me->arch.gotsecindex].sh_addr;

	gp = got + 0x8000;



	for (i = 0; i < n; i++) {

		unsigned long r_sym = ELF64_R_SYM (rela[i].r_info);

arch/mips/include/asm/mach-rc32434/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ struct pci_msu { 
				 PCI_CFG04_STAT_SSE | \

				 PCI_CFG04_STAT_PE)



#define KORINA_CNFG1		((KORINA_STAT<<16)|KORINA_CMD)

#define KORINA_CNFG1		(KORINA_STAT | KORINA_CMD)



#define KORINA_REVID		0

#define KORINA_CLASS_CODE	0

arch/powerpc/kernel/vmlinux.lds.S

+5 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#endif



#define BSS_FIRST_SECTIONS *(.bss.prominit)

#define RUNTIME_DISCARD_EXIT



#include <asm/page.h>

#include <asm-generic/vmlinux.lds.h>
@@ -394,9 +395,12 @@ SECTIONS 
	DISCARDS

	/DISCARD/ : {

		*(*.EMB.apuinfo)

		*(.glink .iplt .plt .rela* .comment)

		*(.glink .iplt .plt .comment)

		*(.gnu.version*)

		*(.gnu.attributes)

		*(.eh_frame)

#ifndef CONFIG_RELOCATABLE

		*(.rela*)

#endif

	}

}