summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.rst25
-rw-r--r--kernel-aarch64-debug-rhel.config2
-rw-r--r--kernel-aarch64-rhel.config2
-rw-r--r--kernel-ppc64le-debug-rhel.config2
-rw-r--r--kernel-ppc64le-rhel.config2
-rw-r--r--kernel-s390x-debug-rhel.config2
-rw-r--r--kernel-s390x-rhel.config2
-rw-r--r--kernel-s390x-zfcpdump-rhel.config2
-rw-r--r--kernel-x86_64-debug-rhel.config2
-rw-r--r--kernel-x86_64-rhel.config2
-rw-r--r--kernel.spec23
-rw-r--r--patch-5.7.0-redhat.patch6
-rw-r--r--sources6
13 files changed, 53 insertions, 25 deletions
diff --git a/README.rst b/README.rst
new file mode 100644
index 000000000..35732ed3e
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,25 @@
+===================
+The Kernel dist-git
+===================
+
+The kernel is maintained in a `source tree`_ rather than directly in dist-git.
+The specfile is maintained as a `template`_ in the source tree along with a set
+of build scripts to generate configurations, (S)RPMs, and to populate the
+dist-git repository.
+
+The `documentation`_ for the source tree covers how to contribute and maintain
+the tree.
+
+If you're looking for the downstream patch set it's available in the source
+tree with "git log master..ark-patches" or
+`online`_.
+
+Each release in dist-git is tagged in the source repository so you can easily
+check out the source tree for a build. The tags are in the format
+name-version-release, but note release doesn't contain the dist tag since the
+source can be built in different build roots (Fedora, CentOS, etc.)
+
+.. _source tree: https://gitlab.com/cki-project/kernel-ark.git
+.. _template: https://gitlab.com/cki-project/kernel-ark/-/blob/internal/redhat/kernel.spec.template
+.. _documentation: https://gitlab.com/cki-project/kernel-ark/-/wikis/home
+.. _online: https://gitlab.com/cki-project/kernel-ark/-/commits/ark-patches
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index b730b1f1c..19b71fc8c 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1117,7 +1117,7 @@ CONFIG_DLCI_MAX=8
CONFIG_DMA_API_DEBUG_SG=y
CONFIG_DMA_API_DEBUG=y
# CONFIG_DMABUF_HEAPS is not set
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
+CONFIG_DMABUF_MOVE_NOTIFY=y
# CONFIG_DMABUF_SELFTESTS is not set
# CONFIG_DMA_CMA is not set
CONFIG_DMADEVICES_DEBUG=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index d2358458e..af48c250c 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1109,7 +1109,7 @@ CONFIG_DLCI_MAX=8
# CONFIG_DMA_API_DEBUG is not set
CONFIG_DMA_API_DEBUG_SG=y
# CONFIG_DMABUF_HEAPS is not set
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
+CONFIG_DMABUF_MOVE_NOTIFY=y
# CONFIG_DMABUF_SELFTESTS is not set
# CONFIG_DMA_CMA is not set
# CONFIG_DMADEVICES_DEBUG is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index f2c05e492..270e96f9b 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -999,7 +999,7 @@ CONFIG_DLM=m
CONFIG_DMA_API_DEBUG_SG=y
CONFIG_DMA_API_DEBUG=y
# CONFIG_DMABUF_HEAPS is not set
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
+CONFIG_DMABUF_MOVE_NOTIFY=y
# CONFIG_DMABUF_SELFTESTS is not set
# CONFIG_DMA_CMA is not set
CONFIG_DMADEVICES_DEBUG=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index aed37d35c..8daac4e0f 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -991,7 +991,7 @@ CONFIG_DLM=m
# CONFIG_DMA_API_DEBUG is not set
CONFIG_DMA_API_DEBUG_SG=y
# CONFIG_DMABUF_HEAPS is not set
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
+CONFIG_DMABUF_MOVE_NOTIFY=y
# CONFIG_DMABUF_SELFTESTS is not set
# CONFIG_DMA_CMA is not set
# CONFIG_DMADEVICES_DEBUG is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 9741b5359..bc897a955 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1004,7 +1004,7 @@ CONFIG_DLM=m
CONFIG_DMA_API_DEBUG_SG=y
CONFIG_DMA_API_DEBUG=y
# CONFIG_DMABUF_HEAPS is not set
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
+CONFIG_DMABUF_MOVE_NOTIFY=y
# CONFIG_DMABUF_SELFTESTS is not set
# CONFIG_DMA_CMA is not set
CONFIG_DMADEVICES_DEBUG=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 4a03d159b..ec05ab95d 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -996,7 +996,7 @@ CONFIG_DLM=m
# CONFIG_DMA_API_DEBUG is not set
CONFIG_DMA_API_DEBUG_SG=y
# CONFIG_DMABUF_HEAPS is not set
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
+CONFIG_DMABUF_MOVE_NOTIFY=y
# CONFIG_DMABUF_SELFTESTS is not set
# CONFIG_DMA_CMA is not set
# CONFIG_DMADEVICES_DEBUG is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index d5d270cd9..daff426c7 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -1006,7 +1006,7 @@ CONFIG_DLM=m
# CONFIG_DMA_API_DEBUG is not set
CONFIG_DMA_API_DEBUG_SG=y
# CONFIG_DMABUF_HEAPS is not set
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
+CONFIG_DMABUF_MOVE_NOTIFY=y
# CONFIG_DMABUF_SELFTESTS is not set
# CONFIG_DMA_CMA is not set
# CONFIG_DMADEVICES_DEBUG is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 2bf767bc7..e80f430b0 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1071,7 +1071,7 @@ CONFIG_DLM=m
CONFIG_DMA_API_DEBUG_SG=y
CONFIG_DMA_API_DEBUG=y
# CONFIG_DMABUF_HEAPS is not set
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
+CONFIG_DMABUF_MOVE_NOTIFY=y
# CONFIG_DMABUF_SELFTESTS is not set
# CONFIG_DMA_CMA is not set
CONFIG_DMADEVICES_DEBUG=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 5769f6257..4b4a5676d 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1063,7 +1063,7 @@ CONFIG_DLM=m
# CONFIG_DMA_API_DEBUG is not set
CONFIG_DMA_API_DEBUG_SG=y
# CONFIG_DMABUF_HEAPS is not set
-# CONFIG_DMABUF_MOVE_NOTIFY is not set
+CONFIG_DMABUF_MOVE_NOTIFY=y
# CONFIG_DMABUF_SELFTESTS is not set
# CONFIG_DMA_CMA is not set
# CONFIG_DMADEVICES_DEBUG is not set
diff --git a/kernel.spec b/kernel.spec
index 071a4af07..b3263b81d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc1.20200416git9786cab67457.1
+%global distro_build 0.rc2.1
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -69,10 +69,10 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.7.0
-%define pkgrelease 0.rc1.20200416git9786cab67457.1
+%define pkgrelease 0.rc2.1
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20200416git9786cab67457.1%{?buildid}%{?dist}
+%define specrelease 0.rc2.1%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -163,7 +163,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
# The kernel tarball/base version
%define kversion 5.7
@@ -568,7 +568,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200416git9786cab67457.tar.xz
+Source0: linux-5.7-rc2.tar.xz
# Name of the packaged file containing signing key
@@ -698,6 +698,8 @@ Source2001: cpupower.config
Source3000: merge.pl
Source3001: kernel-local
+Source4000: README.rst
+
## Patches needed for building this package
Patch1: patch-%{rpmversion}-redhat.patch
@@ -1194,8 +1196,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-20200416git9786cab67457 -c
-mv linux-20200416git9786cab67457 linux-%{KVERREL}
+%setup -q -n kernel-5.7-rc2 -c
+mv linux-5.7-rc2 linux-%{KVERREL}
cd linux-%{KVERREL}
@@ -2603,11 +2605,12 @@ fi
#
#
%changelog
-* Thu Apr 16 2020 Jeremy Cline <jcline@redhat.com> [5.7.0-0.rc1.20200416git9786cab67457.1]
-- 9786cab67457 rebase
+* Mon Apr 20 2020 Jeremy Cline <jcline@redhat.com> [5.7.0-0.rc2.1]
+- v5.7-rc2 rebase
+- Add a README to the dist-git repository (Jeremy Cline)
- Copy distro files rather than moving them (Jeremy Cline)
-- Place the buildid before the dist in the release (Jeremy Cline)
- Drop DIST from release commits and tags (Jeremy Cline)
+- Place the buildid before the dist in the release (Jeremy Cline)
- Sync up with Fedora arm configuration prior to merging (Jeremy Cline)
- Disable CONFIG_PROTECTED_VIRTUALIZATION_GUEST for zfcpdump (Jeremy Cline)
diff --git a/patch-5.7.0-redhat.patch b/patch-5.7.0-redhat.patch
index b6b70fdaf..099aa5ca5 100644
--- a/patch-5.7.0-redhat.patch
+++ b/patch-5.7.0-redhat.patch
@@ -253,7 +253,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 70def4907036..1b92fd19b0c5 100644
+index 49b2709ff44e..e6e36dcbebfb 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,10 @@ NAME = Kleptomaniac Octopus
@@ -3167,7 +3167,7 @@ index 4cb4130ced32..b1010f42dd18 100644
obj-$(CONFIG_MULTIUSER) += groups.o
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 64783da34202..146002310855 100644
+index d85f37239540..28ed55c3dd18 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -24,6 +24,7 @@
@@ -3205,7 +3205,7 @@ index 64783da34202..146002310855 100644
static const struct bpf_map_ops * const bpf_map_types[] = {
#define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type)
-@@ -3661,11 +3680,17 @@ static int link_update(union bpf_attr *attr)
+@@ -3659,11 +3678,17 @@ static int link_update(union bpf_attr *attr)
SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size)
{
union bpf_attr attr;
diff --git a/sources b/sources
index 2e7b1b257..d06ec3116 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20200416git9786cab67457.tar.xz) = 465c6ba698a0383c8eba0c94c5ec2eeab027e418bb76939d7156da343f08133f1637bc30e271d24aaabd9ce7de18bc95bba86118880aea0be59cfcf54b4cea44
-SHA512 (kernel-abi-whitelists-5.7.0-0.rc1.20200416git9786cab67457.1.tar.bz2) = bbf71c0a65308633f742209b56b584a101aa0c20020b98b6adf2292640e1a4cbc10d556ea10820eb6a3a3f4aaab8c348b17e6f195dabbd459251223779ce1def
-SHA512 (kernel-kabi-dw-5.7.0-0.rc1.20200416git9786cab67457.1.tar.bz2) = 468c5d1f14b447aec2eef7b600f528747e7e4bc774bc89145bd05b4a7c29a26cb55351316107f9b2c4e04a0525fdc8c4d84d24864cc71c46fbdea9fa817392f4
+SHA512 (linux-5.7-rc2.tar.xz) = e82f0e20aedcf32346671719bc03054c5dcb4663e5b5664e39e942550d21c39e3c085e934d6b41ecd57b28ff4081bff934601d087252c5a5162a3c0a0384966f
+SHA512 (kernel-abi-whitelists-5.7.0-0.rc2.1.tar.bz2) = 633358aaec111cf2cbc4a01b78b41f49868e2027b091526ca608f7e2b27bcc500b613eb5a80f3896fcbbecd47d3dbee48b73757d2fbd5ec37c574ec91f6f7bde
+SHA512 (kernel-kabi-dw-5.7.0-0.rc2.1.tar.bz2) = 8a95bbf93e6cde111b94bdc33e812737278f58b7c2c518fc355a44145b5939c4a4a87071669359b975ff94eae119df0fd2319c0cf657990be1fab9c6073b814a
generated by cgit (git 2.34.1) at 2024-11-04 21:45:56 +0000