Merge branch 'timers/urgent' into timers/core, to pick up dependent fix (57957fb5) · Commits · e / devices / android_kernel_oneplus_sm7250

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
		Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
		Mark Brown <broonie@sirena.org.uk>
		Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
		Matthieu CASTET <castet.matthieu@free.fr>

Documentation/gpu/i915.rst

+1 −4

Original line number	Diff line number	Diff line
		@@ -341,10 +341,7 @@ GuC
		GuC-specific firmware loader
		----------------------------

		.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c
		:doc: GuC-specific firmware loader

		.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c
		.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_fw.c
		:internal:

		GuC-based command submission

Documentation/x86/x86_64/mm.txt

+11 −7

Original line number	Diff line number	Diff line
		@@ -12,8 +12,9 @@ ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB)
		... unused hole ...
		ffffec0000000000 - fffffbffffffffff (=44 bits) kasan shadow memory (16TB)
		... unused hole ...
		fffffe0000000000 - fffffe7fffffffff (=39 bits) LDT remap for PTI
		fffffe8000000000 - fffffeffffffffff (=39 bits) cpu_entry_area mapping
		vaddr_end for KASLR
		fffffe0000000000 - fffffe7fffffffff (=39 bits) cpu_entry_area mapping
		fffffe8000000000 - fffffeffffffffff (=39 bits) LDT remap for PTI
		ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks
		... unused hole ...
		ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space
		@@ -37,13 +38,15 @@ ffd4000000000000 - ffd5ffffffffffff (=49 bits) virtual memory map (512TB)
		... unused hole ...
		ffdf000000000000 - fffffc0000000000 (=53 bits) kasan shadow memory (8PB)
		... unused hole ...
		fffffe8000000000 - fffffeffffffffff (=39 bits) cpu_entry_area mapping
		vaddr_end for KASLR
		fffffe0000000000 - fffffe7fffffffff (=39 bits) cpu_entry_area mapping
		... unused hole ...
		ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks
		... unused hole ...
		ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space
		... unused hole ...
		ffffffff80000000 - ffffffff9fffffff (=512 MB) kernel text mapping, from phys 0
		ffffffffa0000000 - [fixmap start] (~1526 MB) module mapping space
		ffffffffa0000000 - fffffffffeffffff (1520 MB) module mapping space
		[fixmap start] - ffffffffff5fffff kernel-internal fixmap range
		ffffffffff600000 - ffffffffff600fff (=4 kB) legacy vsyscall ABI
		ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole
		@@ -67,9 +70,10 @@ memory window (this size is arbitrary, it can be raised later if needed).
		The mappings are not part of any other kernel PGD and are only available
		during EFI runtime calls.

		The module mapping space size changes based on the CONFIG requirements for the
		following fixmap section.

		Note that if CONFIG_RANDOMIZE_MEMORY is enabled, the direct mapping of all
		physical memory, vmalloc/ioremap space and virtual memory map are randomized.
		Their order is preserved but their base will be offset early at boot time.

		Be very careful vs. KASLR when changing anything here. The KASLR address
		range must not overlap with anything except the KASAN shadow area, which is
		correct as KASAN disables KASLR.

MAINTAINERS

+3 −4

Original line number	Diff line number	Diff line
		@@ -5149,15 +5149,15 @@ F: sound/usb/misc/ua101.c
		EFI TEST DRIVER
		L: linux-efi@vger.kernel.org
		M: Ivan Hu <ivan.hu@canonical.com>
		M: Matt Fleming <matt@codeblueprint.co.uk>
		M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
		S: Maintained
		F: drivers/firmware/efi/test/

		EFI VARIABLE FILESYSTEM
		M: Matthew Garrett <matthew.garrett@nebula.com>
		M: Jeremy Kerr <jk@ozlabs.org>
		M: Matt Fleming <matt@codeblueprint.co.uk>
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
		M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
		L: linux-efi@vger.kernel.org
		S: Maintained
		F: fs/efivarfs/
		@@ -5318,7 +5318,6 @@ S: Supported
		F: security/integrity/evm/

		EXTENSIBLE FIRMWARE INTERFACE (EFI)
		M: Matt Fleming <matt@codeblueprint.co.uk>
		M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
		L: linux-efi@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git

arch/arm/boot/dts/aspeed-g4.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -219,7 +219,7 @@
		compatible = "aspeed,ast2400-vuart";
		reg = <0x1e787000 0x40>;
		reg-shift = <2>;
		interrupts = <10>;
		interrupts = <8>;
		clocks = <&clk_uart>;
		no-loopback-test;
		status = "disabled";