diff options
author | Dave Airlie <airlied@redhat.com> | 2023-06-19 07:59:52 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2023-06-19 08:01:25 +0200 |
commit | cce3b573a52a41dd7face9dbf745f10f9bf4632b (patch) | |
tree | 4540c11587221cfb90ac9cfb7916b2d2c17c6127 /arch/s390/kernel/Makefile | |
parent | Merge tag 'amd-drm-next-6.5-2023-06-16' of https://gitlab.freedesktop.org/agd... (diff) | |
parent | Linux 6.4-rc7 (diff) | |
download | linux-cce3b573a52a41dd7face9dbf745f10f9bf4632b.tar.xz linux-cce3b573a52a41dd7face9dbf745f10f9bf4632b.zip |
Backmerge tag 'v6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
Linux 6.4-rc7
Need this to pull in the msm work.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'arch/s390/kernel/Makefile')
-rw-r--r-- | arch/s390/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index 8983837b3565..6b2a051e1f8a 100644 --- a/arch/s390/kernel/Makefile +++ b/arch/s390/kernel/Makefile @@ -10,6 +10,7 @@ CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE) # Do not trace early setup code CFLAGS_REMOVE_early.o = $(CC_FLAGS_FTRACE) +CFLAGS_REMOVE_rethook.o = $(CC_FLAGS_FTRACE) endif |