summaryrefslogtreecommitdiffstats
path: root/patch-6.1-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-10-27 10:51:50 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-10-27 10:51:50 -0500
commit2561a53268093a5f3c2fc6077055856484f391f7 (patch)
tree1262040fff90825aefa06780b540c2d42a0b943b /patch-6.1-redhat.patch
parent3ccfa03911a226d4adfbd90bdc0499aee8472e68 (diff)
downloadkernel-2561a53268093a5f3c2fc6077055856484f391f7.tar.gz
kernel-2561a53268093a5f3c2fc6077055856484f391f7.tar.xz
kernel-2561a53268093a5f3c2fc6077055856484f391f7.zip
kernel-6.1.0-0.rc2.20221027gitb229b6ca5abb.23
* Thu Oct 27 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.b229b6ca5abb.23] - redhat/docs: Update with DISTLOCALVERSION (Prarit Bhargava) - Linux v6.1.0-0.rc2.b229b6ca5abb Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-6.1-redhat.patch')
-rw-r--r--patch-6.1-redhat.patch26
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.