diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-01 21:03:51 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-01 21:03:51 +0200 |
| commit | 655783b8fc1cd718bb30a34c6eded31ea506aba8 (patch) | |
| tree | b6a0256644b53c34c4d97497d02d74ea56adf543 /patch-5.15-redhat.patch | |
| parent | 4f7472ccd0a7b6a9ab0c005e9dbbd1663e165889 (diff) | |
| parent | 9c83d246016183e2b5e8ec71b5915057e7873130 (diff) | |
| download | kernel-655783b8fc1cd718bb30a34c6eded31ea506aba8.tar.gz kernel-655783b8fc1cd718bb30a34c6eded31ea506aba8.tar.xz kernel-655783b8fc1cd718bb30a34c6eded31ea506aba8.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'patch-5.15-redhat.patch')
| -rw-r--r-- | patch-5.15-redhat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch index 139942cf9..c23d95a6e 100644 --- a/patch-5.15-redhat.patch +++ b/patch-5.15-redhat.patch @@ -3050,10 +3050,10 @@ index 9ffa9e9c5c55..36484cc9842d 100644 int security_perf_event_open(struct perf_event_attr *attr, int type) { diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile -index 866531c08e4f..40dadc919226 100644 +index 799b88152e9e..73c687d900c3 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile -@@ -425,7 +425,6 @@ $(TRUNNER_TEST_OBJS): $(TRUNNER_OUTPUT)/%.test.o: \ +@@ -426,7 +426,6 @@ $(TRUNNER_TEST_OBJS): $(TRUNNER_OUTPUT)/%.test.o: \ $(TRUNNER_BPF_OBJS) \ $(TRUNNER_BPF_SKELS) \ $(TRUNNER_BPF_LSKELS) \ |