mirror of
https://abf.rosa.ru/djam/kernel-5.13.git
synced 2025-02-25 16:12:50 +00:00
Updated to 4.20.10 - the first take; sorted the configs
AUFS was updated to "4.20.4+-20190211" in the process. As for the sorted entries in the config files - this helps a lot during rebases to the newer stable kernel branches. Signed-off-by: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
This commit is contained in:
parent
c5e1469ee5
commit
847ae8701e
8 changed files with 15711 additions and 18443 deletions
4
.abf.yml
4
.abf.yml
|
@ -1,3 +1,3 @@
|
||||||
sources:
|
sources:
|
||||||
linux-4.19.tar.xz: 40f3e72192d59c0b7a4638cebd0ea55d35a782bb
|
linux-4.20.tar.xz: f3e78fc0cf8ddd62f7859ac4a54a18a43b43e75a
|
||||||
patch-4.19.23.xz: 9d03f0a1c969cbedf1cd60dce94219f8f032f8ab
|
patch-4.20.10.xz: bab7b5815edbd3adca7dcb71295a57523ab1b2c9
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
diff --git a/Makefile b/Makefile
|
diff --git a/Makefile b/Makefile
|
||||||
index 2366991c29b9..51b4ac281eec 100644
|
index 6f7a8172de44..956a5a3e8d2f 100644
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -1090,8 +1090,7 @@ include/config/kernel.release: $(srctree)/Makefile FORCE
|
@@ -1069,8 +1069,7 @@ include/config/kernel.release: $(srctree)/Makefile FORCE
|
||||||
# Carefully list dependencies so we do not try to build scripts twice
|
# Carefully list dependencies so we do not try to build scripts twice
|
||||||
# in parallel
|
# in parallel
|
||||||
PHONY += scripts
|
PHONY += scripts
|
||||||
-scripts: scripts_basic asm-generic gcc-plugins $(autoksyms_h)
|
-scripts: scripts_basic scripts_dtc asm-generic gcc-plugins $(autoksyms_h)
|
||||||
- $(Q)$(MAKE) $(build)=$(@)
|
- $(Q)$(MAKE) $(build)=$(@)
|
||||||
+scripts:
|
+scripts:
|
||||||
|
|
||||||
# Things we need to do before we recursively start building the kernel
|
# Things we need to do before we recursively start building the kernel
|
||||||
# or the modules are listed in "prepare".
|
# or the modules are listed in "prepare".
|
||||||
@@ -1129,7 +1128,7 @@ prepare0: archprepare gcc-plugins
|
@@ -1107,7 +1106,7 @@ prepare0: archprepare gcc-plugins
|
||||||
$(Q)$(MAKE) $(build)=.
|
$(Q)$(MAKE) $(build)=.
|
||||||
|
|
||||||
# All the preparing..
|
# All the preparing..
|
||||||
|
@ -21,7 +21,7 @@ index 2366991c29b9..51b4ac281eec 100644
|
||||||
|
|
||||||
# Support for using generic headers in asm-generic
|
# Support for using generic headers in asm-generic
|
||||||
PHONY += asm-generic uapi-asm-generic
|
PHONY += asm-generic uapi-asm-generic
|
||||||
@@ -1326,13 +1325,8 @@ endif # CONFIG_MODULES
|
@@ -1339,13 +1338,8 @@ endif # CONFIG_MODULES
|
||||||
CLEAN_DIRS += $(MODVERDIR) include/ksym
|
CLEAN_DIRS += $(MODVERDIR) include/ksym
|
||||||
|
|
||||||
# Directories & files removed with 'make mrproper'
|
# Directories & files removed with 'make mrproper'
|
||||||
|
@ -37,7 +37,7 @@ index 2366991c29b9..51b4ac281eec 100644
|
||||||
|
|
||||||
# clean - Delete most, but leave enough to build external modules
|
# clean - Delete most, but leave enough to build external modules
|
||||||
#
|
#
|
||||||
@@ -1354,13 +1348,10 @@ clean: archclean vmlinuxclean
|
@@ -1367,13 +1361,10 @@ clean: archclean vmlinuxclean
|
||||||
#
|
#
|
||||||
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
|
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
|
||||||
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
|
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
|
||||||
|
@ -54,7 +54,7 @@ index 2366991c29b9..51b4ac281eec 100644
|
||||||
$(call cmd,rmfiles)
|
$(call cmd,rmfiles)
|
||||||
|
|
||||||
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
|
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
|
||||||
index 67ed9f6ccdf8..877b5716a928 100644
|
index 63b609243d03..c54eca94ac2c 100644
|
||||||
--- a/scripts/kconfig/Makefile
|
--- a/scripts/kconfig/Makefile
|
||||||
+++ b/scripts/kconfig/Makefile
|
+++ b/scripts/kconfig/Makefile
|
||||||
@@ -20,19 +20,14 @@ endif
|
@@ -20,19 +20,14 @@ endif
|
||||||
|
@ -89,16 +89,13 @@ index 67ed9f6ccdf8..877b5716a928 100644
|
||||||
fi
|
fi
|
||||||
$(Q)rm -f .tmp.config
|
$(Q)rm -f .tmp.config
|
||||||
|
|
||||||
@@ -66,7 +59,6 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
|
@@ -66,28 +59,14 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
|
||||||
PHONY += $(simple-targets)
|
PHONY += $(simple-targets)
|
||||||
|
|
||||||
$(simple-targets): $(obj)/conf
|
$(simple-targets): $(obj)/conf
|
||||||
- $< $(silent) --$@ $(Kconfig)
|
- $< $(silent) --$@ $(Kconfig)
|
||||||
|
|
||||||
PHONY += oldnoconfig silentoldconfig savedefconfig defconfig
|
PHONY += savedefconfig defconfig
|
||||||
|
|
||||||
@@ -85,23 +77,10 @@ silentoldconfig: syncconfig
|
|
||||||
@echo " \"silentoldconfig\" will be removed after Linux 4.19"
|
|
||||||
|
|
||||||
savedefconfig: $(obj)/conf
|
savedefconfig: $(obj)/conf
|
||||||
- $< $(silent) --$@=defconfig $(Kconfig)
|
- $< $(silent) --$@=defconfig $(Kconfig)
|
||||||
|
|
|
@ -1,49 +0,0 @@
|
||||||
From: Takashi Iwai <tiwai@suse.de>
|
|
||||||
Date: Fri, 25 Jan 2013 17:08:03 +0100
|
|
||||||
Subject: [PATCH] drm/cirrus: Use 16bpp as default
|
|
||||||
Patch-mainline: Submitted
|
|
||||||
References: bnc#799216
|
|
||||||
|
|
||||||
We've got a bug report that GNOME on QEMU shows wrong colors.
|
|
||||||
It turned out that it's because Cairo doesn't support 24bpp well.
|
|
||||||
This hasn't been an issue until now because we (at least SUSE and
|
|
||||||
Fedora) have a patch to use 16bpp for QEMU in Xorg cirrus UMS driver.
|
|
||||||
|
|
||||||
Since cirrus KMS driver is mainly targeted for the use on QEMU/KVM, we
|
|
||||||
should choose 16bpp as default, too.
|
|
||||||
|
|
||||||
Also, it's not convenient to set the default bpp in multiple places.
|
|
||||||
cirrus_fbdev_init() should check the original preferred depth set in
|
|
||||||
cirrus_modeset_init().
|
|
||||||
|
|
||||||
Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=799216
|
|
||||||
|
|
||||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
||||||
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/cirrus/cirrus_fbdev.c | 2 +-
|
|
||||||
drivers/gpu/drm/cirrus/cirrus_mode.c | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/gpu/drm/cirrus/cirrus_fbdev.c
|
|
||||||
+++ b/drivers/gpu/drm/cirrus/cirrus_fbdev.c
|
|
||||||
@@ -273,7 +273,7 @@ int cirrus_fbdev_init(struct cirrus_devi
|
|
||||||
{
|
|
||||||
struct cirrus_fbdev *gfbdev;
|
|
||||||
int ret;
|
|
||||||
- int bpp_sel = 24;
|
|
||||||
+ int bpp_sel = cdev->dev->mode_config.preferred_depth;
|
|
||||||
|
|
||||||
/*bpp_sel = 8;*/
|
|
||||||
gfbdev = kzalloc(sizeof(struct cirrus_fbdev), GFP_KERNEL);
|
|
||||||
--- a/drivers/gpu/drm/cirrus/cirrus_mode.c
|
|
||||||
+++ b/drivers/gpu/drm/cirrus/cirrus_mode.c
|
|
||||||
@@ -588,7 +588,7 @@ int cirrus_modeset_init(struct cirrus_de
|
|
||||||
cdev->dev->mode_config.max_height = CIRRUS_MAX_FB_HEIGHT;
|
|
||||||
|
|
||||||
cdev->dev->mode_config.fb_base = cdev->mc.vram_base;
|
|
||||||
- cdev->dev->mode_config.preferred_depth = 24;
|
|
||||||
+ cdev->dev->mode_config.preferred_depth = 16;
|
|
||||||
/* don't prefer a shadow on virt GPU */
|
|
||||||
cdev->dev->mode_config.prefer_shadow = 0;
|
|
||||||
|
|
800
fs-aufs4.patch
800
fs-aufs4.patch
File diff suppressed because it is too large
Load diff
16635
kernel-i586.config
16635
kernel-i586.config
File diff suppressed because it is too large
Load diff
16611
kernel-x86_64.config
16611
kernel-x86_64.config
File diff suppressed because it is too large
Load diff
|
@ -1,7 +1,7 @@
|
||||||
%define kernelversion 4
|
%define kernelversion 4
|
||||||
%define patchlevel 19
|
%define patchlevel 20
|
||||||
# sublevel is now used for -stable patches
|
# sublevel is now used for -stable patches
|
||||||
%define sublevel 23
|
%define sublevel 10
|
||||||
|
|
||||||
# Release number. Increase this before a rebuild.
|
# Release number. Increase this before a rebuild.
|
||||||
%define rpmrel 1
|
%define rpmrel 1
|
||||||
|
@ -138,7 +138,6 @@ Source0: https://cdn.kernel.org/pub/linux/kernel/v%{kernelversion}.x/linux-%{ta
|
||||||
#Source1: https://cdn.kernel.org/pub/linux/kernel/v%{kernelversion}.x/linux-%{tar_ver}.tar.sign
|
#Source1: https://cdn.kernel.org/pub/linux/kernel/v%{kernelversion}.x/linux-%{tar_ver}.tar.sign
|
||||||
|
|
||||||
# This is for disabling *config, mrproper, prepare, scripts on -devel rpms
|
# This is for disabling *config, mrproper, prepare, scripts on -devel rpms
|
||||||
# TODO: is it needed?
|
|
||||||
Source2: disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
|
Source2: disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
|
||||||
|
|
||||||
# Kernel configuration files.
|
# Kernel configuration files.
|
||||||
|
@ -182,9 +181,6 @@ Patch101: perf-xmlto-skip-validation.patch
|
||||||
# http://bugs.rosalinux.ru/show_bug.cgi?id=6459
|
# http://bugs.rosalinux.ru/show_bug.cgi?id=6459
|
||||||
Patch104: audit-make-it-less-verbose.patch
|
Patch104: audit-make-it-less-verbose.patch
|
||||||
|
|
||||||
# http://bugs.rosalinux.ru/show_bug.cgi?id=5649#c6
|
|
||||||
Patch105: drm-cirrus-Use-16bpp-as-default.patch
|
|
||||||
|
|
||||||
# Increase vmalloc area, https://bugs.mageia.org/show_bug.cgi?id=904
|
# Increase vmalloc area, https://bugs.mageia.org/show_bug.cgi?id=904
|
||||||
Patch106: x86-increase-default-minimum-vmalloc-area-by-64MB-to-192MB.patch
|
Patch106: x86-increase-default-minimum-vmalloc-area-by-64MB-to-192MB.patch
|
||||||
|
|
||||||
|
|
|
@ -19,11 +19,11 @@ Let us revert the main parts of this commit in the 32-bit kernels for now.
|
||||||
|
|
||||||
Signed-off-by: Evgenii Shatokhin <eugene.shatokhin@rosalab.ru>
|
Signed-off-by: Evgenii Shatokhin <eugene.shatokhin@rosalab.ru>
|
||||||
|
|
||||||
diff --git a/mm/nobootmem.c b/mm/nobootmem.c
|
diff --git a/mm/memblock.c b/mm/memblock.c
|
||||||
index 487dad6..cfd91fa 100644
|
index f45a049532fe..ede1d657fbc7 100644
|
||||||
--- a/mm/nobootmem.c
|
--- a/mm/memblock.c
|
||||||
+++ b/mm/nobootmem.c
|
+++ b/mm/memblock.c
|
||||||
@@ -134,9 +134,6 @@ static unsigned long __init free_low_memory_core_early(void)
|
@@ -1931,9 +1931,6 @@ static unsigned long __init free_low_memory_core_early(void)
|
||||||
|
|
||||||
memblock_clear_hotplug(0, -1);
|
memblock_clear_hotplug(0, -1);
|
||||||
|
|
||||||
|
@ -34,10 +34,10 @@ index 487dad6..cfd91fa 100644
|
||||||
* We need to use NUMA_NO_NODE instead of NODE_DATA(0)->node_id
|
* We need to use NUMA_NO_NODE instead of NODE_DATA(0)->node_id
|
||||||
* because in some case like Node0 doesn't have RAM installed
|
* because in some case like Node0 doesn't have RAM installed
|
||||||
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
|
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
|
||||||
index f3e0c69..ca32c26 100644
|
index a29043ea9212..11680c6d1f30 100644
|
||||||
--- a/mm/page_alloc.c
|
--- a/mm/page_alloc.c
|
||||||
+++ b/mm/page_alloc.c
|
+++ b/mm/page_alloc.c
|
||||||
@@ -1168,6 +1168,7 @@ static void __meminit __init_single_page(struct page *page, unsigned long pfn,
|
@@ -1211,6 +1211,7 @@ static void __meminit __init_single_page(struct page *page, unsigned long pfn,
|
||||||
init_page_count(page);
|
init_page_count(page);
|
||||||
page_mapcount_reset(page);
|
page_mapcount_reset(page);
|
||||||
page_cpupid_reset_last(page);
|
page_cpupid_reset_last(page);
|
||||||
|
|
Loading…
Add table
Reference in a new issue