diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-12-19 03:37:07 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-12-19 03:37:07 +0300 |
| commit | ab1c247094e323177a578b38f0325bf79f0317ac (patch) | |
| tree | 97ff10609587158d6f726f5d1b118b13339501d9 /usr | |
| parent | 71225af17f611632226a4a2fae25235fd8dad268 (diff) | |
| parent | 2cf4f94d8e8646803f8fb0facf134b0cd7fb691a (diff) | |
| download | linux-ab1c247094e323177a578b38f0325bf79f0317ac.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick up fixes that went thru perf-tools for v6.7 and to get in sync
with upstream to check for drift in the copies of headers, etc.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/include/Makefile | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/usr/include/Makefile b/usr/include/Makefile index 07796df0a295..338c81f1fcf3 100644 --- a/usr/include/Makefile +++ b/usr/include/Makefile @@ -59,12 +59,6 @@ ifeq ($(SRCARCH),arc) no-header-test += linux/bpf_perf_event.h endif -ifeq ($(SRCARCH),ia64) -no-header-test += asm/setup.h -no-header-test += asm/sigcontext.h -no-header-test += linux/if_bonding.h -endif - ifeq ($(SRCARCH),powerpc) no-header-test += linux/bpf_perf_event.h endif |