diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-18 17:45:53 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-18 17:45:53 +0200 |
| commit | 6848da5bf47ef81870fd7f0532f712c392e88550 (patch) | |
| tree | b10715af72cb6a7f4f5e330e300544e24d791fac /patch-6.1-redhat.patch | |
| parent | adc0d7fc819315fc740fcec8fd377646e0f17773 (diff) | |
| parent | 127f59bb3078847e767f24ce0e8cba4fa4e005f8 (diff) | |
| download | kernel-6.1.0-0.rc1.20221018gitbb1a1146467a.16.vanilla.1.fc37.tar.gz kernel-6.1.0-0.rc1.20221018gitbb1a1146467a.16.vanilla.1.fc37.tar.xz kernel-6.1.0-0.rc1.20221018gitbb1a1146467a.16.vanilla.1.fc37.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.1.0-0.rc1.20221018gitbb1a1146467a.16.vanilla.1.fc37
Diffstat (limited to 'patch-6.1-redhat.patch')
| -rw-r--r-- | patch-6.1-redhat.patch | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch index 4f296e91f..1a6e3898c 100644 --- a/patch-6.1-redhat.patch +++ b/patch-6.1-redhat.patch @@ -64,7 +64,9 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 66 files changed, 1540 insertions(+), 187 deletions(-) + tools/perf/Documentation/arm-coresight.txt | 5 + + tools/perf/Documentation/perf-arm-coresight.txt | 5 - + 68 files changed, 1545 insertions(+), 192 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index a465d5242774..191876dd4731 100644 @@ -3008,3 +3010,25 @@ 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. |