proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2026-01-27 11:55:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3b02a051d2
mirror_ubuntu-kernels/drivers/firmware/efi/libstub
History
Ingo Molnar 3b02a051d2 Linux 5.7-rc1 
-----BEGIN PGP SIGNATURE-----
 
 iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl6TbaUeHHRvcnZhbGRz
 QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGhgkH/iWpiKvosA20HJjC
 rBqYeJPxQsgZTuBieWJ+MeVxbpcF7RlM4c+glyvg3QJhHwIEG58dl6LBrQbAyBAR
 aFHNojr1iAYOruVCGnU3pA008YZiwUIDv/ZQ4DF8fmIU2vI2mJ6qHBv3XDl4G2uR
 Nwz8Eu9AgIwZM5coomVOSmoWyFy7Vxmb7W+3t5VmKsvOWx4ib9kyQtOIkvQDEl7j
 XCbWfI0xDQr6LFOm4jnCi5R/LhJ2LIqqIvHHrunbpszM8IwK797jCXz4im+dmd5Y
 +km46N7a8pDqri36xXz1gdBAU3eG7Pt1NyvfjwRVTdX4GquQ2MT0GoojxbLxUP3y
 3pEsQuE=
 =whbL
 -----END PGP SIGNATURE-----

Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh

Resolve these conflicts:

	arch/x86/Kconfig
	arch/x86/kernel/Makefile

Do a minor "evil merge" to move the KCSAN entry up a bit by a few lines
in the Kconfig to reduce the probability of future conflicts.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2020-04-13 09:44:39 +02:00
..
arm32-stub.c efi/libstub/arm: Make efi_entry() an ordinary PE/COFF entrypoint 2020-02-22 23:37:37 +01:00
arm64-stub.c arm64 fixes: 2020-04-09 11:04:16 -07:00
arm-stub.c efi/libstub/arm: Fix spurious message that an initrd was loaded 2020-03-29 12:08:18 +02:00
efi-stub-helper.c efi/libstub/x86: Make loaded_image protocol handling mixed mode safe 2020-02-23 21:59:42 +01:00
efistub.h efi/libstub/x86: Use Exit() boot service to exit the stub on errors 2020-02-23 21:59:42 +01:00
fdt.c efi/libstub: Simplify efi_high_alloc() and rename to efi_allocate_pages() 2020-02-23 21:57:15 +01:00
file.c efi/libstub: Fix error message in handle_cmdline_files() 2020-02-23 21:57:31 +01:00
gop.c efi/libstub: Rename efi_call_early/_runtime macros to be more intuitive 2019-12-25 10:49:25 +01:00
hidden.h efi/libstub: Use hidden visibility for all source files 2020-02-23 21:57:12 +01:00
Makefile Linux 5.7-rc1 2020-04-13 09:44:39 +02:00
mem.c efi/libstub: Describe efi_relocate_kernel() 2020-02-23 21:57:15 +01:00
pci.c efi: Allow disabling PCI busmastering on bridges during boot 2020-01-10 18:55:04 +01:00
random.c efi/libstub: Describe RNG functions 2020-02-23 21:57:19 +01:00
randomalloc.c efi/libstub: Move efi_random_alloc() into separate source file 2020-02-23 21:57:15 +01:00
secureboot.c efi/libstub: Rename efi_call_early/_runtime macros to be more intuitive 2019-12-25 10:49:25 +01:00
skip_spaces.c efi/libstub: Clean up command line parsing routine 2020-02-23 21:57:15 +01:00
string.c efi/libstub: Clean up command line parsing routine 2020-02-23 21:57:15 +01:00
tpm.c efi/libstub: Rename efi_call_early/_runtime macros to be more intuitive 2019-12-25 10:49:25 +01:00
x86-stub.c efi/x86: Fix cast of image argument 2020-03-08 10:00:08 +01:00