diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-07-16 04:32:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-07-16 04:33:01 +1000 |
| commit | f6ac3a68496efc5f1b6d2b0a2101fba03b0ab94f (patch) | |
| tree | 0fa9edf1b9dac68f5a94fb013b31e0ac6ba4183a /arch/x86/include/asm/bootparam_utils.h | |
| parent | 3729fe2bc2a01f4cc1aa88be8f64af06084c87d6 (diff) | |
| parent | fec88ab0af9706b2201e5daf377c5031c62d11f7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-nextdrm-next-5.3-backmerge-conflicts
Example backmerge for Linus
Diffstat (limited to 'arch/x86/include/asm/bootparam_utils.h')
| -rw-r--r-- | arch/x86/include/asm/bootparam_utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/bootparam_utils.h b/arch/x86/include/asm/bootparam_utils.h index f6f6ef436599..101eb944f13c 100644 --- a/arch/x86/include/asm/bootparam_utils.h +++ b/arch/x86/include/asm/bootparam_utils.h @@ -24,7 +24,7 @@ static void sanitize_boot_params(struct boot_params *boot_params) * IMPORTANT NOTE TO BOOTLOADER AUTHORS: do not simply clear * this field. The purpose of this field is to guarantee * compliance with the x86 boot spec located in - * Documentation/x86/boot.txt . That spec says that the + * Documentation/x86/boot.rst . That spec says that the * *whole* structure should be cleared, after which only the * portion defined by struct setup_header (boot_params->hdr) * should be copied in. |