Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.1.0-0.rc1.20221018gitbb1a1146467a.16.vanilla.1.fc37

5 files changed, 44 insertions, 13 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 39d4dc1fe..6f3deb6db 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 15
+RHEL_RELEASE = 16
 
 #
 # ZSTREAM
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 9544612ae..e55f4b5d3 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/92d99faf46b59fb16843b5bb06fae793419f60f1
+ 92d99faf46b59fb16843b5bb06fae793419f60f1 perf tools: Fix man page build wrt perf-arm-coresight.txt
+
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/a5465769aab281eaccf26b6b2c1659e26de74074
  a5465769aab281eaccf26b6b2c1659e26de74074 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
 
diff --git a/kernel.spec b/kernel.spec
index 4bed5fdad..27f731104 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -124,17 +124,17 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
 #  to build the base kernel using the debug configuration. (Specifying
 #  the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 # define buildid .local
 %define specversion 6.1.0
 %define patchversion 6.1
-%define pkgrelease 0.rc1.15
+%define pkgrelease 0.rc1.20221018gitbb1a1146467a.16
 %define kversion 6
-%define tarfile_release 6.1-rc1
+%define tarfile_release 6.1-rc1-10-gbb1a1146467a
 # This is needed to do merge window version magic
 %define patchlevel 1
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.15%{?buildid}%{?dist}
+%define specrelease 0.rc1.20221018gitbb1a1146467a.16%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.1.0
 
@@ -579,7 +579,7 @@ Requires: kernel-modules-uname-r = %{KVERREL}
 #
 # List the packages used during the kernel build
 #
-BuildRequires: kmod, patch, bash, coreutils, tar, git-core, which
+BuildRequires: kmod, bash, coreutils, tar, git-core, which
 BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
 BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++
 BuildRequires: net-tools, hostname, bc, elfutils-devel
@@ -1396,7 +1396,7 @@ if [ "%{patches}" != "%%{patches}" ] ; then
   done
 fi 2>/dev/null
 
-patch_command='patch -p1 -F1 -s'
+patch_command='git --work-tree=. apply'
 ApplyPatch()
 {
   local patch=$1
@@ -3194,8 +3194,12 @@ fi
 #
 #
 %changelog
-* Mon Oct 17 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc1.15]
-- Revert "redhat: properly handle binary files in patches" (Akihiko Odaki)
+* Tue Oct 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc1.bb1a1146467a.16]
+- perf tools: Fix man page build wrt perf-arm-coresight.txt (Adrian Hunter)
+- spec: prevent git apply from searching for the .git directory (Ondrej Mosnacek)
+
+* Tue Oct 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc1.bb1a1146467a.15]
+- Linux v6.1.0-0.rc1.bb1a1146467a
 
 * Mon Oct 17 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc1.14]
 - Linux v6.1.0-0.rc1
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.
diff --git a/sources b/sources
index a5691ab5f..9d3bf708b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.1-rc1.tar.xz) = 11ea867568d37186d13d2289c39085bcbce6ade74fc92d8bdf76f1fb7dbb81362e9380821aa28fbfeb409252f16c0ccf726c5f49e683517087d3e3db1b74dc88
-SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = e901e327d5616651e76128faf3c2b99d888eefc386ba2ad97da4910d6aeae538e7e8d3e4e1fbfc9857451be25924c9aa1c572bb26a966ea7a54a11b04b97f937
-SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 1e9e716e817ac6a98f2cbbd841d524e69c79b3316232a3705edebb4f9b31e3d7765e8f520e4fd5fb1edbf695f59ebb47c98c0522f136e72186d3d7a2545cb29b
+SHA512 (linux-6.1-rc1-10-gbb1a1146467a.tar.xz) = 7159bbec32e9986d14b57614579369c4c24e0525341b15d25866d5258c24f540af021cad79a5929bc5d0e7b9c100f6972b84b40074dae4bec5f44eb73ad25d25
+SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = a532b5319bc6a01bfaaed84fa4aae11354b13aa44b5aa1e0268ebae232d9ae2cb37c123823bd199d61fc859ed3a50a3b98e0f79c9f4debf8a576fea58f3ef7bd
+SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = fda42be5101ee28e49f73f60776710cae3f421dce066e6b147debd653a26d3e25e8242a552609a594f8778339d78ef1eb11ae04c641629a2bcb787bb9e0167ca