diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-27 20:44:07 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-27 20:44:07 +0200 |
| commit | 92254746699f086972351228a952ed3f6bf8e4fd (patch) | |
| tree | 7a529fa438c6b9d606525afb544130d0dd3dfbf0 /patch-6.1-redhat.patch | |
| parent | 0361349f590a361051dafca2a59cbedf5d8c052b (diff) | |
| parent | 2561a53268093a5f3c2fc6077055856484f391f7 (diff) | |
| download | kernel-6.1.0-0.rc2.20221027gitb229b6ca5abb.23.vanilla.1.fc37.tar.gz kernel-6.1.0-0.rc2.20221027gitb229b6ca5abb.23.vanilla.1.fc37.tar.xz kernel-6.1.0-0.rc2.20221027gitb229b6ca5abb.23.vanilla.1.fc37.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.1.0-0.rc2.20221027gitb229b6ca5abb.23.vanilla.1.fc38kernel-6.1.0-0.rc2.20221027gitb229b6ca5abb.23.vanilla.1.fc37kernel-6.1.0-0.rc2.20221027gitb229b6ca5abb.23.vanilla.1.fc36kernel-6.1.0-0.rc2.20221027gitb229b6ca5abb.23.vanilla.1.fc35
Diffstat (limited to 'patch-6.1-redhat.patch')
| -rw-r--r-- | patch-6.1-redhat.patch | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch index a66b36e68..caadd41cd 100644 --- a/patch-6.1-redhat.patch +++ b/patch-6.1-redhat.patch @@ -64,9 +64,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - tools/perf/Documentation/arm-coresight.txt | 5 + - tools/perf/Documentation/perf-arm-coresight.txt | 5 - - 68 files changed, 1545 insertions(+), 192 deletions(-) + 66 files changed, 1540 insertions(+), 187 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index a465d5242774..191876dd4731 100644 @@ -3010,25 +3008,3 @@ index 79d82cb6e469..843b0dd8f0dd 100644 #ifdef CONFIG_PERF_EVENTS int security_perf_event_open(struct perf_event_attr *attr, int type) { -diff --git a/tools/perf/Documentation/arm-coresight.txt b/tools/perf/Documentation/arm-coresight.txt -new file mode 100644 -index 000000000000..c117fc50a2a9 ---- /dev/null -+++ b/tools/perf/Documentation/arm-coresight.txt -@@ -0,0 +1,5 @@ -+Arm CoreSight Support -+===================== -+ -+For full documentation, see Documentation/trace/coresight/coresight-perf.rst -+in the kernel tree. -diff --git a/tools/perf/Documentation/perf-arm-coresight.txt b/tools/perf/Documentation/perf-arm-coresight.txt -deleted file mode 100644 -index c117fc50a2a9..000000000000 ---- a/tools/perf/Documentation/perf-arm-coresight.txt -+++ /dev/null -@@ -1,5 +0,0 @@ --Arm CoreSight Support --===================== -- --For full documentation, see Documentation/trace/coresight/coresight-perf.rst --in the kernel tree. |