Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedora

10 files changed, 83 insertions, 27 deletions

diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA
index 9e51d92bb..d9117e04e 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA
@@ -1 +1 @@
-CONFIG_SERIAL_PXA=y
+# CONFIG_SERIAL_PXA is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA_CONSOLE b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA_CONSOLE
deleted file mode 100644
index 66ca5b372..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_PXA_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_PXA_CONSOLE=y
diff --git a/drm-vc4-Use-16bpp-by-default-for-the-fbdev-buffer.patch b/drm-vc4-Use-16bpp-by-default-for-the-fbdev-buffer.patch
new file mode 100644
index 000000000..c6ee9f42d
--- /dev/null
+++ b/drm-vc4-Use-16bpp-by-default-for-the-fbdev-buffer.patch
@@ -0,0 +1,46 @@
+From patchwork Wed Mar  6 14:02:45 2019
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: drm/vc4: Use 16bpp by default for the fbdev buffer
+From: Maxime Ripard <maxime.ripard@bootlin.com>
+X-Patchwork-Id: 290632
+Message-Id: <20190306140245.21973-1-maxime.ripard@bootlin.com>
+To: Eric Anholt <eric@anholt.net>
+Cc: eben@raspberrypi.org, Maxime Ripard <maxime.ripard@bootlin.com>,
+ dri-devel@lists.freedesktop.org,
+ Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
+ Sean Paul <seanpaul@chromium.org>,
+ Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
+ linux-arm-kernel@lists.infradead.org
+Date: Wed,  6 Mar 2019 15:02:45 +0100
+
+The preferred bpp for the fbdev emulation buffer has been 32 so far, which
+means that by default we will allocate an 8MB buffer with a 1920x1080
+resolution.
+
+Worse this memory will be allocated from the CMA pool, and will never be
+freed even if we don't use the fbdev emulation. Therefore, reducing it is a
+big deal, and switching to 16bpp by default will gain us around 4MB at
+1920x1080, while keeping decent color depth. And users still have the
+option to switch to 32bpp using the kernel command line.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
+Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
+---
+ drivers/gpu/drm/vc4/vc4_drv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
+index 52576dee809e..c38cf64837e1 100644
+--- a/drivers/gpu/drm/vc4/vc4_drv.c
++++ b/drivers/gpu/drm/vc4/vc4_drv.c
+@@ -286,7 +286,7 @@ static int vc4_drm_bind(struct device *dev)
+ 
+ 	vc4_kms_load(drm);
+ 
+-	drm_fbdev_generic_setup(drm, 32);
++	drm_fbdev_generic_setup(drm, 16);
+ 
+ 	return 0;
+ 
diff --git a/gitrev b/gitrev
index ff4673ae0..e3c90f070 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-2137397c92aec3713fa10be3c9b830f9a1674e60
+7d762d69145a54d169f58e56d6dac57a5508debc
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index dd6d82fe0..8c225ae8f 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -5546,8 +5546,7 @@ CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_OMAP is not set
 # CONFIG_SERIAL_PCH_UART is not set
-CONFIG_SERIAL_PXA_CONSOLE=y
-CONFIG_SERIAL_PXA=y
+# CONFIG_SERIAL_PXA is not set
 # CONFIG_SERIAL_RP2 is not set
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 CONFIG_SERIAL_SAMSUNG=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 141dc0d68..10a7cbc7a 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -5526,8 +5526,7 @@ CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_OMAP is not set
 # CONFIG_SERIAL_PCH_UART is not set
-CONFIG_SERIAL_PXA_CONSOLE=y
-CONFIG_SERIAL_PXA=y
+# CONFIG_SERIAL_PXA is not set
 # CONFIG_SERIAL_RP2 is not set
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 CONFIG_SERIAL_SAMSUNG=y
diff --git a/kernel.spec b/kernel.spec
index 9e423d554..3f6380e50 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%global released_kernel 0
+%global released_kernel 1
 
 # Sign modules on x86.  Make sure the config files match this setting if more
 # architectures are added.
@@ -44,7 +44,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 300
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -68,18 +68,18 @@ Summary: The Linux kernel
 %define stable_base %(echo $((%{stable_update} - 1)))
 %endif
 %endif
-%define rpmversion 5%{base_sublevel}.%{stable_update}
+%define rpmversion 5.%{base_sublevel}.%{stable_update}
 
 ## The not-released-kernel case ##
 %else
 # The next upstream release sublevel (base_sublevel+1)
-# %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
+%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # Work around for major version bump
 %define upstream_sublevel 0
 # The rc snapshot level
-%global rcrev 7
+%global rcrev 0
 # The git snapshot level
-%define gitrev 2
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -177,8 +177,7 @@ Summary: The Linux kernel
 %endif
 
 # The kernel tarball/base version
