summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001-Fix-from-Arnd-for-compilation-error.patch27
-rw-r--r--configs/fedora/generic/CONFIG_COMMON_CLK_FIXED_MMIO1
-rw-r--r--configs/fedora/generic/CONFIG_FSL_QDMA1
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-ppc64le-debug.config2
-rw-r--r--kernel-ppc64le.config2
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
-rw-r--r--kernel.spec8
-rw-r--r--sources2
20 files changed, 36 insertions, 33 deletions
diff --git a/0001-Fix-from-Arnd-for-compilation-error.patch b/0001-Fix-from-Arnd-for-compilation-error.patch
deleted file mode 100644
index 6b9d7e2a0..000000000
--- a/0001-Fix-from-Arnd-for-compilation-error.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4bab8719d0712b13063cdd0c0a3d24984bcd8b1f Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Thu, 7 Mar 2019 10:37:06 -0800
-Subject: [PATCH] Fix from Arnd for compilation error
-
-Signed-off-by: Laura Abbott <labbott@redhat.com>
----
- include/uapi/asm-generic/socket.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/uapi/asm-generic/socket.h b/include/uapi/asm-generic/socket.h
-index c8b430cb6dc4..8c1391c89171 100644
---- a/include/uapi/asm-generic/socket.h
-+++ b/include/uapi/asm-generic/socket.h
-@@ -2,8 +2,8 @@
- #ifndef __ASM_GENERIC_SOCKET_H
- #define __ASM_GENERIC_SOCKET_H
-
-+#include <linux/posix_types.h>
- #include <asm/sockios.h>
--#include <asm/bitsperlong.h>
-
- /* For setsockopt(2) */
- #define SOL_SOCKET 1
---
-2.20.1
-
diff --git a/configs/fedora/generic/CONFIG_COMMON_CLK_FIXED_MMIO b/configs/fedora/generic/CONFIG_COMMON_CLK_FIXED_MMIO
new file mode 100644
index 000000000..85e803318
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_COMMON_CLK_FIXED_MMIO
@@ -0,0 +1 @@
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
diff --git a/configs/fedora/generic/CONFIG_FSL_QDMA b/configs/fedora/generic/CONFIG_FSL_QDMA
new file mode 100644
index 000000000..f26803f1e
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_FSL_QDMA
@@ -0,0 +1 @@
+# CONFIG_FSL_QDMA is not set
diff --git a/gitrev b/gitrev
index 0e3b5a1af..cac19f388 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-fa3d493f7a573b4e4e2538486e912093a0161c1b
+f261c4e529dac5608a604d3dd3ae1cd2adf23c89
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 8d8319926..28bd436a1 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -950,6 +950,7 @@ CONFIG_CNIC=m
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_HI3516CV300 is not set
CONFIG_COMMON_CLK_HI3519=m
CONFIG_COMMON_CLK_HI3660=y
@@ -1845,6 +1846,7 @@ CONFIG_FSL_FMAN=m
CONFIG_FSL_MC_BUS=y
CONFIG_FSL_MC_DPIO=m
CONFIG_FSL_PQ_MDIO=m
+# CONFIG_FSL_QDMA is not set
# CONFIG_FSL_QMAN_TEST is not set
# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 1759f40bf..c54136f43 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -950,6 +950,7 @@ CONFIG_CNIC=m
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_HI3516CV300 is not set
CONFIG_COMMON_CLK_HI3519=m
CONFIG_COMMON_CLK_HI3660=y
@@ -1829,6 +1830,7 @@ CONFIG_FSL_FMAN=m
CONFIG_FSL_MC_BUS=y
CONFIG_FSL_MC_DPIO=m
CONFIG_FSL_PQ_MDIO=m
+# CONFIG_FSL_QDMA is not set
# CONFIG_FSL_QMAN_TEST is not set
# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 3813f7f14..0e8642b4d 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -966,6 +966,7 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
CONFIG_COMMON_CLK_MAX77686=m
# CONFIG_COMMON_CLK_MAX9485 is not set
CONFIG_COMMON_CLK_PALMAS=m
@@ -1893,6 +1894,7 @@ CONFIG_FSI_SCOM=m
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_QDMA is not set
# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index da35b7f2b..6229021e4 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -935,6 +935,7 @@ CONFIG_CNIC=m
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
CONFIG_COMMON_CLK_MAX77686=m
# CONFIG_COMMON_CLK_MAX9485 is not set
CONFIG_COMMON_CLK_PWM=m
@@ -1813,6 +1814,7 @@ CONFIG_FSI_SCOM=m
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_QDMA is not set
# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index f7a495226..4ffda7db1 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -935,6 +935,7 @@ CONFIG_CNIC=m
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
CONFIG_COMMON_CLK_MAX77686=m
# CONFIG_COMMON_CLK_MAX9485 is not set
CONFIG_COMMON_CLK_PWM=m
@@ -1798,6 +1799,7 @@ CONFIG_FSI_SCOM=m
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_QDMA is not set
# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 40142ca85..578e2c366 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -966,6 +966,7 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
CONFIG_COMMON_CLK_MAX77686=m
# CONFIG_COMMON_CLK_MAX9485 is not set
CONFIG_COMMON_CLK_PALMAS=m
@@ -1878,6 +1879,7 @@ CONFIG_FSI_SCOM=m
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_QDMA is not set
# CONFIG_FSL_XGMAC_MDIO is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 8bacf23d4..daa328463 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -797,6 +797,7 @@ CONFIG_CODA_FS=m
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_MAX9485 is not set
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_SI514 is not set
@@ -1637,6 +1638,7 @@ CONFIG_FSI_SCOM=m
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_QDMA is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index d3f47373c..72aa68564 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -796,6 +796,7 @@ CONFIG_CODA_FS=m
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_MAX9485 is not set
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_SI514 is not set
@@ -1620,6 +1621,7 @@ CONFIG_FSI_SCOM=m
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_QDMA is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index b66fd53b0..24034511c 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -738,6 +738,7 @@ CONFIG_CODA_FS=m
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_MAX9485 is not set
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_SI514 is not set
@@ -1489,6 +1490,7 @@ CONFIG_FSI_SCOM=m
# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_LBC is not set
# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_QDMA is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 4a733bb23..10ec3f72a 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -737,6 +737,7 @@ CONFIG_CODA_FS=m
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_MAX9485 is not set
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_SI514 is not set
@@ -1472,6 +1473,7 @@ CONFIG_FSI_SCOM=m
# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_LBC is not set
# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_QDMA is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 888817174..04755c632 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -745,6 +745,7 @@ CONFIG_CODA_FS=m
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_MAX9485 is not set
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_SI514 is not set
@@ -1488,6 +1489,7 @@ CONFIG_FSI_SCOM=m
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_QDMA is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 7c2e3b928..0091f7dab 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -744,6 +744,7 @@ CONFIG_CODA_FS=m
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_MAX9485 is not set
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_SI514 is not set
@@ -1471,6 +1472,7 @@ CONFIG_FSI_SCOM=m
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_QDMA is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index f89a3b8ed..7c18d5e22 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -810,6 +810,7 @@ CONFIG_CODA_FS=m
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_MAX9485 is not set
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_SI514 is not set
@@ -1679,6 +1680,7 @@ CONFIG_FSI_SCOM=m
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_QDMA is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index d18c30450..f63f80cbc 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -809,6 +809,7 @@ CONFIG_CODA_FS=m
# CONFIG_COMMON_CLK_CDCE706 is not set
# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
# CONFIG_COMMON_CLK_MAX9485 is not set
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_SI514 is not set
@@ -1662,6 +1663,7 @@ CONFIG_FSI_SCOM=m
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_QDMA is not set
CONFIG_FS_MBCACHE=y
CONFIG_FSNOTIFY=y
# CONFIG_FTL is not set
diff --git a/kernel.spec b/kernel.spec
index daff25209..156e59cea 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 0
# The git snapshot level
-%define gitrev 8
+%define gitrev 9
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -581,9 +581,6 @@ Patch501: input-rmi4-remove-the-need-for-artifical-IRQ.patch
Patch506: 0001-s390-jump_label-Correct-asm-contraint.patch
Patch507: 0001-Drop-that-for-now.patch
-# rhbz 1686419
-Patch511: 0001-Fix-from-Arnd-for-compilation-error.patch
-
# END OF PATCH DEFINITIONS
%endif
@@ -1857,6 +1854,9 @@ fi
#
#
%changelog
+* Fri Mar 15 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc0.git9.1
+- Linux v5.0-11520-gf261c4e529da
+
* Thu Mar 14 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc0.git8.1
- Linux v5.0-11139-gfa3d493f7a57
diff --git a/sources b/sources
index 2f072c2c7..7951f1b4d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0
-SHA512 (patch-5.0-git8.xz) = e5ef977c59b5623057c41238ea18bb5ca23fb64fadd1faab1e77271291e4e973d202302ee4f8ce309f2f0a0e5dbb6fa82b3026db40cd43660d7a74712df22b35
+SHA512 (patch-5.0-git9.xz) = 1c7b2585038be6194f7e5690d31ae50d35ff79a65d0d5e260c00efc40e26f3accd58ff3f19c155e47a66c4349f240ee9ce1e1bf76dd03b3f7bebe71b0d08a780