Messages in this thread | | | Date | Fri, 26 Feb 2016 12:53:25 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the arm64 tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/firmware/efi/libstub/efistub.h
between commits:
e4fbf4767440 ("efi: stub: implement efi_get_random_bytes() based on EFI_RNG_PROTOCOL") 2ddbfc81eac8 ("efi: stub: add implementation of efi_random_alloc()")
from the arm64 tree and commit:
b9d6769b5678 ("efi/arm*: Perform hardware compatibility check")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell
diff --cc drivers/firmware/efi/libstub/efistub.h index 5ed3d3f38166,981c6035ce09..000000000000 --- a/drivers/firmware/efi/libstub/efistub.h +++ b/drivers/firmware/efi/libstub/efistub.h @@@ -43,11 -53,6 +53,13 @@@ void efi_get_virtmap(efi_memory_desc_t unsigned long desc_size, efi_memory_desc_t *runtime_map, int *count); +efi_status_t efi_get_random_bytes(efi_system_table_t *sys_table, + unsigned long size, u8 *out); + +efi_status_t efi_random_alloc(efi_system_table_t *sys_table_arg, + unsigned long size, unsigned long align, + unsigned long *addr, unsigned long random_seed); + + efi_status_t check_platform_features(efi_system_table_t *sys_table_arg); + #endif
| |