-# %define kversion 5.%{base_sublevel}
-%define kversion 5.%{base_sublevel}-rc%rcrev
+%define kversion 5.%{base_sublevel}
 
 %define make_target bzImage
 %define image_install_path boot
@@ -440,8 +439,7 @@ BuildRequires: binutils-%{_build_arch}-linux-gnu, gcc-%{_build_arch}-linux-gnu
 %define cross_opts CROSS_COMPILE=%{_build_arch}-linux-gnu-
 %endif
 
-# Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{kversion}.tar.xz
-Source0: https://git.kernel.org/torvalds/t/linux-5.0-rc7.tar.gz
+Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{kversion}.tar.xz
 
 Source11: x509.genkey
 Source12: remove-binary-diff.pl
@@ -501,8 +499,7 @@ Patch01: %{stable_patch_01}
 # near the top of this spec file.
 %else
 %if 0%{?rcrev}
-# One more fixup apparently?
-# Source5000: patch-5.%{upstream_sublevel}-rc%{rcrev}.xz
+Source5000: patch-5.%{upstream_sublevel}-rc%{rcrev}.xz
 %if 0%{?gitrev}
 Source5001: patch-5.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.xz
 %endif
@@ -604,7 +601,10 @@ Patch312: arm64-rock960-enable-tsadc.patch
 Patch330: bcm2837-dts-add-Raspberry-Pi-3-A.patch
 
 # https://www.spinics.net/lists/arm-kernel/msg699583.html
-Patch332: ARM-dts-bcm283x-Several-DTS-improvements.patch
+Patch331: ARM-dts-bcm283x-Several-DTS-improvements.patch
+
+# https://patchwork.freedesktop.org/patch/290632/
+Patch332: drm-vc4-Use-16bpp-by-default-for-the-fbdev-buffer.patch
 
 Patch339: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch
 
@@ -1910,6 +1910,22 @@ fi
 #
 #
 %changelog
+* Mon Mar 04 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-1
+- Linux v5.0.0
+
+* Tue Feb 26 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc8.git1.1
+- Linux v5.0-rc8-3-g7d762d69145a
+
+* Tue Feb 26 2019 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
+* Mon Feb 25 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc8.git0.1
+- Linux v5.0-rc8
+- Disable debugging options.
+
+* Fri Feb 22 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc7.git3.1
+- Linux v5.0-rc7-118-g8a61716ff2ab
+
 * Wed Feb 20 2019 Peter Robinson <pbrobinson@fedoraproject.org>
 - Improvements to 96boards Rock960
 
diff --git a/scripts/create_headers_tarball.sh b/scripts/create_headers_tarball.sh
index cb57db634..5105f790c 100755
--- a/scripts/create_headers_tarball.sh
+++ b/scripts/create_headers_tarball.sh
@@ -27,10 +27,8 @@ STABLE=`grep "%define stable_update" kernel.spec| cut -d ' ' -f 3`
 RC=`grep "%global rcrev" kernel.spec| cut -d ' ' -f 3`
 GITREV=`grep "%define gitrev" kernel.spec| cut -d ' ' -f 3`
 if [ $RELEASED -eq 0 ]; then
-	#cd kernel-$MAJORVER.$BASE.fc??
-	cd kernel-5.0-rc$RC.fc??
-	#NEWBASE=$(($BASE+1))
-	NEWBASE=0
+	cd kernel-$MAJORVER.$BASE.fc??
+	NEWBASE=$(($BASE+1))
 	KVER=$MAJORVER.$NEWBASE.0-0.rc$RC.git$GITREV.$BASERELEASE
 	cd linux-$MAJORVER.$NEWBASE.0-0.rc$RC.git$GITREV.$BASERELEASE.fc*/
 else
diff --git a/scripts/kernel-version.sh b/scripts/kernel-version.sh
index 0de4c10d9..e2ec93a5a 100644
--- a/scripts/kernel-version.sh
+++ b/scripts/kernel-version.sh
@@ -2,7 +2,7 @@ VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed
 
 if [ -z "$VER" ] ;
 then
-    VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.gz// | tr -d "()")
+    VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.xz// | tr -d "()")
 fi
 
 
diff --git a/sources b/sources
index bc87e3294..1eb341ce6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (linux-5.0-rc7.tar.gz) = 4458043fcaf85cbbe5155a46267bebb505575e954babe4525c0a3e5d3515f97d2774487f71617792490eb01d83ae710fd33c454ac636978d6fcd3c1e77dad2f7
-SHA512 (patch-5.0-rc7-git2.xz) = 85c9d7f38a596d01f35b536a970b5994e5c4fe9fc0a0a9922352bdda0f13d3ac8642fa0d1d68fdd14283250cddcd6e29d2030a09a8cae86ba9918e518648c976
+SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0