diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-04 22:03:00 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-04 22:03:00 +0100 |
commit | 87da4064701f9ed70e8c25b5ee9165450b1d0c40 (patch) | |
tree | 45a6d6bd73ec6910d0d784091e471915beed0723 /kernel-aarch64-debug-rhel.config | |
parent | d656fcc48d8b13a41be16c7ec477c1f9a0c0d806 (diff) | |
parent | 51aa5c5b1d358b0ca3334ad97ab57570830d324c (diff) | |
download | kernel-87da4064701f9ed70e8c25b5ee9165450b1d0c40.tar.gz kernel-87da4064701f9ed70e8c25b5ee9165450b1d0c40.tar.xz kernel-87da4064701f9ed70e8c25b5ee9165450b1d0c40.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc2.114.vanilla.1.fc33kernel-5.11.0-0.rc2.114.vanilla.1.fc32
Diffstat (limited to 'kernel-aarch64-debug-rhel.config')
-rw-r--r-- | kernel-aarch64-debug-rhel.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 63df98680..68567baed 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2599,6 +2599,7 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_KALLSYMS=y # CONFIG_KARMA_PARTITION is not set CONFIG_KASAN_GENERIC=y +CONFIG_KASAN_HW_TAGS=y CONFIG_KASAN_INLINE=y # CONFIG_KASAN_OUTLINE is not set # CONFIG_KASAN_SW_TAGS is not set @@ -4659,7 +4660,6 @@ CONFIG_SCSI_IPR_TRACE=y # CONFIG_SCSI_ISCI is not set CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_LOGGING=y -# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_LPFC_DEBUG_FS is not set CONFIG_SCSI_LPFC=m |