kernel release 6.4

23 files changed, 176 insertions, 4404 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c924638340e..521c6fe18a45 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-jcore
 	pkgdesc = Kernel for Manjaro/EndeavourOS/Arch (ACS override patch include)
-	pkgver = 6.3.9
+	pkgver = 6.4
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -8,7 +8,7 @@ pkgbase = linux-jcore
 	makedepends = bc
 	makedepends = docbook-xsl
 	makedepends = libelf
-	makedepends = pahole>=1:1.25-1
+	makedepends = pahole
 	makedepends = python-sphinx
 	makedepends = git
 	makedepends = inetutils
@@ -21,54 +21,22 @@ pkgbase = linux-jcore
 	replaces = linux-acs-manjaro
 	replaces = linux-acs-manjaro-headers
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.9.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz
 	source = config
 	source = 0101-ZEN_Add_sysctl_and_CONFIG_to_disallow_unprivileged_CLONE_NEWUSER.patch
-	source = 0103-Bluetooth_fix_deadlock_for_RFCOMM_sk_state_change.patch
 	source = mt7921e_Perform_FLR_to_recovery_the_device.patch
 	source = rog_ally_sound.patch
 	source = hid-asus-rog-ally.patch
-	source = 0301-revert-fbcon-remove-now-unusued-softback_lines-cursor-argument.patch
-	source = 0302-revert-fbcon-remove-no-op-fbcon_set_origin.patch
-	source = 0303-revert-fbcon-remove-soft-scrollback-code.patch
-	source = 0401-bootsplash.patch
-	source = 0402-bootsplash.patch
-	source = 0403-bootsplash.patch
-	source = 0404-bootsplash.patch
-	source = 0405-bootsplash.patch
-	source = 0406-bootsplash.patch
-	source = 0407-bootsplash.patch
-	source = 0408-bootsplash.patch
-	source = 0409-bootsplash.patch
-	source = 0410-bootsplash.patch
-	source = 0411-bootsplash.patch
-	source = 0412-bootsplash.patch
-	source = 0413-bootsplash.gitpatch
+	source = rog-ally-bluetooth.patch
 	source = 0999-acs.gitpatch
-	sha256sums = 41ecf21399b17ab85163750ba22347d09b54fa099b80b63d0e2ef0066129b13e
-	sha256sums = 4c355c0f35852dc94ed921ed144407e606097ed2b62d84dab9865c7bc03b06ec
+	sha256sums = 8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3
+	sha256sums = c90891bab4641983a84cb196ab7bd2a444581563198e5d28d285bee7a56a136c
 	sha256sums = 05f04019d4a2ee072238c32860fa80d673687d84d78ef436ae9332b6fb788467
-	sha256sums = a8a2d8b402b2877df1a949a106c634b6c366dd33b954c4b735ce1d3778214169
 	sha256sums = d673d034fbcd80426fd8d9c6af56537c5fe5b55fe49d74e313474d7fc285ecc1
 	sha256sums = 2b64a6f677e3b1278f7ae0080b3e58383e097c28e63672a800272ff66d435976
-	sha256sums = bfb838dc7748af37b29c90fb216c9666a6f49e0f0e6df8827a5dfe84ef62d626
-	sha256sums = 2b11905b63b05b25807dd64757c779da74dd4c37e36d3f7a46485b1ee5a9d326
-	sha256sums = 94a8538251ad148f1025cc3de446ce64f73dc32b01815426fb159c722e8fa5bc
-	sha256sums = 50f4ccc4aeb0ffb8ec648b90a84ff188dbfed5364075cf0c6045c5696caf6ca9
-	sha256sums = e95c4f988cb9337f6c1e3d8affbfe170bea18843f839a3334a38e0ec44ed9000
-	sha256sums = a26b3abaec1cd5731bc8431fecb8b3eb0ba47c1992e614643320df14ff859556
-	sha256sums = 8c1c880f2caa9c7ae43281a35410203887ea8eae750fe8d360d0c8bf80fcc6e0
-	sha256sums = 1144d51e5eb980fceeec16004f3645ed04a60fac9e0c7cf88a15c5c1e7a4b89e
-	sha256sums = dd4b69def2efacf4a6c442202ad5cb93d492c03886d7c61de87696e5a83e2846
-	sha256sums = 028b07f0c954f70ca37237b62e04103e81f7c658bb8bd65d7d3c2ace301297dc
-	sha256sums = a0c548c5703d25ae34b57931f1162de8b18937e676e5791a0f039922090881e7
-	sha256sums = 8dbb5ab3cb99e48d97d4e2f2e3df5d0de66f3721b4f7fd94a708089f53245c77
-	sha256sums = a7aefeacf22c600fafd9e040a985a913643095db7272c296b77a0a651c6a140a
-	sha256sums = cf06d959a53eff6d3c287327f1cb2a68346d725cfd1370bc7482a0edc75692fc
-	sha256sums = 27471eee564ca3149dd271b0817719b5565a9594dc4d884fe3dc51a5f03832bc
-	sha256sums = b6e695edbe349505a89c98054a54443acd90830a312cd035393c5c0a624e45c0
-	sha256sums = 035ea4b2a7621054f4560471f45336b981538a40172d8f17285910d4e0e0b3ef
-	sha256sums = e4764334717714cf2bc2e15d980c3ebcb8d78971a92463ef0fba4020da760643
+	sha256sums = a38b50b8c73332d3d16950bf8adcae7ead34391a60f74d05a58935cd3dc8a12d
+	sha256sums = b6806954a43ca362d80ea9ff4253a185eefb6afee5803749c7c1598bbcd86f6d
+	sha256sums = 458d7e024d33d4965b14b9b987f01a2884ff28761cff5da7c6a54132a95e9f36
 
 pkgname = linux-jcore
 	pkgdesc = Kernel for Manjaro/EndeavourOS/Arch (ACS override patch include)
diff --git a/0103-Bluetooth_fix_deadlock_for_RFCOMM_sk_state_change.patch b/0103-Bluetooth_fix_deadlock_for_RFCOMM_sk_state_change.patch
deleted file mode 100644
index b5087316dab2..000000000000
--- a/0103-Bluetooth_fix_deadlock_for_RFCOMM_sk_state_change.patch
+++ /dev/null
@@ -1,229 +0,0 @@
- 
-From 430daaab3c78de6bd82f10cfb5a0f016c6e583f6 Mon Sep 17 00:00:00 2001
-From: Desmond Cheong Zhi Xi <desmondcheongzx@gmail.com>
-Date: Mon, 4 Oct 2021 14:07:34 -0400
-Subject: [PATCH] Bluetooth: fix deadlock for RFCOMM sk state change
-
-Syzbot reports the following task hang [1]:
-
-INFO: task syz-executor255:8499 blocked for more than 143 seconds.
-      Not tainted 5.14.0-rc7-syzkaller #0
-
-Call Trace:
- context_switch kernel/sched/core.c:4681 [inline]
- __schedule+0x93a/0x26f0 kernel/sched/core.c:5938
- schedule+0xd3/0x270 kernel/sched/core.c:6017
- __lock_sock+0x13d/0x260 net/core/sock.c:2644
- lock_sock_nested+0xf6/0x120 net/core/sock.c:3185
- lock_sock include/net/sock.h:1612 [inline]
- rfcomm_sk_state_change+0xb4/0x390 net/bluetooth/rfcomm/sock.c:73
- __rfcomm_dlc_close+0x1b6/0x8a0 net/bluetooth/rfcomm/core.c:489
- rfcomm_dlc_close+0x1ea/0x240 net/bluetooth/rfcomm/core.c:520
- __rfcomm_sock_close+0xac/0x260 net/bluetooth/rfcomm/sock.c:220
- rfcomm_sock_shutdown+0xe9/0x210 net/bluetooth/rfcomm/sock.c:931
- rfcomm_sock_release+0x5f/0x140 net/bluetooth/rfcomm/sock.c:951
- __sock_release+0xcd/0x280 net/socket.c:649
- sock_close+0x18/0x20 net/socket.c:1314
- __fput+0x288/0x920 fs/file_table.c:280
- task_work_run+0xdd/0x1a0 kernel/task_work.c:164
- exit_task_work include/linux/task_work.h:32 [inline]
- do_exit+0xbd4/0x2a60 kernel/exit.c:825
- do_group_exit+0x125/0x310 kernel/exit.c:922
- get_signal+0x47f/0x2160 kernel/signal.c:2808
- arch_do_signal_or_restart+0x2a9/0x1c40 arch/x86/kernel/signal.c:865
- handle_signal_work kernel/entry/common.c:148 [inline]
- exit_to_user_mode_loop kernel/entry/common.c:172 [inline]
- exit_to_user_mode_prepare+0x17d/0x290 kernel/entry/common.c:209
- __syscall_exit_to_user_mode_work kernel/entry/common.c:291 [inline]
- syscall_exit_to_user_mode+0x19/0x60 kernel/entry/common.c:302
- do_syscall_64+0x42/0xb0 arch/x86/entry/common.c:86
- entry_SYSCALL_64_after_hwframe+0x44/0xae
-
-Showing all locks held in the system:
-1 lock held by khungtaskd/1653:
- #0: ffffffff8b97c280 (rcu_read_lock){....}-{1:2}, at:
- debug_show_all_locks+0x53/0x260 kernel/locking/lockdep.c:6446
-1 lock held by krfcommd/4781:
- #0: ffffffff8d306528 (rfcomm_mutex){+.+.}-{3:3}, at:
- rfcomm_process_sessions net/bluetooth/rfcomm/core.c:1979 [inline]
- #0: ffffffff8d306528 (rfcomm_mutex){+.+.}-{3:3}, at:
- rfcomm_run+0x2ed/0x4a20 net/bluetooth/rfcomm/core.c:2086
-2 locks held by in:imklog/8206:
- #0: ffff8880182ce5f0 (&f->f_pos_lock){+.+.}-{3:3}, at:
- __fdget_pos+0xe9/0x100 fs/file.c:974
- #1: ffff8880b9c51a58 (&rq->__lock){-.-.}-{2:2}, at:
- raw_spin_rq_lock_nested kernel/sched/core.c:460 [inline]
- #1: ffff8880b9c51a58 (&rq->__lock){-.-.}-{2:2}, at: raw_spin_rq_lock
- kernel/sched/sched.h:1307 [inline]
- #1: ffff8880b9c51a58 (&rq->__lock){-.-.}-{2:2}, at: rq_lock
- kernel/sched/sched.h:1610 [inline]
- #1: ffff8880b9c51a58 (&rq->__lock){-.-.}-{2:2}, at:
- __schedule+0x233/0x26f0 kernel/sched/core.c:5852
-4 locks held by syz-executor255/8499:
- #0: ffff888039a83690 (&sb->s_type->i_mutex_key#13){+.+.}-{3:3}, at:
- inode_lock include/linux/fs.h:774 [inline]
- #0: ffff888039a83690 (&sb->s_type->i_mutex_key#13){+.+.}-{3:3}, at:
- __sock_release+0x86/0x280 net/socket.c:648
- #1:
- ffff88802fa31120 (sk_lock-AF_BLUETOOTH-BTPROTO_RFCOMM){+.+.}-{0:0},
- at: lock_sock include/net/sock.h:1612 [inline]
- #1:
- ffff88802fa31120 (sk_lock-AF_BLUETOOTH-BTPROTO_RFCOMM){+.+.}-{0:0},
- at: rfcomm_sock_shutdown+0x54/0x210 net/bluetooth/rfcomm/sock.c:928
- #2: ffffffff8d306528 (rfcomm_mutex){+.+.}-{3:3}, at:
- rfcomm_dlc_close+0x34/0x240 net/bluetooth/rfcomm/core.c:507
- #3: ffff888141bd6d28 (&d->lock){+.+.}-{3:3}, at:
- __rfcomm_dlc_close+0x162/0x8a0 net/bluetooth/rfcomm/core.c:487
-==================================================================
-
-The task hangs because of a deadlock that occurs when lock_sock() is
-called in rfcomm_sk_state_change(). One such call stack is:
-
-  rfcomm_sock_shutdown():
-    lock_sock();
-    __rfcomm_sock_close():
-      rfcomm_dlc_close():
-        __rfcomm_dlc_close():
-          rfcomm_dlc_lock();
-          rfcomm_sk_state_change():
-            lock_sock();
-
-lock_sock() has to be called when the sk state is changed because the
-lock is not always held when rfcomm_sk_state_change() is
-called. However, besides the recursive deadlock, there is also an
-issue of a lock hierarchy inversion between rfcomm_dlc_lock() and
-lock_sock() if the socket is locked in rfcomm_sk_state_change().
-
-To avoid these issues, we can instead schedule the sk state change in
-the global workqueue. This is already the implicit assumption about
-how sk state changes happen. For example, in rfcomm_sock_shutdown(),
-the call to __rfcomm_sock_close() is followed by
-bt_sock_wait_state().
-
-Additionally, the call to rfcomm_sock_kill() inside
-rfcomm_sk_state_change() should be removed. The socket shouldn't be
-killed here because only rfcomm_sock_release() calls sock_orphan(),
-which it already follows up with a call to rfcomm_sock_kill().
-
-Fixes: b7ce436a5d79 ("Bluetooth: switch to lock_sock in RFCOMM")
-Link: https://syzkaller.appspot.com/bug?extid=7d51f807c81b190a127d [1]
-Reported-by: syzbot+7d51f807c81b190a127d@syzkaller.appspotmail.com
-Tested-by: syzbot+7d51f807c81b190a127d@syzkaller.appspotmail.com
-Signed-off-by: Desmond Cheong Zhi Xi <desmondcheongzx@gmail.com>
-Cc: Hillf Danton <hdanton@sina.com>
----
- include/net/bluetooth/rfcomm.h |  3 +++
- net/bluetooth/rfcomm/core.c    |  2 ++
- net/bluetooth/rfcomm/sock.c    | 34 ++++++++++++++++++++++------------
- 3 files changed, 27 insertions(+), 12 deletions(-)
-
-diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h
-index 99d26879b02a53..a92799fc5e74d0 100644
---- a/include/net/bluetooth/rfcomm.h
-+++ b/include/net/bluetooth/rfcomm.h
-@@ -171,6 +171,7 @@ struct rfcomm_dlc {
- 	struct rfcomm_session *session;
- 	struct sk_buff_head   tx_queue;
- 	struct timer_list     timer;
-+	struct work_struct    state_change_work;
-
- 	struct mutex  lock;
- 	unsigned long state;
-@@ -186,6 +187,7 @@ struct rfcomm_dlc {
- 	u8            sec_level;
- 	u8            role_switch;
- 	u32           defer_setup;
-+	int           err;
-
- 	uint          mtu;
- 	uint          cfc;
-@@ -310,6 +312,7 @@ struct rfcomm_pinfo {
- 	u8     role_switch;
- };
-
-+void __rfcomm_sk_state_change(struct work_struct *work);
- int  rfcomm_init_sockets(void);
- void rfcomm_cleanup_sockets(void);
-
-diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
-index 7324764384b677..c6494e85cd68b2 100644
---- a/net/bluetooth/rfcomm/core.c
-+++ b/net/bluetooth/rfcomm/core.c
-@@ -289,6 +289,7 @@ static void rfcomm_dlc_clear_state(struct rfcomm_dlc *d)
- 	d->flags      = 0;
- 	d->mscex      = 0;
- 	d->sec_level  = BT_SECURITY_LOW;
-+	d->err        = 0;
- 	d->mtu        = RFCOMM_DEFAULT_MTU;
- 	d->v24_sig    = RFCOMM_V24_RTC | RFCOMM_V24_RTR | RFCOMM_V24_DV;
-
-@@ -306,6 +307,7 @@ struct rfcomm_dlc *rfcomm_dlc_alloc(gfp_t prio)
- 	timer_setup(&d->timer, rfcomm_dlc_timeout, 0);
-
- 	skb_queue_head_init(&d->tx_queue);
-+	INIT_WORK(&d->state_change_work, __rfcomm_sk_state_change);
- 	mutex_init(&d->lock);
- 	refcount_set(&d->refcnt, 1);
-
-diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
-index 4bf4ea6cbb5eee..4850dafbaa05fb 100644
---- a/net/bluetooth/rfcomm/sock.c
-+++ b/net/bluetooth/rfcomm/sock.c
-@@ -61,19 +61,22 @@ static void rfcomm_sk_data_ready(struct rfcomm_dlc *d, struct sk_buff *skb)
- 		rfcomm_dlc_throttle(d);
- }
-
--static void rfcomm_sk_state_change(struct rfcomm_dlc *d, int err)
-+void __rfcomm_sk_state_change(struct work_struct *work)
- {
-+	struct rfcomm_dlc *d = container_of(work, struct rfcomm_dlc,
-+					    state_change_work);
- 	struct sock *sk = d->owner, *parent;
-
- 	if (!sk)
- 		return;
-
--	BT_DBG("dlc %p state %ld err %d", d, d->state, err);
--
- 	lock_sock(sk);
-+	rfcomm_dlc_lock(d);
-
--	if (err)
--		sk->sk_err = err;
-+	BT_DBG("dlc %p state %ld err %d", d, d->state, d->err);
-+
-+	if (d->err)
-+		sk->sk_err = d->err;
-
- 	sk->sk_state = d->state;
-
-@@ -91,15 +94,22 @@ static void rfcomm_sk_state_change(struct rfcomm_dlc *d, int err)
- 		sk->sk_state_change(sk);
- 	}
-
-+	rfcomm_dlc_unlock(d);
- 	release_sock(sk);
-+	sock_put(sk);
-+}
-
--	if (parent && sock_flag(sk, SOCK_ZAPPED)) {
--		/* We have to drop DLC lock here, otherwise
--		 * rfcomm_sock_destruct() will dead lock. */
--		rfcomm_dlc_unlock(d);
--		rfcomm_sock_kill(sk);
--		rfcomm_dlc_lock(d);
--	}
-+static void rfcomm_sk_state_change(struct rfcomm_dlc *d, int err)
-+{
-+	struct sock *sk = d->owner;
-+
-+	if (!sk)
-+		return;
-+
-+	d->err = err;
-+	sock_hold(sk);
-+	if (!schedule_work(&d->state_change_work))
-+		sock_put(sk);
- }
-
- /* ---- Socket functions ---- */
diff --git a/0301-revert-fbcon-remove-now-unusued-softback_lines-cursor-argument.patch b/0301-revert-fbcon-remove-now-unusued-softback_lines-cursor-argument.patch
deleted file mode 100644
index c12688800eab..000000000000
--- a/0301-revert-fbcon-remove-now-unusued-softback_lines-cursor-argument.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- b/drivers/video/fbdev/core/bitblit.c
-+++ a/drivers/video/fbdev/core/bitblit.c
-@@ -234,7 +234,7 @@
- }
- 
- static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode,
-+		       int softback_lines, int fg, int bg)
--		       int fg, int bg)
- {
- 	struct fb_cursor cursor;
- 	struct fbcon_ops *ops = info->fbcon_par;
-@@ -247,6 +247,15 @@
- 
- 	cursor.set = 0;
- 
-+	if (softback_lines) {
-+		if (y + softback_lines >= vc->vc_rows) {
-+			mode = CM_ERASE;
-+			ops->cursor_flash = 0;
-+			return;
-+		} else
-+			y += softback_lines;
-+	}
-+
-  	c = scr_readw((u16 *) vc->vc_pos);
- 	attribute = get_attribute(info, c);
- 	src = vc->vc_font.data + ((c & charmask) * (w * vc->vc_font.height));
---- b/drivers/video/fbdev/core/fbcon.c
-+++ a/drivers/video/fbdev/core/fbcon.c
-@@ -394,7 +394,7 @@
- 	c = scr_readw((u16 *) vc->vc_pos);
- 	mode = (!ops->cursor_flash || ops->cursor_state.enable) ?
- 		CM_ERASE : CM_DRAW;
-+	ops->cursor(vc, info, mode, 0, get_color(vc, info, c, 1),
--	ops->cursor(vc, info, mode, get_color(vc, info, c, 1),
- 		    get_color(vc, info, c, 0));
- 	console_unlock();
- }
-@@ -1345,7 +1345,7 @@
- 
- 	ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1;
- 
-+	ops->cursor(vc, info, mode, 0, get_color(vc, info, c, 1),
--	ops->cursor(vc, info, mode, get_color(vc, info, c, 1),
- 		    get_color(vc, info, c, 0));
- }
- 
---- b/drivers/video/fbdev/core/fbcon.h
-+++ a/drivers/video/fbdev/core/fbcon.h
-@@ -62,7 +62,7 @@
- 	void (*clear_margins)(struct vc_data *vc, struct fb_info *info,
- 			      int color, int bottom_only);
- 	void (*cursor)(struct vc_data *vc, struct fb_info *info, int mode,
-+		       int softback_lines, int fg, int bg);
--		       int fg, int bg);
- 	int  (*update_start)(struct fb_info *info);
- 	int  (*rotate_font)(struct fb_info *info, struct vc_data *vc);
- 	struct fb_var_screeninfo var;  /* copy of the current fb_var_screeninfo */
---- b/drivers/video/fbdev/core/fbcon_ccw.c
-+++ a/drivers/video/fbdev/core/fbcon_ccw.c
-@@ -219,7 +219,7 @@
- }
- 
- static void ccw_cursor(struct vc_data *vc, struct fb_info *info, int mode,
-+		       int softback_lines, int fg, int bg)
--		       int fg, int bg)
- {
- 	struct fb_cursor cursor;
- 	struct fbcon_ops *ops = info->fbcon_par;
-@@ -236,6 +236,15 @@
- 
- 	cursor.set = 0;
- 
-+	if (softback_lines) {
-+		if (y + softback_lines >= vc->vc_rows) {
-+			mode = CM_ERASE;
-+			ops->cursor_flash = 0;
-+			return;
-+		} else
-+			y += softback_lines;
-+	}
-+
-  	c = scr_readw((u16 *) vc->vc_pos);
- 	attribute = get_attribute(info, c);
- 	src = ops->fontbuffer + ((c & charmask) * (w * vc->vc_font.width));
---- b/drivers/video/fbdev/core/fbcon_cw.c
-+++ a/drivers/video/fbdev/core/fbcon_cw.c
-@@ -202,7 +202,7 @@
- }
- 
- static void cw_cursor(struct vc_data *vc, struct fb_info *info, int mode,
-+		      int softback_lines, int fg, int bg)
--		      int fg, int bg)
- {
- 	struct fb_cursor cursor;
- 	struct fbcon_ops *ops = info->fbcon_par;
-@@ -219,6 +219,15 @@
- 
- 	cursor.set = 0;
- 
-+	if (softback_lines) {
-+		if (y + softback_lines >= vc->vc_rows) {
-+			mode = CM_ERASE;
-+			ops->cursor_flash = 0;
-+			return;
-+		} else
-+			y += softback_lines;
-+	}
-+
-  	c = scr_readw((u16 *) vc->vc_pos);
- 	attribute = get_attribute(info, c);
- 	src = ops->fontbuffer + ((c & charmask) * (w * vc->vc_font.width));
---- b/drivers/video/fbdev/core/fbcon_ud.c
-+++ a/drivers/video/fbdev/core/fbcon_ud.c
-@@ -249,7 +249,7 @@
- }
- 
- static void ud_cursor(struct vc_data *vc, struct fb_info *info, int mode,
-+		      int softback_lines, int fg, int bg)
--		      int fg, int bg)
- {
- 	struct fb_cursor cursor;
- 	struct fbcon_ops *ops = info->fbcon_par;
-@@ -267,6 +267,15 @@
- 
- 	cursor.set = 0;
- 
-+	if (softback_lines) {
-+		if (y + softback_lines >= vc->vc_rows) {
-+			mode = CM_ERASE;
-+			ops->cursor_flash = 0;
-+			return;
-+		} else
-+			y += softback_lines;
-+	}
-+
-  	c = scr_readw((u16 *) vc->vc_pos);
- 	attribute = get_attribute(info, c);
- 	src = ops->fontbuffer + ((c & charmask) * (w * vc->vc_font.height));
---- b/drivers/video/fbdev/core/tileblit.c
-+++ a/drivers/video/fbdev/core/tileblit.c
-@@ -80,7 +80,7 @@
- }
- 
- static void tile_cursor(struct vc_data *vc, struct fb_info *info, int mode,
-+			int softback_lines, int fg, int bg)
--			int fg, int bg)
- {
- 	struct fb_tilecursor cursor;
- 	int use_sw = vc->vc_cursor_type & CUR_SW;
diff --git a/0302-revert-fbcon-remove-no-op-fbcon_set_origin.patch b/0302-revert-fbcon-remove-no-op-fbcon_set_origin.patch
deleted file mode 100644
index 6491c541e883..000000000000
--- a/0302-revert-fbcon-remove-no-op-fbcon_set_origin.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- b/drivers/video/fbdev/core/fbcon.c
-+++ a/drivers/video/fbdev/core/fbcon.c
-@@ -163,6 +163,8 @@
- 
- #define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta) * vc->vc_size_row)
- 
-+static int fbcon_set_origin(struct vc_data *);
-+
- static int fbcon_cursor_noblink;
- 
- #define divides(a, b)	((!(a) || (b)%(a)) ? 0 : 1)
-@@ -2633,6 +2635,11 @@
- 	}
- }
- 
-+static int fbcon_set_origin(struct vc_data *vc)
-+{
-+	return 0;
-+}
-+
- void fbcon_suspended(struct fb_info *info)
- {
- 	struct vc_data *vc = NULL;
-@@ -3103,6 +3110,7 @@
- 	.con_font_default	= fbcon_set_def_font,
- 	.con_font_copy 		= fbcon_copy_font,
- 	.con_set_palette 	= fbcon_set_palette,
-+	.con_set_origin 	= fbcon_set_origin,
- 	.con_invert_region 	= fbcon_invert_region,
- 	.con_screen_pos 	= fbcon_screen_pos,
- 	.con_getxy 		= fbcon_getxy,
diff --git a/0303-revert-fbcon-remove-soft-scrollback-code.patch b/0303-revert-fbcon-remove-soft-scrollback-code.patch
deleted file mode 100644
index 9d0556e58b20..000000000000
--- a/0303-revert-fbcon-remove-soft-scrollback-code.patch
+++ /dev/null
@@ -1,500 +0,0 @@
---- b/drivers/video/fbdev/core/fbcon.c
-+++ a/drivers/video/fbdev/core/fbcon.c
-@@ -124,6 +124,12 @@ static int logo_lines;
- /* logo_shown is an index to vc_cons when >= 0; otherwise follows FBCON_LOGO
-    enums.  */
- static int logo_shown = FBCON_LOGO_CANSHOW;
-+/* Software scrollback */
-+static int fbcon_softback_size = 32768;
-+static unsigned long softback_buf, softback_curr;
-+static unsigned long softback_in;
-+static unsigned long softback_top, softback_end;
-+static int softback_lines;
- /* console mappings */
- static unsigned int first_fb_vc;
- static unsigned int last_fb_vc = MAX_NR_CONSOLES - 1;
-@@ -163,6 +169,8 @@ static int margin_color;
- 
- static const struct consw fb_con;
- 
-+#define CM_SOFTBACK	(8)
-+
- #define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta) * vc->vc_size_row)
- 
- static int fbcon_set_origin(struct vc_data *);
-@@ -347,6 +355,18 @@ static int get_color(struct vc_data *vc,
- 	return color;
- }
- 
-+static void fbcon_update_softback(struct vc_data *vc)
-+{
-+	int l = fbcon_softback_size / vc->vc_size_row;
-+
-+	if (l > 5)
-+		softback_end = softback_buf + l * vc->vc_size_row;
-+	else
-+		/* Smaller scrollback makes no sense, and 0 would screw
-+		   the operation totally */
-+		softback_top = 0;
-+}
-+
- static void fb_flashcursor(struct work_struct *work)
- {
- 	struct fbcon_ops *ops = container_of(work, struct fbcon_ops, cursor_work.work);
-@@ -379,7 +399,7 @@ static void fb_flashcursor(struct work_s
- 	c = scr_readw((u16 *) vc->vc_pos);
- 	mode = (!ops->cursor_flash || ops->cursor_state.enable) ?
- 		CM_ERASE : CM_DRAW;
--	ops->cursor(vc, info, mode, 0, get_color(vc, info, c, 1),
-+	ops->cursor(vc, info, mode, softback_lines, get_color(vc, info, c, 1),
- 		    get_color(vc, info, c, 0));
- 	console_unlock();
- 
-@@ -419,7 +439,13 @@ static int __init fb_console_setup(char
- 		}
- 		
- 		if (!strncmp(options, "scrollback:", 11)) {
--			pr_warn("Ignoring scrollback size option\n");
-+			options += 11;
-+			if (*options) {
-+				fbcon_softback_size = simple_strtoul(options, &options, 0);
-+				if (*options == 'k' || *options == 'K') {
-+					fbcon_softback_size *= 1024;
-+				}
-+			}
- 			continue;
- 		}
- 		
-@@ -959,6 +985,31 @@ static const char *fbcon_startup(void)
- 
- 	set_blitting_type(vc, info);
- 
-+	if (info->fix.type != FB_TYPE_TEXT) {
-+		if (fbcon_softback_size) {
-+			if (!softback_buf) {
-+				softback_buf =
-+				    (unsigned long)
-+				    kvmalloc(fbcon_softback_size,
-+					    GFP_KERNEL);
-+				if (!softback_buf) {
-+					fbcon_softback_size = 0;
-+					softback_top = 0;
-+				}
-+			}
-+		} else {
-+			if (softback_buf) {
-+				kvfree((void *) softback_buf);
-+				softback_buf = 0;
-+				softback_top = 0;
-+			}
-+		}
-+		if (softback_buf)
-+			softback_in = softback_top = softback_curr =
-+			    softback_buf;
-+		softback_lines = 0;
-+	}
-+
- 	/* Setup default font */
- 	if (!p->fontdata && !vc->vc_font.data) {
- 		if (!fontname[0] || !(font = find_font(fontname)))
-@@ -1129,6 +1180,9 @@ static void fbcon_init(struct vc_data *v
- 	if (logo)
- 		fbcon_prepare_logo(vc, info, cols, rows, new_cols, new_rows);
- 
-+	if (vc == svc && softback_buf)
-+		fbcon_update_softback(vc);
-+
- 	if (ops->rotate_font && ops->rotate_font(info, vc)) {
- 		ops->rotate = FB_ROTATE_UR;
- 		set_blitting_type(vc, info);
-@@ -1152,6 +1206,9 @@ static void fbcon_release_all(void)
- 	struct fb_info *info;
- 	int i, j, mapped;
- 
-+	kvfree((void *)softback_buf);
-+	softback_buf = 0UL;
-+
- 	fbcon_for_each_registered_fb(i) {
- 		mapped = 0;
- 		info = fbcon_registered_fb[i];
-@@ -1312,6 +1369,7 @@ static void fbcon_cursor(struct vc_data
- {
- 	struct fb_info *info = fbcon_info_from_console(vc->vc_num);
- 	struct fbcon_ops *ops = info->fbcon_par;
-+	int y;
-  	int c = scr_readw((u16 *) vc->vc_pos);
- 
- 	ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
-@@ -1325,11 +1383,19 @@ static void fbcon_cursor(struct vc_data
- 		fbcon_add_cursor_work(info);
- 
- 	ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1;
-+	if (mode & CM_SOFTBACK) {
-+		mode &= ~CM_SOFTBACK;
-+		y = softback_lines;
-+	} else {
-+		if (softback_lines)
-+			fbcon_set_origin(vc);
-+		y = 0;
-+	}
- 
- 	if (!ops->cursor)
- 		return;
- 
--	ops->cursor(vc, info, mode, 0, get_color(vc, info, c, 1),
-+	ops->cursor(vc, info, mode, y, get_color(vc, info, c, 1),
- 		    get_color(vc, info, c, 0));
- }
- 
-@@ -1399,6 +1465,8 @@ static void fbcon_set_disp(struct fb_inf
- 
- 	if (con_is_visible(vc)) {
- 		update_screen(vc);
-+		if (softback_buf)
-+			fbcon_update_softback(vc);
- 	}
- }
- 
-@@ -1536,6 +1604,99 @@ static __inline__ void ypan_down_redraw(
- 	scrollback_current = 0;
- }
- 
-+static void fbcon_redraw_softback(struct vc_data *vc, struct fbcon_display *p,
-+				  long delta)
-+{
-+	int count = vc->vc_rows;
-+	unsigned short *d, *s;
-+	unsigned long n;
-+	int line = 0;
-+
-+	d = (u16 *) softback_curr;
-+	if (d == (u16 *) softback_in)
-+		d = (u16 *) vc->vc_origin;
-+	n = softback_curr + delta * vc->vc_size_row;
-+	softback_lines -= delta;
-+	if (delta < 0) {
-+		if (softback_curr < softback_top && n < softback_buf) {
-+			n += softback_end - softback_buf;
-+			if (n < softback_top) {
-+				softback_lines -=
-+				    (softback_top - n) / vc->vc_size_row;
-+				n = softback_top;
-+			}
-+		} else if (softback_curr >= softback_top
-+			   && n < softback_top) {
-+			softback_lines -=
-+			    (softback_top - n) / vc->vc_size_row;
-+			n = softback_top;
-+		}
-+	} else {
-+		if (softback_curr > softback_in && n >= softback_end) {
-+			n += softback_buf - softback_end;
-+			if (n > softback_in) {
-+				n = softback_in;
-+				softback_lines = 0;
-+			}
-+		} else if (softback_curr <= softback_in && n > softback_in) {
-+			n = softback_in;
-+			softback_lines = 0;
-+		}
-+	}
-+	if (n == softback_curr)
-+		return;
-+	softback_curr = n;
-+	s = (u16 *) softback_curr;
-+	if (s == (u16 *) softback_in)
-+		s = (u16 *) vc->vc_origin;
-+	while (count--) {
-+		unsigned short *start;
-+		unsigned short *le;
-+		unsigned short c;
-+		int x = 0;
-+		unsigned short attr = 1;
-+
-+		start = s;
-+		le = advance_row(s, 1);
-+		do {
-+			c = scr_readw(s);
-+			if (attr != (c & 0xff00)) {
-+				attr = c & 0xff00;
-+				if (s > start) {
-+					fbcon_putcs(vc, start, s - start,
-+						    line, x);
-+					x += s - start;
-+					start = s;
-+				}
-+			}
-+			if (c == scr_readw(d)) {
-+				if (s > start) {
-+					fbcon_putcs(vc, start, s - start,
-+						    line, x);
-+					x += s - start + 1;
-+					start = s + 1;
-+				} else {
-+					x++;
-+					start++;
-+				}
-+			}
-+			s++;
-+			d++;
-+		} while (s < le);
-+		if (s > start)
-+			fbcon_putcs(vc, start, s - start, line, x);
-+		line++;
-+		if (d == (u16 *) softback_end)
-+			d = (u16 *) softback_buf;
-+		if (d == (u16 *) softback_in)
-+			d = (u16 *) vc->vc_origin;
-+		if (s == (u16 *) softback_end)
-+			s = (u16 *) softback_buf;
-+		if (s == (u16 *) softback_in)
-+			s = (u16 *) vc->vc_origin;
-+	}
-+}
-+
- static void fbcon_redraw_move(struct vc_data *vc, struct fbcon_display *p,
- 			      int line, int count, int dy)
- {
-@@ -1740,6 +1901,31 @@ static void fbcon_bmove(struct vc_data *
- 			p->vrows - p->yscroll);
- }
- 
-+static inline void fbcon_softback_note(struct vc_data *vc, int t,
-+				       int count)
-+{
-+	unsigned short *p;
-+
-+	if (vc->vc_num != fg_console)
-+		return;
-+	p = (unsigned short *) (vc->vc_origin + t * vc->vc_size_row);
-+
-+	while (count) {
-+		scr_memcpyw((u16 *) softback_in, p, vc->vc_size_row);
-+		count--;
-+		p = advance_row(p, 1);
-+		softback_in += vc->vc_size_row;
-+		if (softback_in == softback_end)
-+			softback_in = softback_buf;
-+		if (softback_in == softback_top) {
-+			softback_top += vc->vc_size_row;
-+			if (softback_top == softback_end)
-+				softback_top = softback_buf;
-+		}
-+	}
-+	softback_curr = softback_in;
-+}
-+
- static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b,
- 		enum con_scroll dir, unsigned int count)
- {
-@@ -1762,6 +1948,8 @@ static bool fbcon_scroll(struct vc_data
- 	case SM_UP:
- 		if (count > vc->vc_rows)	/* Maximum realistic size */
- 			count = vc->vc_rows;
-+		if (softback_top)
-+			fbcon_softback_note(vc, t, count);
- 		switch (fb_scrollmode(p)) {
- 		case SCROLL_MOVE:
- 			fbcon_redraw_blit(vc, info, p, t, b - t - count,
-@@ -2076,6 +2264,14 @@ static int fbcon_switch(struct vc_data *
- 	info = fbcon_info_from_console(vc->vc_num);
- 	ops = info->fbcon_par;
- 
-+	if (softback_top) {
-+		if (softback_lines)
-+			fbcon_set_origin(vc);
-+		softback_top = softback_curr = softback_in = softback_buf;
-+		softback_lines = 0;
-+		fbcon_update_softback(vc);
-+	}
-+
- 	if (logo_shown >= 0) {
- 		struct vc_data *conp2 = vc_cons[logo_shown].d;
- 
-@@ -2406,6 +2602,9 @@ static int fbcon_do_set_font(struct vc_d
- 	int resize, ret, old_userfont, old_width, old_height, old_charcount;
- 	char *old_data = NULL;
- 
-+	if (con_is_visible(vc) && softback_lines)
-+		fbcon_set_origin(vc);
-+
- 	resize = (w != vc->vc_font.width) || (h != vc->vc_font.height);
- 	if (p->userfont)
- 		old_data = vc->vc_font.data;
-@@ -2436,6 +2635,8 @@ static int fbcon_do_set_font(struct vc_d
- 		ret = vc_resize(vc, cols, rows);
- 		if (ret)
- 			goto err_out;
-+		if (con_is_visible(vc) && softback_buf)
-+			fbcon_update_softback(vc);
- 	} else if (con_is_visible(vc)
- 		   && vc->vc_mode == KD_TEXT) {
- 		fbcon_clear_margins(vc, 0);
-@@ -2605,7 +2806,19 @@ static void fbcon_set_palette(struct vc_
- 
- static u16 *fbcon_screen_pos(const struct vc_data *vc, int offset)
- {
--	return (u16 *) (vc->vc_origin + offset);
-+	unsigned long p;
-+	int line;
-+	
-+	if (vc->vc_num != fg_console || !softback_lines)
-+		return (u16 *) (vc->vc_origin + offset);
-+	line = offset / vc->vc_size_row;
-+	if (line >= softback_lines)
-+		return (u16 *) (vc->vc_origin + offset -
-+				softback_lines * vc->vc_size_row);
-+	p = softback_curr + offset;
-+	if (p >= softback_end)
-+		p += softback_buf - softback_end;
-+	return (u16 *) p;
- }
- 
- static unsigned long fbcon_getxy(struct vc_data *vc, unsigned long pos,
-@@ -2619,7 +2832,22 @@ static unsigned long fbcon_getxy(struct
- 
- 		x = offset % vc->vc_cols;
- 		y = offset / vc->vc_cols;
-+		if (vc->vc_num == fg_console)
-+			y += softback_lines;
-+		ret = pos + (vc->vc_cols - x) * 2;
-+	} else if (vc->vc_num == fg_console && softback_lines) {
-+		unsigned long offset = pos - softback_curr;
-+
-+		if (pos < softback_curr)
-+			offset += softback_end - softback_buf;
-+		offset /= 2;
-+		x = offset % vc->vc_cols;
-+		y = offset / vc->vc_cols;
- 		ret = pos + (vc->vc_cols - x) * 2;
-+		if (ret == softback_end)
-+			ret = softback_buf;
-+		if (ret == softback_in)
-+			ret = vc->vc_origin;
- 	} else {
- 		/* Should not happen */
- 		x = y = 0;
-@@ -2647,11 +2875,106 @@ static void fbcon_invert_region(struct v
- 			a = ((a) & 0x88ff) | (((a) & 0x7000) >> 4) |
- 			    (((a) & 0x0700) << 4);
- 		scr_writew(a, p++);
-+		if (p == (u16 *) softback_end)
-+			p = (u16 *) softback_buf;
-+		if (p == (u16 *) softback_in)
-+			p = (u16 *) vc->vc_origin;
-+	}
-+}
-+
-+static void fbcon_scrolldelta(struct vc_data *vc, int lines)
-+{
-+	struct fb_info *info = fbcon_registered_fb[con2fb_map[fg_console]];
-+	struct fbcon_ops *ops = info->fbcon_par;
-+	struct fbcon_display *disp = &fb_display[fg_console];
-+	int offset, limit, scrollback_old;
-+
-+	if (softback_top) {
-+		if (vc->vc_num != fg_console)
-+			return;
-+		if (vc->vc_mode != KD_TEXT || !lines)
-+			return;
-+		if (logo_shown >= 0) {
-+			struct vc_data *conp2 = vc_cons[logo_shown].d;
-+
-+			if (conp2->vc_top == logo_lines
-+			    && conp2->vc_bottom == conp2->vc_rows)
-+				conp2->vc_top = 0;
-+			if (logo_shown == vc->vc_num) {
-+				unsigned long p, q;
-+				int i;
-+
-+				p = softback_in;
-+				q = vc->vc_origin +
-+				    logo_lines * vc->vc_size_row;
-+				for (i = 0; i < logo_lines; i++) {
-+					if (p == softback_top)
-+						break;
-+					if (p == softback_buf)
-+						p = softback_end;
-+					p -= vc->vc_size_row;
-+					q -= vc->vc_size_row;
-+					scr_memcpyw((u16 *) q, (u16 *) p,
-+						    vc->vc_size_row);
-+				}
-+				softback_in = softback_curr = p;
-+				update_region(vc, vc->vc_origin,
-+					      logo_lines * vc->vc_cols);
-+			}
-+			logo_shown = FBCON_LOGO_CANSHOW;
-+		}
-+		fbcon_cursor(vc, CM_ERASE | CM_SOFTBACK);
-+		fbcon_redraw_softback(vc, disp, lines);
-+		fbcon_cursor(vc, CM_DRAW | CM_SOFTBACK);
-+		return;
- 	}
-+
-+	if (!scrollback_phys_max)
-+		return;
-+
-+	scrollback_old = scrollback_current;
-+	scrollback_current -= lines;
-+	if (scrollback_current < 0)
-+		scrollback_current = 0;
-+	else if (scrollback_current > scrollback_max)
-+		scrollback_current = scrollback_max;
-+	if (scrollback_current == scrollback_old)
-+		return;
-+
-+	if (fbcon_is_inactive(vc, info))
-+		return;
-+
-+	fbcon_cursor(vc, CM_ERASE);
-+
-+	offset = disp->yscroll - scrollback_current;
-+	limit = disp->vrows;
-+	/* switch (disp->scrollmode) {
-+	case SCROLL_WRAP_MOVE:
-+		info->var.vmode |= FB_VMODE_YWRAP;
-+		break;
-+	case SCROLL_PAN_MOVE:
-+	case SCROLL_PAN_REDRAW:
-+		limit -= vc->vc_rows;
-+		info->var.vmode &= ~FB_VMODE_YWRAP;
-+		break;
-+	} */
-+	if (offset < 0)
-+		offset += limit;
-+	else if (offset >= limit)
-+		offset -= limit;
-+
-+	ops->var.xoffset = 0;
-+	ops->var.yoffset = offset * vc->vc_font.height;
-+	ops->update_start(info);
-+
-+	if (!scrollback_current)
-+		fbcon_cursor(vc, CM_DRAW);
- }
- 
- static int fbcon_set_origin(struct vc_data *vc)
- {
-+	if (softback_lines)
-+		fbcon_scrolldelta(vc, softback_lines);
- 	return 0;
- }
- 
-@@ -2715,6 +3038,8 @@ static void fbcon_modechanged(struct fb_
- 
- 		fbcon_set_palette(vc, color_table);
- 		update_screen(vc);
-+		if (softback_buf)
-+			fbcon_update_softback(vc);
- 	}
- }
- 
-@@ -3177,6 +3502,7 @@ static const struct consw fb_con = {
- 	.con_font_get 		= fbcon_get_font,
- 	.con_font_default	= fbcon_set_def_font,
- 	.con_set_palette 	= fbcon_set_palette,
-+	.con_scrolldelta 	= fbcon_scrolldelta,
- 	.con_set_origin 	= fbcon_set_origin,
- 	.con_invert_region 	= fbcon_invert_region,
- 	.con_screen_pos 	= fbcon_screen_pos,
diff --git a/0401-bootsplash.patch b/0401-bootsplash.patch
deleted file mode 100644
index b2cea91e8091..000000000000
--- a/0401-bootsplash.patch
+++ /dev/null
@@ -1,746 +0,0 @@
-diff --git a/MAINTAINERS b/MAINTAINERS
-index a74227ad082e..b5633b56391e 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -3615,6 +3615,14 @@
- F:     Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
- F:     drivers/iio/accel/bma400*
- 
-+BOOTSPLASH
-+M:     Max Staudt <mstaudt@suse.de>
-+L:     linux-fbdev@vger.kernel.org
-+S:     Maintained
-+F:     drivers/video/fbdev/core/bootsplash*.*
-+F:     drivers/video/fbdev/core/dummycon.c
-+F:     include/linux/bootsplash.h
-+
- BPF [GENERAL] (Safe Dynamic Programs and Tools)
- M:     Alexei Starovoitov <ast@kernel.org>
- M:     Daniel Borkmann <daniel@iogearbox.net>
-diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
-index 7f1f1fbcef9e..f3ff976266fe 100644
---- a/drivers/video/console/Kconfig
-+++ b/drivers/video/console/Kconfig
-@@ -151,6 +151,30 @@ config FRAMEBUFFER_CONSOLE_ROTATION
-          such that other users of the framebuffer will remain normally
-          oriented.
- 
-+config BOOTSPLASH
-+	bool "Bootup splash screen"
-+	depends on FRAMEBUFFER_CONSOLE
-+	help
-+	  This option enables the Linux bootsplash screen.
-+
-+	  The bootsplash is a full-screen logo or animation indicating a
-+	  booting system. It replaces the classic scrolling text with a
-+	  graphical alternative, similar to other systems.
-+
-+	  Since this is technically implemented as a hook on top of fbcon,
-+	  it can only work if the FRAMEBUFFER_CONSOLE is enabled and a
-+	  framebuffer driver is active. Thus, to get a text-free boot,
-+	  the system needs to boot with vesafb, efifb, or similar.
-+
-+	  Once built into the kernel, the bootsplash needs to be enabled
-+	  with bootsplash.enabled=1 and a splash file needs to be supplied.
-+
-+	  Further documentation can be found in:
-+	    Documentation/fb/bootsplash.txt
-+
-+	  If unsure, say N.
-+	  This is typically used by distributors and system integrators.
-+
- config STI_CONSOLE
-         bool "STI text console"
-         depends on PARISC
-diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile
-index 73493bbd7a15..66895321928e 100644
---- a/drivers/video/fbdev/core/Makefile
-+++ b/drivers/video/fbdev/core/Makefile
-@@ -29,3 +29,6 @@ obj-$(CONFIG_FB_SYS_IMAGEBLIT) += sysimgblt.o
- obj-$(CONFIG_FB_SYS_FOPS)      += fb_sys_fops.o
- obj-$(CONFIG_FB_SVGALIB)       += svgalib.o
- obj-$(CONFIG_FB_DDC)           += fb_ddc.o
-+
-+obj-$(CONFIG_BOOTSPLASH)       += bootsplash.o bootsplash_render.o \
-+                                  dummyblit.o
-diff --git a/drivers/video/fbdev/core/bootsplash.c b/drivers/video/fbdev/core/bootsplash.c
-new file mode 100644
-index 000000000000..e449755af268
---- /dev/null
-+++ b/drivers/video/fbdev/core/bootsplash.c
-@@ -0,0 +1,294 @@
-+/*
-+ * Kernel based bootsplash.
-+ *
-+ * (Main file: Glue code, workers, timer, PM, kernel and userland API)
-+ *
-+ * Authors:
-+ * Max Staudt <mstaudt@suse.de>
-+ *
-+ * SPDX-License-Identifier: GPL-2.0
-+ */
-+
-+#define pr_fmt(fmt) "bootsplash: " fmt
-+
-+
-+#include <linux/atomic.h>
-+#include <linux/bootsplash.h>
-+#include <linux/console.h>
-+#include <linux/device.h> /* dev_warn() */
-+#include <linux/fb.h>
-+#include <linux/fs.h>
-+#include <linux/kernel.h>
-+#include <linux/jiffies.h>
-+#include <linux/module.h>
-+#include <linux/mutex.h>
-+#include <linux/platform_device.h>
-+#include <linux/printk.h>
-+#include <linux/selection.h> /* console_blanked */
-+#include <linux/stringify.h>
-+#include <linux/types.h>
-+#include <linux/vmalloc.h>
-+#include <linux/vt_kern.h>
-+#include <linux/workqueue.h>
-+
-+#include "bootsplash_internal.h"
-+
-+
-+/*
-+ * We only have one splash screen, so let's keep a single
-+ * instance of the internal state.
-+ */
-+static struct splash_priv splash_state;
-+
-+
-+static void splash_callback_redraw_vc(struct work_struct *ignored)
-+{
-+	if (console_blanked)
-+		return;
-+
-+	console_lock();
-+	if (vc_cons[fg_console].d)
-+		update_screen(vc_cons[fg_console].d);
-+	console_unlock();
-+}
-+
-+
-+static bool is_fb_compatible(const struct fb_info *info)
-+{
-+	if (!(info->flags & FBINFO_BE_MATH)
-+	    != !fb_be_math((struct fb_info *)info)) {
-+		dev_warn(info->device,
-+			 "Can't draw on foreign endianness framebuffer.\n");
-+
-+		return false;
-+	}
-+
-+	if (info->flags & FBINFO_MISC_TILEBLITTING) {
-+		dev_warn(info->device,
-+			 "Can't draw splash on tiling framebuffer.\n");
-+
-+		return false;
-+	}
-+
-+	if (info->fix.type != FB_TYPE_PACKED_PIXELS
-+	    || (info->fix.visual != FB_VISUAL_TRUECOLOR
-+		&& info->fix.visual != FB_VISUAL_DIRECTCOLOR)) {
-+		dev_warn(info->device,
-+			 "Can't draw splash on non-packed or non-truecolor framebuffer.\n");
-+
-+		dev_warn(info->device,
-+			 "  type: %u   visual: %u\n",
-+			 info->fix.type, info->fix.visual);
-+
-+		return false;
-+	}
-+
-+	if (info->var.bits_per_pixel != 16
-+	    && info->var.bits_per_pixel != 24
-+	    && info->var.bits_per_pixel != 32) {
-+		dev_warn(info->device,
-+			 "We only support drawing on framebuffers with 16, 24, or 32 bpp, not %d.\n",
-+			 info->var.bits_per_pixel);
-+
-+		return false;
-+	}
-+
-+	return true;
-+}
-+
-+
-+/*
-+ * Called by fbcon_switch() when an instance is activated or refreshed.
-+ */
-+void bootsplash_render_full(struct fb_info *info)
-+{
-+	if (!is_fb_compatible(info))
-+		return;
-+
-+	bootsplash_do_render_background(info);
-+}
-+
-+
-+/*
-+ * External status enquiry and on/off switch
-+ */
-+bool bootsplash_would_render_now(void)
-+{
-+	return !oops_in_progress
-+		&& !console_blanked
-+		&& bootsplash_is_enabled();
-+}
-+
-+bool bootsplash_is_enabled(void)
-+{
-+	bool was_enabled;
-+
-+	/* Make sure we have the newest state */
-+	smp_rmb();
-+
-+	was_enabled = test_bit(0, &splash_state.enabled);
-+
-+	return was_enabled;
-+}
-+
-+void bootsplash_disable(void)
-+{
-+	int was_enabled;
-+
-+	was_enabled = test_and_clear_bit(0, &splash_state.enabled);
-+
-+	if (was_enabled) {
-+		if (oops_in_progress) {
-+			/* Redraw screen now so we can see a panic */
-+			if (vc_cons[fg_console].d)
-+				update_screen(vc_cons[fg_console].d);
-+		} else {
-+			/* No urgency, redraw at next opportunity */
-+			schedule_work(&splash_state.work_redraw_vc);
-+		}
-+	}
-+}
-+
-+void bootsplash_enable(void)
-+{
-+	bool was_enabled;
-+
-+	if (oops_in_progress)
-+		return;
-+
-+	was_enabled = test_and_set_bit(0, &splash_state.enabled);
-+
-+	if (!was_enabled)
-+		schedule_work(&splash_state.work_redraw_vc);
-+}
-+
-+
-+/*
-+ * Userland API via platform device in sysfs
-+ */
-+static ssize_t splash_show_enabled(struct device *dev,
-+				   struct device_attribute *attr, char *buf)
-+{
-+	return sprintf(buf, "%d\n", bootsplash_is_enabled());
-+}
-+
-+static ssize_t splash_store_enabled(struct device *device,
-+				    struct device_attribute *attr,
-+				    const char *buf, size_t count)
-+{
-+	bool enable;
-+	int err;
-+
-+	if (!buf || !count)
-+		return -EFAULT;
-+
-+	err = kstrtobool(buf, &enable);
-+	if (err)
-+		return err;
-+
-+	if (enable)
-+		bootsplash_enable();
-+	else
-+		bootsplash_disable();
-+
-+	return count;
-+}
-+
-+static DEVICE_ATTR(enabled, 0644, splash_show_enabled, splash_store_enabled);
-+
-+
-+static struct attribute *splash_dev_attrs[] = {
-+	&dev_attr_enabled.attr,
-+	NULL
-+};
-+
-+ATTRIBUTE_GROUPS(splash_dev);
-+
-+
-+
-+
-+/*
-+ * Power management fixup via platform device
-+ *
-+ * When the system is woken from sleep or restored after hibernating, we
-+ * cannot expect the screen contents to still be present in video RAM.
-+ * Thus, we have to redraw the splash if we're currently active.
-+ */
-+static int splash_resume(struct device *device)
-+{
-+	if (bootsplash_would_render_now())
-+		schedule_work(&splash_state.work_redraw_vc);
-+
-+	return 0;
-+}
-+
-+static int splash_suspend(struct device *device)
-+{
-+	cancel_work_sync(&splash_state.work_redraw_vc);
-+
-+	return 0;
-+}
-+
-+
-+static const struct dev_pm_ops splash_pm_ops = {
-+	.thaw = splash_resume,
-+	.restore = splash_resume,
-+	.resume = splash_resume,
-+	.suspend = splash_suspend,
-+	.freeze = splash_suspend,
-+};
-+
-+static struct platform_driver splash_driver = {
-+	.driver = {
-+		.name = "bootsplash",
-+		.pm = &splash_pm_ops,
-+	},
-+};
-+
-+
-+/*
-+ * Main init
-+ */
-+void bootsplash_init(void)
-+{
-+	int ret;
-+
-+	/* Initialized already? */
-+	if (splash_state.splash_device)
-+		return;
-+
-+
-+	/* Register platform device to export user API */
-+	ret = platform_driver_register(&splash_driver);
-+	if (ret) {
-+		pr_err("platform_driver_register() failed: %d\n", ret);
-+		goto err;
-+	}
-+
-+	splash_state.splash_device
-+		= platform_device_alloc("bootsplash", 0);
-+
-+	if (!splash_state.splash_device)
-+		goto err_driver;
-+
-+	splash_state.splash_device->dev.groups = splash_dev_groups;
-+
-+	ret = platform_device_add(splash_state.splash_device);
-+	if (ret) {
-+		pr_err("platform_device_add() failed: %d\n", ret);
-+		goto err_device;
-+	}
-+
-+
-+	INIT_WORK(&splash_state.work_redraw_vc, splash_callback_redraw_vc);
-+
-+	return;
-+
-+err_device:
-+	platform_device_put(splash_state.splash_device);
-+	splash_state.splash_device = NULL;
-+err_driver:
-+	platform_driver_unregister(&splash_driver);
-+err:
-+	pr_err("Failed to initialize.\n");
-+}
-diff --git a/drivers/video/fbdev/core/bootsplash_internal.h b/drivers/video/fbdev/core/bootsplash_internal.h
-new file mode 100644
-index 000000000000..b11da5cb90bf
---- /dev/null
-+++ b/drivers/video/fbdev/core/bootsplash_internal.h
-@@ -0,0 +1,55 @@
-+/*
-+ * Kernel based bootsplash.
-+ *
-+ * (Internal data structures used at runtime)
-+ *
-+ * Authors:
-+ * Max Staudt <mstaudt@suse.de>
-+ *
-+ * SPDX-License-Identifier: GPL-2.0
-+ */
-+
-+#ifndef __BOOTSPLASH_INTERNAL_H
-+#define __BOOTSPLASH_INTERNAL_H
-+
-+
-+#include <linux/types.h>
-+#include <linux/fb.h>
-+#include <linux/kernel.h>
-+#include <linux/mutex.h>
-+#include <linux/spinlock.h>
-+
-+
-+/*
-+ * Runtime types
-+ */
-+struct splash_priv {
-+	/*
-+	 * Enabled/disabled state, to be used with atomic bit operations.
-+	 *   Bit 0: 0 = Splash hidden
-+	 *          1 = Splash shown
-+	 *
-+	 * Note: fbcon.c uses this twice, by calling
-+	 *       bootsplash_would_render_now() in set_blitting_type() and
-+	 *       in fbcon_switch().
-+	 *       This is racy, but eventually consistent: Turning the
-+	 *       splash on/off will cause a redraw, which calls
-+	 *       fbcon_switch(), which calls set_blitting_type().
-+	 *       So the last on/off toggle will make things consistent.
-+	 */
-+	unsigned long enabled;
-+
-+	/* Our gateway to userland via sysfs */
-+	struct platform_device *splash_device;
-+
-+	struct work_struct work_redraw_vc;
-+};
-+
-+
-+
-+/*
-+ * Rendering functions
-+ */
-+void bootsplash_do_render_background(struct fb_info *info);
-+
-+#endif
-diff --git a/drivers/video/fbdev/core/bootsplash_render.c b/drivers/video/fbdev/core/bootsplash_render.c
-new file mode 100644
-index 000000000000..4d7e0117f653
---- /dev/null
-+++ b/drivers/video/fbdev/core/bootsplash_render.c
-@@ -0,0 +1,93 @@
-+/*
-+ * Kernel based bootsplash.
-+ *
-+ * (Rendering functions)
-+ *
-+ * Authors:
-+ * Max Staudt <mstaudt@suse.de>
-+ *
-+ * SPDX-License-Identifier: GPL-2.0
-+ */
-+
-+#define pr_fmt(fmt) "bootsplash: " fmt
-+
-+
-+#include <linux/bootsplash.h>
-+#include <linux/fb.h>
-+#include <linux/kernel.h>
-+#include <linux/printk.h>
-+#include <linux/types.h>
-+
-+#include "bootsplash_internal.h"
-+
-+
-+
-+
-+/*
-+ * Rendering: Internal drawing routines
-+ */
-+
-+
-+/*
-+ * Pack pixel into target format and do Big/Little Endian handling.
-+ * This would be a good place to handle endianness conversion if necessary.
-+ */
-+static inline u32 pack_pixel(const struct fb_var_screeninfo *dst_var,
-+			     u8 red, u8 green, u8 blue)
-+{
-+	u32 dstpix;
-+
-+	/* Quantize pixel */
-+	red = red >> (8 - dst_var->red.length);
-+	green = green >> (8 - dst_var->green.length);
-+	blue = blue >> (8 - dst_var->blue.length);
-+
-+	/* Pack pixel */
-+	dstpix = red << (dst_var->red.offset)
-+		| green << (dst_var->green.offset)
-+		| blue << (dst_var->blue.offset);
-+
-+	/*
-+	 * Move packed pixel to the beginning of the memory cell,
-+	 * so we can memcpy() it out easily
-+	 */
-+#ifdef __BIG_ENDIAN
-+	switch (dst_var->bits_per_pixel) {
-+	case 16:
-+		dstpix <<= 16;
-+		break;
-+	case 24:
-+		dstpix <<= 8;
-+		break;
-+	case 32:
-+		break;
-+	}
-+#else
-+	/* This is intrinsically unnecessary on Little Endian */
-+#endif
-+
-+	return dstpix;
-+}
-+
-+
-+void bootsplash_do_render_background(struct fb_info *info)
-+{
-+	unsigned int x, y;
-+	u32 dstpix;
-+	u32 dst_octpp = info->var.bits_per_pixel / 8;
-+
-+	dstpix = pack_pixel(&info->var,
-+			    0,
-+			    0,
-+			    0);
-+
-+	for (y = 0; y < info->var.yres_virtual; y++) {
-+		u8 *dstline = info->screen_buffer + (y * info->fix.line_length);
-+
-+		for (x = 0; x < info->var.xres_virtual; x++) {
-+			memcpy(dstline, &dstpix, dst_octpp);
-+
-+			dstline += dst_octpp;
-+		}
-+	}
-+}
-diff --git a/drivers/video/fbdev/core/dummyblit.c b/drivers/video/fbdev/core/dummyblit.c
-new file mode 100644
-index 000000000000..8c22ff92ce24
---- /dev/null
-+++ b/drivers/video/fbdev/core/dummyblit.c
-@@ -0,0 +1,89 @@
-+/*
-+ *  linux/drivers/video/fbdev/core/dummyblit.c -- Dummy Blitting Operation
-+ *
-+ *  Authors:
-+ *  Max Staudt <mstaudt@suse.de>
-+ *
-+ *  These functions are used in place of blitblit/tileblit to suppress
-+ *  fbcon's text output while a splash is shown.
-+ *
-+ *  Only suppressing actual rendering keeps the text buffer in the VC layer
-+ *  intact and makes it easy to switch back from the bootsplash to a full
-+ *  text console with a simple redraw (with the original functions in place).
-+ *
-+ *  Based on linux/drivers/video/fbdev/core/bitblit.c
-+ *       and linux/drivers/video/fbdev/core/tileblit.c
-+ *
-+ * SPDX-License-Identifier: GPL-2.0
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/fb.h>
-+#include <linux/vt_kern.h>
-+#include <linux/console.h>
-+#include <asm/types.h>
-+#include "fbcon.h"
-+
-+static void dummy_bmove(struct vc_data *vc, struct fb_info *info, int sy,
-+			int sx, int dy, int dx, int height, int width)
-+{
-+	;
-+}
-+
-+static void dummy_clear(struct vc_data *vc, struct fb_info *info, int sy,
-+			int sx, int height, int width)
-+{
-+	;
-+}
-+
-+static void dummy_putcs(struct vc_data *vc, struct fb_info *info,
-+			const unsigned short *s, int count, int yy, int xx,
-+			int fg, int bg)
-+{
-+	;
-+}
-+
-+static void dummy_clear_margins(struct vc_data *vc, struct fb_info *info,
-+				int color, int bottom_only)
-+{
-+	;
-+}
-+
-+static void dummy_cursor(struct vc_data *vc, struct fb_info *info, int mode,
-+			int softback_lines, int fg, int bg)
-+{
-+	;
-+}
-+
-+static int dummy_update_start(struct fb_info *info)
-+{
-+	/*
-+	 * Copied from bitblit.c and tileblit.c
-+	 *
-+	 * As of Linux 4.12, nobody seems to care about our return value.
-+	 */
-+	struct fbcon_ops *ops = info->fbcon_par;
-+	int err;
-+
-+	err = fb_pan_display(info, &ops->var);
-+	ops->var.xoffset = info->var.xoffset;
-+	ops->var.yoffset = info->var.yoffset;
-+	ops->var.vmode = info->var.vmode;
-+	return err;
-+}
-+
-+void fbcon_set_dummyops(struct fbcon_ops *ops)
-+{
-+	ops->bmove = dummy_bmove;
-+	ops->clear = dummy_clear;
-+	ops->putcs = dummy_putcs;
-+	ops->clear_margins = dummy_clear_margins;
-+	ops->cursor = dummy_cursor;
-+	ops->update_start = dummy_update_start;
-+	ops->rotate_font = NULL;
-+}
-+EXPORT_SYMBOL_GPL(fbcon_set_dummyops);
-+
-+MODULE_AUTHOR("Max Staudt <mstaudt@suse.de>");
-+MODULE_DESCRIPTION("Dummy Blitting Operation");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
-index 04612f938bab..9a39a6fcfe98 100644
---- a/drivers/video/fbdev/core/fbcon.c
-+++ b/drivers/video/fbdev/core/fbcon.c
-@@ -80,6 +80,7 @@
- #include <asm/irq.h>
- 
- #include "fbcon.h"
-+#include <linux/bootsplash.h>
- 
- #ifdef FBCONDEBUG
- #  define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
-@@ -542,6 +543,8 @@ static int do_fbcon_takeover(int show_logo)
- 	for (i = first_fb_vc; i <= last_fb_vc; i++)
- 		con2fb_map[i] = info_idx;
- 
-+	bootsplash_init();
-+
- 	err = do_take_over_console(&fb_con, first_fb_vc, last_fb_vc,
- 				fbcon_is_default);
- 
-@@ -661,6 +664,9 @@ static void set_blitting_type(struct vc_data *vc, struct fb_info *info)
- 	else {
- 		fbcon_set_rotation(info);
- 		fbcon_set_bitops(ops);
-+
-+		if (bootsplash_would_render_now())
-+			fbcon_set_dummyops(ops);
- 	}
- }
- 
-@@ -683,6 +689,19 @@ static void set_blitting_type(struct vc_data *vc, struct fb_info *info)
- 	ops->p = &fb_display[vc->vc_num];
- 	fbcon_set_rotation(info);
- 	fbcon_set_bitops(ops);
-+
-+	/*
-+	 * Note:
-+	 * This is *eventually correct*.
-+	 * Setting the fbcon operations and drawing the splash happen at
-+	 * different points in time. If the splash is enabled/disabled
-+	 * in between, then bootsplash_{en,dis}able will schedule a
-+	 * redraw, which will again render the splash (or not) and set
-+	 * the correct fbcon ops.
-+	 * The last run will then be the right one.
-+	 */
-+	if (bootsplash_would_render_now())
-+		fbcon_set_dummyops(ops);
- }
- 
- static int fbcon_invalid_charcount(struct fb_info *info, unsigned charcount)
-@@ -2184,6 +2203,9 @@ static int fbcon_switch(struct vc_data *vc)
- 	info = fbcon_registered_fb[con2fb_map[vc->vc_num]];
- 	ops = info->fbcon_par;
- 
-+	if (bootsplash_would_render_now())
-+		bootsplash_render_full(info);
-+
- 	if (softback_top) {
- 		if (softback_lines)
- 			fbcon_set_origin(vc);
-diff --git a/drivers/video/fbdev/core/fbcon.h b/drivers/video/fbdev/core/fbcon.h
-index 18f3ac144237..45f94347fe5e 100644
---- a/drivers/video/fbdev/core/fbcon.h
-+++ b/drivers/video/fbdev/core/fbcon.h
-@@ -214,6 +214,11 @@ static inline int attr_col_ec(int shift, struct vc_data *vc,
- #define SCROLL_REDRAW	   0x004
- #define SCROLL_PAN_REDRAW  0x005
- 
-+#ifdef CONFIG_BOOTSPLASH
-+extern void fbcon_set_dummyops(struct fbcon_ops *ops);
-+#else /* CONFIG_BOOTSPLASH */
-+#define fbcon_set_dummyops(x)
-+#endif /* CONFIG_BOOTSPLASH */
- #ifdef CONFIG_FB_TILEBLITTING
- extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info);
- #endif
-diff --git a/include/linux/bootsplash.h b/include/linux/bootsplash.h
-new file mode 100644
-index 000000000000..c6dd0b43180d
---- /dev/null
-+++ b/include/linux/bootsplash.h
-@@ -0,0 +1,43 @@
-+/*
-+ * Kernel based bootsplash.
-+ *
-+ * Authors:
-+ * Max Staudt <mstaudt@suse.de>
-+ *
-+ * SPDX-License-Identifier: GPL-2.0
-+ */
-+
-+#ifndef __LINUX_BOOTSPLASH_H
-+#define __LINUX_BOOTSPLASH_H
-+
-+#include <linux/fb.h>
-+
-+
-+#ifdef CONFIG_BOOTSPLASH
-+
-+extern void bootsplash_render_full(struct fb_info *info);
-+
-+extern bool bootsplash_would_render_now(void);
-+
-+extern bool bootsplash_is_enabled(void);
-+extern void bootsplash_disable(void);
-+extern void bootsplash_enable(void);
-+
-+extern void bootsplash_init(void);
-+
-+#else /* CONFIG_BOOTSPLASH */
-+
-+#define bootsplash_render_full(x)
-+
-+#define bootsplash_would_render_now() (false)
-+
-+#define bootsplash_is_enabled() (false)
-+#define bootsplash_disable()
-+#define bootsplash_enable()
-+
-+#define bootsplash_init()
-+
-+#endif /* CONFIG_BOOTSPLASH */
-+
-+
-+#endif
diff --git a/0402-bootsplash.patch b/0402-bootsplash.patch
deleted file mode 100644
index 5f7d07de4453..000000000000
--- a/0402-bootsplash.patch
+++ /dev/null
@@ -1,669 +0,0 @@
-diff --git a/MAINTAINERS b/MAINTAINERS
-index b5633b56391e..5c237445761e 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -3622,6 +3622,7 @@
- F:     drivers/video/fbdev/core/bootsplash*.*
- F:     drivers/video/fbdev/core/dummycon.c
- F:     include/linux/bootsplash.h
-+F:     include/uapi/linux/bootsplash_file.h
- 
- BPF [GENERAL] (Safe Dynamic Programs and Tools)
- M:     Alexei Starovoitov <ast@kernel.org>
-diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile
-index 66895321928e..6a8d1bab8a01 100644
---- a/drivers/video/fbdev/core/Makefile
-+++ b/drivers/video/fbdev/core/Makefile
-@@ -31,4 +31,4 @@ obj-$(CONFIG_FB_SVGALIB)       += svgalib.o
- obj-$(CONFIG_FB_DDC)           += fb_ddc.o
- 
- obj-$(CONFIG_BOOTSPLASH)       += bootsplash.o bootsplash_render.o \
--                                  dummyblit.o
-+                                  bootsplash_load.o dummyblit.o
-diff --git a/drivers/video/fbdev/core/bootsplash.c b/drivers/video/fbdev/core/bootsplash.c
-index e449755af268..843c5400fefc 100644
---- a/drivers/video/fbdev/core/bootsplash.c
-+++ b/drivers/video/fbdev/core/bootsplash.c
-@@ -32,6 +32,7 @@
- #include <linux/workqueue.h>
- 
- #include "bootsplash_internal.h"
-+#include "uapi/linux/bootsplash_file.h"
- 
- 
- /*
-@@ -102,10 +103,17 @@ static bool is_fb_compatible(const struct fb_info *info)
-  */
- void bootsplash_render_full(struct fb_info *info)
- {
-+	mutex_lock(&splash_state.data_lock);
-+
- 	if (!is_fb_compatible(info))
--		return;
-+		goto out;
-+
-+	bootsplash_do_render_background(info, splash_state.file);
-+
-+	bootsplash_do_render_pictures(info, splash_state.file);
- 
--	bootsplash_do_render_background(info);
-+out:
-+	mutex_unlock(&splash_state.data_lock);
- }
- 
- 
-@@ -116,6 +124,7 @@ bool bootsplash_would_render_now(void)
- {
- 	return !oops_in_progress
- 		&& !console_blanked
-+		&& splash_state.file
- 		&& bootsplash_is_enabled();
- }
- 
-@@ -252,6 +261,7 @@ static struct platform_driver splash_driver = {
- void bootsplash_init(void)
- {
- 	int ret;
-+	struct splash_file_priv *fp;
- 
- 	/* Initialized already? */
- 	if (splash_state.splash_device)
-@@ -280,8 +290,26 @@ void bootsplash_init(void)
- 	}
- 
- 
-+	mutex_init(&splash_state.data_lock);
-+	set_bit(0, &splash_state.enabled);
-+
- 	INIT_WORK(&splash_state.work_redraw_vc, splash_callback_redraw_vc);
- 
-+
-+	if (!splash_state.bootfile || !strlen(splash_state.bootfile))
-+		return;
-+
-+	fp = bootsplash_load_firmware(&splash_state.splash_device->dev,
-+				      splash_state.bootfile);
-+
-+	if (!fp)
-+		goto err;
-+
-+	mutex_lock(&splash_state.data_lock);
-+	splash_state.splash_fb = NULL;
-+	splash_state.file = fp;
-+	mutex_unlock(&splash_state.data_lock);
-+
- 	return;
- 
- err_device:
-@@ -292,3 +320,7 @@ void bootsplash_init(void)
- err:
- 	pr_err("Failed to initialize.\n");
- }
-+
-+
-+module_param_named(bootfile, splash_state.bootfile, charp, 0444);
-+MODULE_PARM_DESC(bootfile, "Bootsplash file to load on boot");
-diff --git a/drivers/video/fbdev/core/bootsplash_internal.h b/drivers/video/fbdev/core/bootsplash_internal.h
-index b11da5cb90bf..71e2a27ac0b8 100644
---- a/drivers/video/fbdev/core/bootsplash_internal.h
-+++ b/drivers/video/fbdev/core/bootsplash_internal.h
-@@ -15,15 +15,43 @@
- 
- #include <linux/types.h>
- #include <linux/fb.h>
-+#include <linux/firmware.h>
- #include <linux/kernel.h>
- #include <linux/mutex.h>
- #include <linux/spinlock.h>
- 
-+#include "uapi/linux/bootsplash_file.h"
-+
- 
- /*
-  * Runtime types
-  */
-+struct splash_blob_priv {
-+	struct splash_blob_header *blob_header;
-+	const void *data;
-+};
-+
-+
-+struct splash_pic_priv {
-+	const struct splash_pic_header *pic_header;
-+
-+	struct splash_blob_priv *blobs;
-+	u16 blobs_loaded;
-+};
-+
-+
-+struct splash_file_priv {
-+	const struct firmware *fw;
-+	const struct splash_file_header *header;
-+
-+	struct splash_pic_priv *pics;
-+};
-+
-+
- struct splash_priv {
-+	/* Bootup and runtime state */
-+	char *bootfile;
-+
- 	/*
- 	 * Enabled/disabled state, to be used with atomic bit operations.
- 	 *   Bit 0: 0 = Splash hidden
-@@ -43,6 +71,13 @@ struct splash_priv {
- 	struct platform_device *splash_device;
- 
- 	struct work_struct work_redraw_vc;
-+
-+	/* Splash data structures including lock for everything below */
-+	struct mutex data_lock;
-+
-+	struct fb_info *splash_fb;
-+
-+	struct splash_file_priv *file;
- };
- 
- 
-@@ -50,6 +85,14 @@ struct splash_priv {
- /*
-  * Rendering functions
-  */
--void bootsplash_do_render_background(struct fb_info *info);
-+void bootsplash_do_render_background(struct fb_info *info,
-+				     const struct splash_file_priv *fp);
-+void bootsplash_do_render_pictures(struct fb_info *info,
-+				   const struct splash_file_priv *fp);
-+
-+
-+void bootsplash_free_file(struct splash_file_priv *fp);
-+struct splash_file_priv *bootsplash_load_firmware(struct device *device,
-+						  const char *path);
- 
- #endif
-diff --git a/drivers/video/fbdev/core/bootsplash_load.c b/drivers/video/fbdev/core/bootsplash_load.c
-new file mode 100644
-index 000000000000..fd807571ab7d
---- /dev/null
-+++ b/drivers/video/fbdev/core/bootsplash_load.c
-@@ -0,0 +1,225 @@
-+/*
-+ * Kernel based bootsplash.
-+ *
-+ * (Loading and freeing functions)
-+ *
-+ * Authors:
-+ * Max Staudt <mstaudt@suse.de>
-+ *
-+ * SPDX-License-Identifier: GPL-2.0
-+ */
-+
-+#define pr_fmt(fmt) "bootsplash: " fmt
-+
-+
-+#include <linux/bootsplash.h>
-+#include <linux/fb.h>
-+#include <linux/firmware.h>
-+#include <linux/kernel.h>
-+#include <linux/mutex.h>
-+#include <linux/printk.h>
-+#include <linux/types.h>
-+#include <linux/vmalloc.h>
-+
-+#include "bootsplash_internal.h"
-+#include "uapi/linux/bootsplash_file.h"
-+
-+
-+
-+
-+/*
-+ * Free all vmalloc()'d resources describing a splash file.
-+ */
-+void bootsplash_free_file(struct splash_file_priv *fp)
-+{
-+	if (!fp)
-+		return;
-+
-+	if (fp->pics) {
-+		unsigned int i;
-+
-+		for (i = 0; i < fp->header->num_pics; i++) {
-+			struct splash_pic_priv *pp = &fp->pics[i];
-+
-+			if (pp->blobs)
-+				vfree(pp->blobs);
-+		}
-+
-+		vfree(fp->pics);
-+	}
-+
-+	release_firmware(fp->fw);
-+	vfree(fp);
-+}
-+
-+
-+
-+
-+/*
-+ * Load a splash screen from a "firmware" file.
-+ *
-+ * Parsing, and sanity checks.
-+ */
-+#ifdef __BIG_ENDIAN
-+	#define BOOTSPLASH_MAGIC BOOTSPLASH_MAGIC_BE
-+#else
-+	#define BOOTSPLASH_MAGIC BOOTSPLASH_MAGIC_LE
-+#endif
-+
-+struct splash_file_priv *bootsplash_load_firmware(struct device *device,
-+						  const char *path)
-+{
-+	const struct firmware *fw;
-+	struct splash_file_priv *fp;
-+	unsigned int i;
-+	const u8 *walker;
-+
-+	if (request_firmware(&fw, path, device))
-+		return NULL;
-+
-+	if (fw->size < sizeof(struct splash_file_header)
-+	    || memcmp(fw->data, BOOTSPLASH_MAGIC, sizeof(fp->header->id))) {
-+		pr_err("Not a bootsplash file.\n");
-+
-+		release_firmware(fw);
-+		return NULL;
-+	}
-+
-+	fp = vzalloc(sizeof(struct splash_file_priv));
-+	if (!fp) {
-+		release_firmware(fw);
-+		return NULL;
-+	}
-+
-+	pr_info("Loading splash file (%li bytes)\n", fw->size);
-+
-+	fp->fw = fw;
-+	fp->header = (struct splash_file_header *)fw->data;
-+
-+	/* Sanity checks */
-+	if (fp->header->version != BOOTSPLASH_VERSION) {
-+		pr_err("Loaded v%d file, but we only support version %d\n",
-+			fp->header->version,
-+			BOOTSPLASH_VERSION);
-+
-+		goto err;
-+	}
-+
-+	if (fw->size < sizeof(struct splash_file_header)
-+		+ fp->header->num_pics
-+			* sizeof(struct splash_pic_header)
-+		+ fp->header->num_blobs
-+			* sizeof(struct splash_blob_header)) {
-+		pr_err("File incomplete.\n");
-+
-+		goto err;
-+	}
-+
-+	/* Read picture headers */
-+	if (fp->header->num_pics) {
-+		fp->pics = vzalloc(fp->header->num_pics
-+				   * sizeof(struct splash_pic_priv));
-+		if (!fp->pics)
-+			goto err;
-+	}
-+
-+	walker = fw->data + sizeof(struct splash_file_header);
-+	for (i = 0; i < fp->header->num_pics; i++) {
-+		struct splash_pic_priv *pp = &fp->pics[i];
-+		struct splash_pic_header *ph = (void *)walker;
-+
-+		pr_debug("Picture %u: Size %ux%u\n", i, ph->width, ph->height);
-+
-+		if (ph->num_blobs < 1) {
-+			pr_err("Picture %u: Zero blobs? Aborting load.\n", i);
-+			goto err;
-+		}
-+
-+		pp->pic_header = ph;
-+		pp->blobs = vzalloc(ph->num_blobs
-+					* sizeof(struct splash_blob_priv));
-+		if (!pp->blobs)
-+			goto err;
-+
-+		walker += sizeof(struct splash_pic_header);
-+	}
-+
-+	/* Read blob headers */
-+	for (i = 0; i < fp->header->num_blobs; i++) {
-+		struct splash_blob_header *bh = (void *)walker;
-+		struct splash_pic_priv *pp;
-+
-+		if (walker + sizeof(struct splash_blob_header)
-+		    > fw->data + fw->size)
-+			goto err;
-+
-+		walker += sizeof(struct splash_blob_header);
-+
-+		if (walker + bh->length > fw->data + fw->size)
-+			goto err;
-+
-+		if (bh->picture_id >= fp->header->num_pics)
-+			goto nextblob;
-+
-+		pp = &fp->pics[bh->picture_id];
-+
-+		pr_debug("Blob %u, pic %u, blobs_loaded %u, num_blobs %u.\n",
-+			 i, bh->picture_id,
-+			 pp->blobs_loaded, pp->pic_header->num_blobs);
-+
-+		if (pp->blobs_loaded >= pp->pic_header->num_blobs)
-+			goto nextblob;
-+
-+		switch (bh->type) {
-+		case 0:
-+			/* Raw 24-bit packed pixels */
-+			if (bh->length != pp->pic_header->width
-+					* pp->pic_header->height * 3) {
-+				pr_err("Blob %u, type 1: Length doesn't match picture.\n",
-+				       i);
-+
-+				goto err;
-+			}
-+			break;
-+		default:
-+			pr_warn("Blob %u, unknown type %u.\n", i, bh->type);
-+			goto nextblob;
-+		}
-+
-+		pp->blobs[pp->blobs_loaded].blob_header = bh;
-+		pp->blobs[pp->blobs_loaded].data = walker;
-+		pp->blobs_loaded++;
-+
-+nextblob:
-+		walker += bh->length;
-+		if (bh->length % 16)
-+			walker += 16 - (bh->length % 16);
-+	}
-+
-+	if (walker != fw->data + fw->size)
-+		pr_warn("Trailing data in splash file.\n");
-+
-+	/* Walk over pictures and ensure all blob slots are filled */
-+	for (i = 0; i < fp->header->num_pics; i++) {
-+		struct splash_pic_priv *pp = &fp->pics[i];
-+
-+		if (pp->blobs_loaded != pp->pic_header->num_blobs) {
-+			pr_err("Picture %u doesn't have all blob slots filled.\n",
-+			       i);
-+
-+			goto err;
-+		}
-+	}
-+
-+	pr_info("Loaded (%ld bytes, %u pics, %u blobs).\n",
-+		fw->size,
-+		fp->header->num_pics,
-+		fp->header->num_blobs);
-+
-+	return fp;
-+
-+
-+err:
-+	bootsplash_free_file(fp);
-+	return NULL;
-+}
-diff --git a/drivers/video/fbdev/core/bootsplash_render.c b/drivers/video/fbdev/core/bootsplash_render.c
-index 4d7e0117f653..2ae36949d0e3 100644
---- a/drivers/video/fbdev/core/bootsplash_render.c
-+++ b/drivers/video/fbdev/core/bootsplash_render.c
-@@ -19,6 +19,7 @@
- #include <linux/types.h>
- 
- #include "bootsplash_internal.h"
-+#include "uapi/linux/bootsplash_file.h"
- 
- 
- 
-@@ -70,16 +71,69 @@ static inline u32 pack_pixel(const struct fb_var_screeninfo *dst_var,
- }
- 
- 
--void bootsplash_do_render_background(struct fb_info *info)
-+/*
-+ * Copy from source and blend into the destination picture.
-+ * Currently assumes that the source picture is 24bpp.
-+ * Currently assumes that the destination is <= 32bpp.
-+ */
-+static int splash_convert_to_fb(u8 *dst,
-+				const struct fb_var_screeninfo *dst_var,
-+				unsigned int dst_stride,
-+				unsigned int dst_xoff,
-+				unsigned int dst_yoff,
-+				const u8 *src,
-+				unsigned int src_width,
-+				unsigned int src_height)
-+{
-+	unsigned int x, y;
-+	unsigned int src_stride = 3 * src_width; /* Assume 24bpp packed */
-+	u32 dst_octpp = dst_var->bits_per_pixel / 8;
-+
-+	dst_xoff += dst_var->xoffset;
-+	dst_yoff += dst_var->yoffset;
-+
-+	/* Copy with stride and pixel size adjustment */
-+	for (y = 0;
-+	     y < src_height && y + dst_yoff < dst_var->yres_virtual;
-+	     y++) {
-+		const u8 *srcline = src + (y * src_stride);
-+		u8 *dstline = dst + ((y + dst_yoff) * dst_stride)
-+				  + (dst_xoff * dst_octpp);
-+
-+		for (x = 0;
-+		     x < src_width && x + dst_xoff < dst_var->xres_virtual;
-+		     x++) {
-+			u8 red, green, blue;
-+			u32 dstpix;
-+
-+			/* Read pixel */
-+			red = *srcline++;
-+			green = *srcline++;
-+			blue = *srcline++;
-+
-+			/* Write pixel */
-+			dstpix = pack_pixel(dst_var, red, green, blue);
-+			memcpy(dstline, &dstpix, dst_octpp);
-+
-+			dstline += dst_octpp;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+
-+void bootsplash_do_render_background(struct fb_info *info,
-+				     const struct splash_file_priv *fp)
- {
- 	unsigned int x, y;
- 	u32 dstpix;
- 	u32 dst_octpp = info->var.bits_per_pixel / 8;
- 
- 	dstpix = pack_pixel(&info->var,
--			    0,
--			    0,
--			    0);
-+			    fp->header->bg_red,
-+			    fp->header->bg_green,
-+			    fp->header->bg_blue);
- 
- 	for (y = 0; y < info->var.yres_virtual; y++) {
- 		u8 *dstline = info->screen_buffer + (y * info->fix.line_length);
-@@ -91,3 +145,44 @@ void bootsplash_do_render_background(struct fb_info *info)
- 		}
- 	}
- }
-+
-+
-+void bootsplash_do_render_pictures(struct fb_info *info,
-+				   const struct splash_file_priv *fp)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < fp->header->num_pics; i++) {
-+		struct splash_blob_priv *bp;
-+		struct splash_pic_priv *pp = &fp->pics[i];
-+		long dst_xoff, dst_yoff;
-+
-+		if (pp->blobs_loaded < 1)
-+			continue;
-+
-+		bp = &pp->blobs[0];
-+
-+		if (!bp || bp->blob_header->type != 0)
-+			continue;
-+
-+		dst_xoff = (info->var.xres - pp->pic_header->width) / 2;
-+		dst_yoff = (info->var.yres - pp->pic_header->height) / 2;
-+
-+		if (dst_xoff < 0
-+		    || dst_yoff < 0
-+		    || dst_xoff + pp->pic_header->width > info->var.xres
-+		    || dst_yoff + pp->pic_header->height > info->var.yres) {
-+			pr_info_once("Picture %u is out of bounds at current resolution: %dx%d\n"
-+				     "(this will only be printed once every reboot)\n",
-+				     i, info->var.xres, info->var.yres);
-+
-+			continue;
-+		}
-+
-+		/* Draw next splash frame */
-+		splash_convert_to_fb(info->screen_buffer, &info->var,
-+				info->fix.line_length, dst_xoff, dst_yoff,
-+				bp->data,
-+				pp->pic_header->width, pp->pic_header->height);
-+	}
-+}
-diff --git a/include/uapi/linux/bootsplash_file.h b/include/uapi/linux/bootsplash_file.h
-new file mode 100644
-index 000000000000..89dc9cca8f0c
---- /dev/null
-+++ b/include/uapi/linux/bootsplash_file.h
-@@ -0,0 +1,118 @@
-+/*
-+ * Kernel based bootsplash.
-+ *
-+ * (File format)
-+ *
-+ * Authors:
-+ * Max Staudt <mstaudt@suse.de>
-+ *
-+ * SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
-+ */
-+
-+#ifndef __BOOTSPLASH_FILE_H
-+#define __BOOTSPLASH_FILE_H
-+
-+
-+#define BOOTSPLASH_VERSION 55561
-+
-+
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+
-+
-+/*
-+ * On-disk types
-+ *
-+ * A splash file consists of:
-+ *  - One single 'struct splash_file_header'
-+ *  - An array of 'struct splash_pic_header'
-+ *  - An array of raw data blocks, each padded to 16 bytes and
-+ *    preceded by a 'struct splash_blob_header'
-+ *
-+ * A single-frame splash may look like this:
-+ *
-+ * +--------------------+
-+ * |                    |
-+ * | splash_file_header |
-+ * |  -> num_blobs = 1  |
-+ * |  -> num_pics = 1   |
-+ * |                    |
-+ * +--------------------+
-+ * |                    |
-+ * | splash_pic_header  |
-+ * |                    |
-+ * +--------------------+
-+ * |                    |
-+ * | splash_blob_header |
-+ * |  -> type = 0       |
-+ * |  -> picture_id = 0 |
-+ * |                    |
-+ * | (raw RGB data)     |
-+ * | (pad to 16 bytes)  |
-+ * |                    |
-+ * +--------------------+
-+ *
-+ * All multi-byte values are stored on disk in the native format
-+ * expected by the system the file will be used on.
-+ */
-+#define BOOTSPLASH_MAGIC_BE "Linux bootsplash"
-+#define BOOTSPLASH_MAGIC_LE "hsalpstoob xuniL"
-+
-+struct splash_file_header {
-+	uint8_t  id[16]; /* "Linux bootsplash" (no trailing NUL) */
-+
-+	/* Splash file format version to avoid clashes */
-+	uint16_t version;
-+
-+	/* The background color */
-+	uint8_t bg_red;
-+	uint8_t bg_green;
-+	uint8_t bg_blue;
-+	uint8_t bg_reserved;
-+
-+	/*
-+	 * Number of pic/blobs so we can allocate memory for internal
-+	 * structures ahead of time when reading the file
-+	 */
-+	uint16_t num_blobs;
-+	uint8_t num_pics;
-+
-+	uint8_t padding[103];
-+} __attribute__((__packed__));
-+
-+
-+struct splash_pic_header {
-+	uint16_t width;
-+	uint16_t height;
-+
-+	/*
-+	 * Number of data packages associated with this picture.
-+	 * Currently, the only use for more than 1 is for animations.
-+	 */
-+	uint8_t num_blobs;
-+
-+	uint8_t padding[27];
-+} __attribute__((__packed__));
-+
-+
-+struct splash_blob_header {
-+	/* Length of the data block in bytes. */
-+	uint32_t length;
-+
-+	/*
-+	 * Type of the contents.
-+	 *  0 - Raw RGB data.
-+	 */
-+	uint16_t type;
-+
-+	/*
-+	 * Picture this blob is associated with.
-+	 * Blobs will be added to a picture in the order they are
-+	 * found in the file.
-+	 */
-+	uint8_t picture_id;
-+
-+	uint8_t padding[9];
-+} __attribute__((__packed__));
-+
-+#endif
diff --git a/0403-bootsplash.patch b/0403-bootsplash.patch
deleted file mode 100644
index 216953762e2e..000000000000
--- a/0403-bootsplash.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/drivers/video/fbdev/core/bootsplash.c b/drivers/video/fbdev/core/bootsplash.c
-index 843c5400fefc..815b007f81ca 100644
---- a/drivers/video/fbdev/core/bootsplash.c
-+++ b/drivers/video/fbdev/core/bootsplash.c
-@@ -112,6 +112,8 @@ void bootsplash_render_full(struct fb_info *info)
- 
- 	bootsplash_do_render_pictures(info, splash_state.file);
- 
-+	bootsplash_do_render_flush(info);
-+
- out:
- 	mutex_unlock(&splash_state.data_lock);
- }
-diff --git a/drivers/video/fbdev/core/bootsplash_internal.h b/drivers/video/fbdev/core/bootsplash_internal.h
-index 71e2a27ac0b8..0acb383aa4e3 100644
---- a/drivers/video/fbdev/core/bootsplash_internal.h
-+++ b/drivers/video/fbdev/core/bootsplash_internal.h
-@@ -89,6 +89,7 @@ void bootsplash_do_render_background(struct fb_info *info,
- 				     const struct splash_file_priv *fp);
- void bootsplash_do_render_pictures(struct fb_info *info,
- 				   const struct splash_file_priv *fp);
-+void bootsplash_do_render_flush(struct fb_info *info);
- 
- 
- void bootsplash_free_file(struct splash_file_priv *fp);
-diff --git a/drivers/video/fbdev/core/bootsplash_render.c b/drivers/video/fbdev/core/bootsplash_render.c
-index 2ae36949d0e3..8c09c306ff67 100644
---- a/drivers/video/fbdev/core/bootsplash_render.c
-+++ b/drivers/video/fbdev/core/bootsplash_render.c
-@@ -186,3 +186,36 @@ void bootsplash_do_render_pictures(struct fb_info *info,
- 				pp->pic_header->width, pp->pic_header->height);
- 	}
- }
-+
-+
-+void bootsplash_do_render_flush(struct fb_info *info)
-+{
-+	/*
-+	 * FB drivers using deferred_io (such as Xen) need to sync the
-+	 * screen after modifying its contents. When the FB is mmap()ed
-+	 * from userspace, this happens via a dirty pages callback, but
-+	 * when modifying the FB from the kernel, there is no such thing.
-+	 *
-+	 * So let's issue a fake fb_copyarea (copying the FB onto itself)
-+	 * to trick the FB driver into syncing the screen.
-+	 *
-+	 * A few DRM drivers' FB implementations are broken by not using
-+	 * deferred_io when they really should - we match on the known
-+	 * bad ones manually for now.
-+	 */
-+	if (info->fbdefio
-+	    || !strcmp(info->fix.id, "astdrmfb")
-+	    || !strcmp(info->fix.id, "cirrusdrmfb")
-+	    || !strcmp(info->fix.id, "mgadrmfb")) {
-+		struct fb_copyarea area;
-+
-+		area.dx = 0;
-+		area.dy = 0;
-+		area.width = info->var.xres;
-+		area.height = info->var.yres;
-+		area.sx = 0;
-+		area.sy = 0;
-+
-+		info->fbops->fb_copyarea(info, &area);
-+	}
-+}
diff --git a/0404-bootsplash.patch b/0404-bootsplash.patch
deleted file mode 100644
index 7eb54aff7e00..000000000000
--- a/0404-bootsplash.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-diff --git a/drivers/video/fbdev/core/bootsplash_render.c b/drivers/video/fbdev/core/bootsplash_render.c
-index 8c09c306ff67..07e3a4eab811 100644
---- a/drivers/video/fbdev/core/bootsplash_render.c
-+++ b/drivers/video/fbdev/core/bootsplash_render.c
-@@ -155,6 +155,7 @@ void bootsplash_do_render_pictures(struct fb_info *info,
- 	for (i = 0; i < fp->header->num_pics; i++) {
- 		struct splash_blob_priv *bp;
- 		struct splash_pic_priv *pp = &fp->pics[i];
-+		const struct splash_pic_header *ph = pp->pic_header;
- 		long dst_xoff, dst_yoff;
- 
- 		if (pp->blobs_loaded < 1)
-@@ -165,8 +166,139 @@ void bootsplash_do_render_pictures(struct fb_info *info,
- 		if (!bp || bp->blob_header->type != 0)
- 			continue;
- 
--		dst_xoff = (info->var.xres - pp->pic_header->width) / 2;
--		dst_yoff = (info->var.yres - pp->pic_header->height) / 2;
-+		switch (ph->position) {
-+		case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_TOP_LEFT:
-+			dst_xoff = 0;
-+			dst_yoff = 0;
-+
-+			dst_xoff += ph->position_offset;
-+			dst_yoff += ph->position_offset;
-+			break;
-+		case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_TOP:
-+			dst_xoff = info->var.xres - pp->pic_header->width;
-+			dst_xoff /= 2;
-+			dst_yoff = 0;
-+
-+			dst_yoff += ph->position_offset;
-+			break;
-+		case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_TOP_RIGHT:
-+			dst_xoff = info->var.xres - pp->pic_header->width;
-+			dst_yoff = 0;
-+
-+			dst_xoff -= ph->position_offset;
-+			dst_yoff += ph->position_offset;
-+			break;
-+		case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_RIGHT:
-+			dst_xoff = info->var.xres - pp->pic_header->width;
-+			dst_yoff = info->var.yres - pp->pic_header->height;
-+			dst_yoff /= 2;
-+
-+			dst_xoff -= ph->position_offset;
-+			break;
-+		case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_BOTTOM_RIGHT:
-+			dst_xoff = info->var.xres - pp->pic_header->width;
-+			dst_yoff = info->var.yres - pp->pic_header->height;
-+
-+			dst_xoff -= ph->position_offset;
-+			dst_yoff -= ph->position_offset;
-+			break;
-+		case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_BOTTOM:
-+			dst_xoff = info->var.xres - pp->pic_header->width;
-+			dst_xoff /= 2;
-+			dst_yoff = info->var.yres - pp->pic_header->height;
-+
-+			dst_yoff -= ph->position_offset;
-+			break;
-+		case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_BOTTOM_LEFT:
-+			dst_xoff = 0 + ph->position_offset;
-+			dst_yoff = info->var.yres - pp->pic_header->height
-+						  - ph->position_offset;
-+			break;
-+		case SPLASH_POS_FLAG_CORNER | SPLASH_CORNER_LEFT:
-+			dst_xoff = 0;
-+			dst_yoff = info->var.yres - pp->pic_header->height;
-+			dst_yoff /= 2;
-+
-+			dst_xoff += ph->position_offset;
-+			break;
-+
-+		case SPLASH_CORNER_TOP_LEFT:
-+			dst_xoff = info->var.xres - pp->pic_header->width;
-+			dst_xoff /= 2;
-+			dst_yoff = info->var.yres - pp->pic_header->height;
-+			dst_yoff /= 2;
-+
-+			dst_xoff -= ph->position_offset;
-+			dst_yoff -= ph->position_offset;
-+			break;
-+		case SPLASH_CORNER_TOP:
-+			dst_xoff = info->var.xres - pp->pic_header->width;
-+			dst_xoff /= 2;
-+			dst_yoff = info->var.yres - pp->pic_header->height;
-+			dst_yoff /= 2;
-+
-+			dst_yoff -= ph->position_offset;
-+			break;
-+		case SPLASH_CORNER_TOP_RIGHT:
-+			dst_xoff = info->var.xres - pp->pic_header->width;
-+			dst_xoff /= 2;
-+			dst_yoff = info->var.yres - pp->pic_header->height;
-+			dst_yoff /= 2;
-+
-+			dst_xoff += ph->position_offset;
-+			dst_yoff -= ph->position_offset;
-+			break;
-+		case SPLASH_CORNER_RIGHT:
-+			dst_xoff = info->var.xres - pp->pic_header->width;
-+			dst_xoff /= 2;
-+			dst_yoff = info->var.yres - pp->pic_header->height;
-+			dst_yoff /= 2;
-+
-+			dst_xoff += ph->position_offset;
-+			break;
-+		case SPLASH_CORNER_BOTTOM_RIGHT:
-+			dst_xoff = info->var.xres - pp->pic_header->width;
-+			dst_xoff /= 2;
-+			dst_yoff = info->var.yres - pp->pic_header->height;
-+			dst_yoff /= 2;
-+
-+			dst_xoff += ph->position_offset;
-+			dst_yoff += ph->position_offset;
-+			break;
-+		case SPLASH_CORNER_BOTTOM:
-+			dst_xoff = info->var.xres - pp->pic_header->width;
-+			dst_xoff /= 2;
-+			dst_yoff = info->var.yres - pp->pic_header->height;
-+			dst_yoff /= 2;
-+
-+			dst_yoff += ph->position_offset;
-+			break;
-+		case SPLASH_CORNER_BOTTOM_LEFT:
-+			dst_xoff = info->var.xres - pp->pic_header->width;
-+			dst_xoff /= 2;
-+			dst_yoff = info->var.yres - pp->pic_header->height;
-+			dst_yoff /= 2;
-+
-+			dst_xoff -= ph->position_offset;
-+			dst_yoff += ph->position_offset;
-+			break;
-+		case SPLASH_CORNER_LEFT:
-+			dst_xoff = info->var.xres - pp->pic_header->width;
-+			dst_xoff /= 2;
-+			dst_yoff = info->var.yres - pp->pic_header->height;
-+			dst_yoff /= 2;
-+
-+			dst_xoff -= ph->position_offset;
-+			break;
-+
-+		default:
-+			/* As a fallback, center the picture. */
-+			dst_xoff = info->var.xres - pp->pic_header->width;
-+			dst_xoff /= 2;
-+			dst_yoff = info->var.yres - pp->pic_header->height;
-+			dst_yoff /= 2;
-+			break;
-+		}
- 
- 		if (dst_xoff < 0
- 		    || dst_yoff < 0
-diff --git a/include/uapi/linux/bootsplash_file.h b/include/uapi/linux/bootsplash_file.h
-index 89dc9cca8f0c..71cedcc68933 100644
---- a/include/uapi/linux/bootsplash_file.h
-+++ b/include/uapi/linux/bootsplash_file.h
-@@ -91,7 +91,32 @@ struct splash_pic_header {
- 	 */
- 	uint8_t num_blobs;
- 
--	uint8_t padding[27];
-+	/*
-+	 * Corner to move the picture to / from.
-+	 *  0x00 - Top left
-+	 *  0x01 - Top
-+	 *  0x02 - Top right
-+	 *  0x03 - Right
-+	 *  0x04 - Bottom right
-+	 *  0x05 - Bottom
-+	 *  0x06 - Bottom left
-+	 *  0x07 - Left
-+	 *
-+	 * Flags:
-+	 *  0x10 - Calculate offset from the corner towards the center,
-+	 *         rather than from the center towards the corner
-+	 */
-+	uint8_t position;
-+
-+	/*
-+	 * Pixel offset from the selected position.
-+	 * Example: If the picture is in the top right corner, it will
-+	 *          be placed position_offset pixels from the top and
-+	 *          position_offset pixels from the right margin.
-+	 */
-+	uint16_t position_offset;
-+
-+	uint8_t padding[24];
- } __attribute__((__packed__));
- 
- 
-@@ -115,4 +140,22 @@ struct splash_blob_header {
- 	uint8_t padding[9];
- } __attribute__((__packed__));
- 
-+
-+
-+
-+/*
-+ * Enums for on-disk types
-+ */
-+enum splash_position {
-+	SPLASH_CORNER_TOP_LEFT = 0,
-+	SPLASH_CORNER_TOP = 1,
-+	SPLASH_CORNER_TOP_RIGHT = 2,
-+	SPLASH_CORNER_RIGHT = 3,
-+	SPLASH_CORNER_BOTTOM_RIGHT = 4,
-+	SPLASH_CORNER_BOTTOM = 5,
-+	SPLASH_CORNER_BOTTOM_LEFT = 6,
-+	SPLASH_CORNER_LEFT = 7,
-+	SPLASH_POS_FLAG_CORNER = 0x10,
-+};
-+
- #endif
diff --git a/0405-bootsplash.patch b/0405-bootsplash.patch
deleted file mode 100644
index 2785c5e65277..000000000000
--- a/0405-bootsplash.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-diff --git a/drivers/video/fbdev/core/bootsplash.c b/drivers/video/fbdev/core/bootsplash.c
-index 815b007f81ca..c8642142cfea 100644
---- a/drivers/video/fbdev/core/bootsplash.c
-+++ b/drivers/video/fbdev/core/bootsplash.c
-@@ -53,6 +53,14 @@ static void splash_callback_redraw_vc(struct work_struct *ignored)
- 	console_unlock();
- }
- 
-+static void splash_callback_animation(struct work_struct *ignored)
-+{
-+	if (bootsplash_would_render_now()) {
-+		/* This will also re-schedule this delayed worker */
-+		splash_callback_redraw_vc(ignored);
-+	}
-+}
-+
- 
- static bool is_fb_compatible(const struct fb_info *info)
- {
-@@ -103,17 +111,44 @@ static bool is_fb_compatible(const struct fb_info *info)
-  */
- void bootsplash_render_full(struct fb_info *info)
- {
-+	bool is_update = false;
-+
- 	mutex_lock(&splash_state.data_lock);
- 
--	if (!is_fb_compatible(info))
--		goto out;
-+	/*
-+	 * If we've painted on this FB recently, we don't have to do
-+	 * the sanity checks and background drawing again.
-+	 */
-+	if (splash_state.splash_fb == info)
-+		is_update = true;
-+
-+
-+	if (!is_update) {
-+		/* Check whether we actually support this FB. */
-+		splash_state.splash_fb = NULL;
-+
-+		if (!is_fb_compatible(info))
-+			goto out;
-+
-+		/* Draw the background only once */
-+		bootsplash_do_render_background(info, splash_state.file);
- 
--	bootsplash_do_render_background(info, splash_state.file);
-+		/* Mark this FB as last seen */
-+		splash_state.splash_fb = info;
-+	}
- 
--	bootsplash_do_render_pictures(info, splash_state.file);
-+	bootsplash_do_render_pictures(info, splash_state.file, is_update);
- 
- 	bootsplash_do_render_flush(info);
- 
-+	bootsplash_do_step_animations(splash_state.file);
-+
-+	/* Schedule update for animated splash screens */
-+	if (splash_state.file->frame_ms > 0)
-+		schedule_delayed_work(&splash_state.dwork_animation,
-+				      msecs_to_jiffies(
-+				      splash_state.file->frame_ms));
-+
- out:
- 	mutex_unlock(&splash_state.data_lock);
- }
-@@ -169,8 +204,14 @@ void bootsplash_enable(void)
- 
- 	was_enabled = test_and_set_bit(0, &splash_state.enabled);
- 
--	if (!was_enabled)
-+	if (!was_enabled) {
-+		/* Force a full redraw when the splash is re-activated */
-+		mutex_lock(&splash_state.data_lock);
-+		splash_state.splash_fb = NULL;
-+		mutex_unlock(&splash_state.data_lock);
-+
- 		schedule_work(&splash_state.work_redraw_vc);
-+	}
- }
- 
- 
-@@ -227,6 +268,14 @@ ATTRIBUTE_GROUPS(splash_dev);
-  */
- static int splash_resume(struct device *device)
- {
-+	/*
-+	 * Force full redraw on resume since we've probably lost the
-+	 * framebuffer's contents meanwhile
-+	 */
-+	mutex_lock(&splash_state.data_lock);
-+	splash_state.splash_fb = NULL;
-+	mutex_unlock(&splash_state.data_lock);
-+
- 	if (bootsplash_would_render_now())
- 		schedule_work(&splash_state.work_redraw_vc);
- 
-@@ -235,6 +284,7 @@ static int splash_resume(struct device *device)
- 
- static int splash_suspend(struct device *device)
- {
-+	cancel_delayed_work_sync(&splash_state.dwork_animation);
- 	cancel_work_sync(&splash_state.work_redraw_vc);
- 
- 	return 0;
-@@ -296,6 +346,8 @@ void bootsplash_init(void)
- 	set_bit(0, &splash_state.enabled);
- 
- 	INIT_WORK(&splash_state.work_redraw_vc, splash_callback_redraw_vc);
-+	INIT_DELAYED_WORK(&splash_state.dwork_animation,
-+			  splash_callback_animation);
- 
- 
- 	if (!splash_state.bootfile || !strlen(splash_state.bootfile))
-diff --git a/drivers/video/fbdev/core/bootsplash_internal.h b/drivers/video/fbdev/core/bootsplash_internal.h
-index 0acb383aa4e3..b3a74835d90f 100644
---- a/drivers/video/fbdev/core/bootsplash_internal.h
-+++ b/drivers/video/fbdev/core/bootsplash_internal.h
-@@ -37,6 +37,8 @@ struct splash_pic_priv {
- 
- 	struct splash_blob_priv *blobs;
- 	u16 blobs_loaded;
-+
-+	u16 anim_nextframe;
- };
- 
- 
-@@ -45,6 +47,12 @@ struct splash_file_priv {
- 	const struct splash_file_header *header;
- 
- 	struct splash_pic_priv *pics;
-+
-+	/*
-+	 * A local copy of the frame delay in the header.
-+	 * We modify it to keep the code simple.
-+	 */
-+	u16 frame_ms;
- };
- 
- 
-@@ -71,6 +79,7 @@ struct splash_priv {
- 	struct platform_device *splash_device;
- 
- 	struct work_struct work_redraw_vc;
-+	struct delayed_work dwork_animation;
- 
- 	/* Splash data structures including lock for everything below */
- 	struct mutex data_lock;
-@@ -88,8 +97,10 @@ struct splash_priv {
- void bootsplash_do_render_background(struct fb_info *info,
- 				     const struct splash_file_priv *fp);
- void bootsplash_do_render_pictures(struct fb_info *info,
--				   const struct splash_file_priv *fp);
-+				   const struct splash_file_priv *fp,
-+				   bool is_update);
- void bootsplash_do_render_flush(struct fb_info *info);
-+void bootsplash_do_step_animations(struct splash_file_priv *fp);
- 
- 
- void bootsplash_free_file(struct splash_file_priv *fp);
-diff --git a/drivers/video/fbdev/core/bootsplash_load.c b/drivers/video/fbdev/core/bootsplash_load.c
-index fd807571ab7d..1f661b2d4cc9 100644
---- a/drivers/video/fbdev/core/bootsplash_load.c
-+++ b/drivers/video/fbdev/core/bootsplash_load.c
-@@ -71,6 +71,7 @@ struct splash_file_priv *bootsplash_load_firmware(struct device *device,
- {
- 	const struct firmware *fw;
- 	struct splash_file_priv *fp;
-+	bool have_anim = false;
- 	unsigned int i;
- 	const u8 *walker;
- 
-@@ -135,6 +136,13 @@ struct splash_file_priv *bootsplash_load_firmware(struct device *device,
- 			goto err;
- 		}
- 
-+		if (ph->anim_type > SPLASH_ANIM_LOOP_FORWARD) {
-+			pr_warn("Picture %u: Unsupported animation type %u.\n",
-+				i, ph->anim_type);
-+
-+			ph->anim_type = SPLASH_ANIM_NONE;
-+		}
-+
- 		pp->pic_header = ph;
- 		pp->blobs = vzalloc(ph->num_blobs
- 					* sizeof(struct splash_blob_priv));
-@@ -202,6 +210,7 @@ struct splash_file_priv *bootsplash_load_firmware(struct device *device,
- 	/* Walk over pictures and ensure all blob slots are filled */
- 	for (i = 0; i < fp->header->num_pics; i++) {
- 		struct splash_pic_priv *pp = &fp->pics[i];
-+		const struct splash_pic_header *ph = pp->pic_header;
- 
- 		if (pp->blobs_loaded != pp->pic_header->num_blobs) {
- 			pr_err("Picture %u doesn't have all blob slots filled.\n",
-@@ -209,8 +218,20 @@ struct splash_file_priv *bootsplash_load_firmware(struct device *device,
- 
- 			goto err;
- 		}
-+
-+		if (ph->anim_type
-+		    && ph->num_blobs > 1
-+		    && ph->anim_loop < pp->blobs_loaded)
-+			have_anim = true;
- 	}
- 
-+	if (!have_anim)
-+		/* Disable animation timer if there is nothing to animate */
-+		fp->frame_ms = 0;
-+	else
-+		/* Enforce minimum delay between frames */
-+		fp->frame_ms = max((u16)20, fp->header->frame_ms);
-+
- 	pr_info("Loaded (%ld bytes, %u pics, %u blobs).\n",
- 		fw->size,
- 		fp->header->num_pics,
-diff --git a/drivers/video/fbdev/core/bootsplash_render.c b/drivers/video/fbdev/core/bootsplash_render.c
-index 07e3a4eab811..76033606ca8a 100644
---- a/drivers/video/fbdev/core/bootsplash_render.c
-+++ b/drivers/video/fbdev/core/bootsplash_render.c
-@@ -148,7 +148,8 @@ void bootsplash_do_render_background(struct fb_info *info,
- 
- 
- void bootsplash_do_render_pictures(struct fb_info *info,
--				   const struct splash_file_priv *fp)
-+				   const struct splash_file_priv *fp,
-+				   bool is_update)
- {
- 	unsigned int i;
- 
-@@ -161,7 +162,11 @@ void bootsplash_do_render_pictures(struct fb_info *info,
- 		if (pp->blobs_loaded < 1)
- 			continue;
- 
--		bp = &pp->blobs[0];
-+		/* Skip static pictures when refreshing animations */
-+		if (ph->anim_type == SPLASH_ANIM_NONE && is_update)
-+			continue;
-+
-+		bp = &pp->blobs[pp->anim_nextframe];
- 
- 		if (!bp || bp->blob_header->type != 0)
- 			continue;
-@@ -351,3 +356,24 @@ void bootsplash_do_render_flush(struct fb_info *info)
- 		info->fbops->fb_copyarea(info, &area);
- 	}
- }
-+
-+
-+void bootsplash_do_step_animations(struct splash_file_priv *fp)
-+{
-+	unsigned int i;
-+
-+	/* Step every animation once */
-+	for (i = 0; i < fp->header->num_pics; i++) {
-+		struct splash_pic_priv *pp = &fp->pics[i];
-+
-+		if (pp->blobs_loaded < 2
-+		    || pp->pic_header->anim_loop > pp->blobs_loaded)
-+			continue;
-+
-+		if (pp->pic_header->anim_type == SPLASH_ANIM_LOOP_FORWARD) {
-+			pp->anim_nextframe++;
-+			if (pp->anim_nextframe >= pp->pic_header->num_blobs)
-+				pp->anim_nextframe = pp->pic_header->anim_loop;
-+		}
-+	}
-+}
-diff --git a/include/uapi/linux/bootsplash_file.h b/include/uapi/linux/bootsplash_file.h
-index 71cedcc68933..b3af0a3c6487 100644
---- a/include/uapi/linux/bootsplash_file.h
-+++ b/include/uapi/linux/bootsplash_file.h
-@@ -77,7 +77,17 @@ struct splash_file_header {
- 	uint16_t num_blobs;
- 	uint8_t num_pics;
- 
--	uint8_t padding[103];
-+	uint8_t unused_1;
-+
-+	/*
-+	 * Milliseconds to wait before painting the next frame in
-+	 * an animation.
-+	 * This is actually a minimum, as the system is allowed to
-+	 * stall for longer between frames.
-+	 */
-+	uint16_t frame_ms;
-+
-+	uint8_t padding[100];
- } __attribute__((__packed__));
- 
- 
-@@ -116,7 +126,23 @@ struct splash_pic_header {
- 	 */
- 	uint16_t position_offset;
- 
--	uint8_t padding[24];
-+	/*
-+	 * Animation type.
-+	 *  0 - off
-+	 *  1 - forward loop
-+	 */
-+	uint8_t anim_type;
-+
-+	/*
-+	 * Animation loop point.
-+	 * Actual meaning depends on animation type:
-+	 * Type 0 - Unused
-+	 *      1 - Frame at which to restart the forward loop
-+	 *          (allowing for "intro" frames)
-+	 */
-+	uint8_t anim_loop;
-+
-+	uint8_t padding[22];
- } __attribute__((__packed__));
- 
- 
-@@ -158,4 +184,9 @@ enum splash_position {
- 	SPLASH_POS_FLAG_CORNER = 0x10,
- };
- 
-+enum splash_anim_type {
-+	SPLASH_ANIM_NONE = 0,
-+	SPLASH_ANIM_LOOP_FORWARD = 1,
-+};
-+
- #endif
diff --git a/0406-bootsplash.patch b/0406-bootsplash.patch
deleted file mode 100644
index d6c6db659c56..000000000000
--- a/0406-bootsplash.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
-index 2ebaba16f785..416735ab6dc1 100644
---- a/drivers/tty/vt/vt.c
-+++ b/drivers/tty/vt/vt.c
-@@ -105,6 +105,7 @@
- #include <linux/ctype.h>
- #include <linux/bsearch.h>
- #include <linux/gcd.h>
-+#include <linux/bootsplash.h>
- 
- #define MAX_NR_CON_DRIVER 16
- 
-@@ -4235,6 +4236,7 @@ void do_unblank_screen(int leaving_gfx)
- 	}
- 
- 	console_blanked = 0;
-+	bootsplash_mark_dirty();
- 	if (vc->vc_sw->con_blank(vc, 0, leaving_gfx))
- 		/* Low-level driver cannot restore -> do it ourselves */
- 		update_screen(vc);
-diff --git a/drivers/video/fbdev/core/bootsplash.c b/drivers/video/fbdev/core/bootsplash.c
-index c8642142cfea..13fcaabbc2ca 100644
---- a/drivers/video/fbdev/core/bootsplash.c
-+++ b/drivers/video/fbdev/core/bootsplash.c
-@@ -165,6 +165,13 @@ bool bootsplash_would_render_now(void)
- 		&& bootsplash_is_enabled();
- }
- 
-+void bootsplash_mark_dirty(void)
-+{
-+	mutex_lock(&splash_state.data_lock);
-+	splash_state.splash_fb = NULL;
-+	mutex_unlock(&splash_state.data_lock);
-+}
-+
- bool bootsplash_is_enabled(void)
- {
- 	bool was_enabled;
-@@ -206,9 +213,7 @@ void bootsplash_enable(void)
- 
- 	if (!was_enabled) {
- 		/* Force a full redraw when the splash is re-activated */
--		mutex_lock(&splash_state.data_lock);
--		splash_state.splash_fb = NULL;
--		mutex_unlock(&splash_state.data_lock);
-+		bootsplash_mark_dirty();
- 
- 		schedule_work(&splash_state.work_redraw_vc);
- 	}
-@@ -272,9 +277,7 @@ static int splash_resume(struct device *device)
- 	 * Force full redraw on resume since we've probably lost the
- 	 * framebuffer's contents meanwhile
- 	 */
--	mutex_lock(&splash_state.data_lock);
--	splash_state.splash_fb = NULL;
--	mutex_unlock(&splash_state.data_lock);
-+	bootsplash_mark_dirty();
- 
- 	if (bootsplash_would_render_now())
- 		schedule_work(&splash_state.work_redraw_vc);
-diff --git a/include/linux/bootsplash.h b/include/linux/bootsplash.h
-index c6dd0b43180d..4075098aaadd 100644
---- a/include/linux/bootsplash.h
-+++ b/include/linux/bootsplash.h
-@@ -19,6 +19,8 @@ extern void bootsplash_render_full(struct fb_info *info);
- 
- extern bool bootsplash_would_render_now(void);
- 
-+extern void bootsplash_mark_dirty(void);
-+
- extern bool bootsplash_is_enabled(void);
- extern void bootsplash_disable(void);
- extern void bootsplash_enable(void);
-@@ -31,6 +33,8 @@ extern void bootsplash_init(void);
- 
- #define bootsplash_would_render_now() (false)
- 
-+#define bootsplash_mark_dirty()
-+
- #define bootsplash_is_enabled() (false)
- #define bootsplash_disable()
- #define bootsplash_enable()
diff --git a/0407-bootsplash.patch b/0407-bootsplash.patch
deleted file mode 100644
index 3f82eb0b9296..000000000000
--- a/0407-bootsplash.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
-index f4166263bb3a..a248429194bb 100644
---- a/drivers/tty/vt/keyboard.c
-+++ b/drivers/tty/vt/keyboard.c
-@@ -49,6 +49,8 @@
- 
- #include <asm/irq_regs.h>
- 
-+#include <linux/bootsplash.h>
-+
- /*
-  * Exported functions/variables
-  */
-@@ -1413,6 +1415,28 @@ static void kbd_keycode(unsigned int key
- 	}
- #endif
- 
-+	/* Trap keys when bootsplash is shown */
-+	if (bootsplash_would_render_now()) {
-+		/* Deactivate bootsplash on ESC or Alt+Fxx VT switch */
-+		if (keycode >= KEY_F1 && keycode <= KEY_F12) {
-+			bootsplash_disable();
-+
-+			/*
-+			 * No return here since we want to actually
-+			 * perform the VT switch.
-+			 */
-+		} else {
-+			if (keycode == KEY_ESC)
-+				bootsplash_disable();
-+
-+			/*
-+			 * Just drop any other keys.
-+			 * Their effect would be hidden by the splash.
-+			 */
-+			return;
-+		}
-+	}
-+
- 	if (kbd->kbdmode == VC_MEDIUMRAW) {
- 		/*
- 		 * This is extended medium raw mode, with keys above 127
diff --git a/0408-bootsplash.patch b/0408-bootsplash.patch
deleted file mode 100644
index 8a3b715ce46a..000000000000
--- a/0408-bootsplash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
-index 3ffc1ce29023..bc6a24c9dfa8 100644
---- a/drivers/tty/sysrq.c
-+++ b/drivers/tty/sysrq.c
-@@ -49,6 +49,7 @@
- #include <linux/syscalls.h>
- #include <linux/of.h>
- #include <linux/rcupdate.h>
-+#include <linux/bootsplash.h>
- 
- #include <asm/ptrace.h>
- #include <asm/irq_regs.h>
-@@ -104,6 +105,8 @@ static void sysrq_handle_SAK(int key)
- {
- 	struct work_struct *SAK_work = &vc_cons[fg_console].SAK_work;
- 	schedule_work(SAK_work);
-+
-+	bootsplash_disable();
- }
- static struct sysrq_key_op sysrq_SAK_op = {
- 	.handler	= sysrq_handle_SAK,
diff --git a/0409-bootsplash.patch b/0409-bootsplash.patch
deleted file mode 100644
index add68e7b275c..000000000000
--- a/0409-bootsplash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
-index 9a39a6fcfe98..8a9c67e1c5d8 100644
---- a/drivers/video/fbdev/core/fbcon.c
-+++ b/drivers/video/fbdev/core/fbcon.c
-@@ -1343,6 +1343,16 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
- 	int y;
-  	int c = scr_readw((u16 *) vc->vc_pos);
- 
-+	/*
-+	 * Disable the splash here so we don't have to hook into
-+	 * vt_console_print() in drivers/tty/vt/vt.c
-+	 *
-+	 * We'd disable the splash just before the call to
-+	 * hide_cursor() anyway, so this spot is just fine.
-+	 */
-+	if (oops_in_progress)
-+		bootsplash_disable();
-+
- 	ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
- 
- 	if (fbcon_is_inactive(vc, info) || vc->vc_deccm != 1)
diff --git a/0410-bootsplash.patch b/0410-bootsplash.patch
deleted file mode 100644
index a55d4b62bcf2..000000000000
--- a/0410-bootsplash.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-diff --git a/Documentation/ABI/testing/sysfs-platform-bootsplash b/Documentation/ABI/testing/sysfs-platform-bootsplash
-new file mode 100644
-index 000000000000..742c7b035ded
---- /dev/null
-+++ b/Documentation/ABI/testing/sysfs-platform-bootsplash
-@@ -0,0 +1,11 @@
-+What:		/sys/devices/platform/bootsplash.0/enabled
-+Date:		Oct 2017
-+KernelVersion:	4.14
-+Contact:	Max Staudt <mstaudt@suse.de>
-+Description:
-+		Can be set and read.
-+
-+		0: Splash is disabled.
-+		1: Splash is shown whenever fbcon would show a text console
-+		   (i.e. no graphical application is running), and a splash
-+		   file is loaded.
-diff --git a/Documentation/bootsplash.rst b/Documentation/bootsplash.rst
-new file mode 100644
-index 000000000000..611f0c558925
---- /dev/null
-+++ b/Documentation/bootsplash.rst
-@@ -0,0 +1,285 @@
-+====================
-+The Linux bootsplash
-+====================
-+
-+:Date: November, 2017
-+:Author: Max Staudt <mstaudt@suse.de>
-+
-+
-+The Linux bootsplash is a graphical replacement for the '``quiet``' boot
-+option, typically showing a logo and a spinner animation as the system starts.
-+
-+Currently, it is a part of the Framebuffer Console support, and can be found
-+as ``CONFIG_BOOTSPLASH`` in the kernel configuration. This means that as long
-+as it is enabled, it hijacks fbcon's output and draws a splash screen instead.
-+
-+Purely compiling in the bootsplash will not render it functional - to actually
-+render a splash, you will also need a splash theme file. See the example
-+utility and script in ``tools/bootsplash`` for a live demo.
-+
-+
-+
-+Motivation
-+==========
-+
-+- The '``quiet``' boot option only suppresses most messages during boot, but
-+  errors are still shown.
-+
-+- A user space implementation can only show a logo once user space has been
-+  initialized far enough to allow this. A kernel splash can display a splash
-+  immediately as soon as fbcon can be displayed.
-+
-+- Implementing a splash screen in user space (e.g. Plymouth) is problematic
-+  due to resource conflicts.
-+
-+  For example, if Plymouth is keeping ``/dev/fb0`` (provided via vesafb/efifb)
-+  open, then most DRM drivers can't replace it because the address space is
-+  still busy - thus leading to a VRAM reservation error.
-+
-+  See: https://bugzilla.opensuse.org/show_bug.cgi?id=980750
-+
-+
-+
-+Command line arguments
-+======================
-+
-+``bootsplash.bootfile``
-+  Which file in the initramfs to load.
-+
-+  The splash theme is loaded via request_firmware(), thus to load
-+  ``/lib/firmware/bootsplash/mytheme`` pass the command line:
-+
-+  ``bootsplash.bootfile=bootsplash/mytheme``
-+
-+  Note: The splash file *has to be* in the initramfs, as it needs to be
-+  available when the splash is initialized early on.
-+
-+  Default: none, i.e. a non-functional splash, falling back to showing text.
-+
-+
-+
-+sysfs run-time configuration
-+============================
-+
-+``/sys/devices/platform/bootsplash.0/enabled``
-+  Enable/disable the bootsplash.
-+  The system boots with this set to 1, but will not show a splash unless
-+  a splash theme file is also loaded.
-+
-+
-+
-+Kconfig
-+=======
-+
-+``BOOTSPLASH``
-+  Whether to compile in bootsplash support
-+  (depends on fbcon compiled in, i.e. ``FRAMEBUFFER_CONSOLE=y``)
-+
-+
-+
-+Bootsplash file format
-+======================
-+
-+A file specified in the kernel configuration as ``CONFIG_BOOTSPLASH_FILE``
-+or specified on the command line as ``bootsplash.bootfile`` will be loaded
-+and displayed as soon as fbcon is initialized.
-+
-+
-+Main blocks
-+-----------
-+
-+There are 3 main blocks in each file:
-+
-+  - one File header
-+  -   n Picture headers
-+  -   m (Blob header + payload) blocks
-+
-+
-+Structures
-+----------
-+
-+The on-disk structures are defined in
-+``drivers/video/fbdev/core/bootsplash_file.h`` and represent these blocks:
-+
-+  - ``struct splash_file_header``
-+
-+    Represents the file header, with splash-wide information including:
-+
-+      - The magic string "``Linux bootsplash``" on big-endian platforms
-+        (the reverse on little endian)
-+      - The file format version (for incompatible updates, hopefully never)
-+      - The background color
-+      - Number of picture and blob blocks
-+      - Animation speed (we only allow one delay for all animations)
-+
-+    The file header is followed by the first picture header.
-+
-+
-+  - ``struct splash_picture_header``
-+
-+    Represents an object (picture) drawn on screen, including its immutable
-+    properties:
-+      - Width, height
-+      - Positioning relative to screen corners or in the center
-+      - Animation, if any
-+      - Animation type
-+      - Number of blobs
-+
-+    The picture header is followed by another picture header, up until n
-+    picture headers (as defined in the file header) have been read. Then,
-+    the (blob header, payload) pairs follow.
-+
-+
-+  - ``struct splash_blob_header``
-+    (followed by payload)
-+
-+    Represents one raw data stream. So far, only picture data is defined.
-+
-+    The blob header is followed by a payload, then padding to n*16 bytes,
-+    then (if further blobs are defined in the file header) a further blob
-+    header.
-+
-+
-+Alignment
-+---------
-+
-+The bootsplash file is designed to be loaded into memory as-is.
-+
-+All structures are a multiple of 16 bytes long, all elements therein are
-+aligned to multiples of their length, and the payloads are always padded
-+up to multiples of 16 bytes. This is to allow aligned accesses in all
-+cases while still simply mapping the structures over an in-memory copy of
-+the bootsplash file.
-+
-+
-+Further information
-+-------------------
-+
-+Please see ``drivers/video/fbdev/core/bootsplash_file.h`` for further
-+details and possible values in the file.
-+
-+
-+
-+Hooks - how the bootsplash is integrated
-+========================================
-+
-+``drivers/video/fbdev/core/fbcon.c``
-+  ``fbcon_init()`` calls ``bootsplash_init()``, which loads the default
-+  bootsplash file or the one specified on the kernel command line.
-+
-+  ``fbcon_switch()`` draws the bootsplash when it's active, and is also
-+  one of the callers of ``set_blitting_type()``.
-+
-+  ``set_blitting_type()`` calls ``fbcon_set_dummyops()`` when the
-+  bootsplash is active, overriding the text rendering functions.
-+
-+  ``fbcon_cursor()`` will call ``bootsplash_disable()`` when an oops is
-+  being printed in order to make a kernel panic visible.
-+
-+``drivers/video/fbdev/core/dummyblit.c``
-+  This contains the dummy text rendering functions used to suppress text
-+  output while the bootsplash is shown.
-+
-+``drivers/tty/vt/keyboard.c``
-+  ``kbd_keycode()`` can call ``bootsplash_disable()`` when the user
-+  presses ESC or F1-F12 (changing VT). This is to provide a built-in way
-+  of disabling the splash manually at any time.
-+
-+
-+
-+FAQ: Frequently Asked Questions
-+===============================
-+
-+I want to see the log! How do I show the log?
-+---------------------------------------------
-+
-+Press ESC while the splash is shown, or remove the ``bootsplash.bootfile``
-+parameter from the kernel cmdline. Without that parameter, the bootsplash
-+will boot disabled.
-+
-+
-+Why use FB instead of modern DRM/KMS?
-+-------------------------------------
-+
-+This is a semantic problem:
-+ - What memory to draw the splash to?
-+ - And what mode will the screen be set to?
-+
-+Using the fbdev emulation solves these issues.
-+
-+Let's start from a bare KMS system, without fbcon, and without fbdev
-+emulation. In this case, as long as userspace doesn't open the KMS
-+device, the state of the screen is undefined. No framebuffer is
-+allocated in video RAM, and no particular mode is set.
-+
-+In this case, we'd have to allocate a framebuffer to show the splash,
-+and set our mode ourselves. This either wastes a screenful of video RAM
-+if the splash is to co-exist with the userspace program's own allocated
-+framebuffer, or there is a flicker as we deactivate and delete the
-+bootsplash's framebuffer and hand control over to userspace. Since we
-+may set a different mode than userspace, we'd also have flicker due
-+to mode switching.
-+
-+This logic is already contained in every KMS driver that performs fbdev
-+emulation. So we might as well use that. And the correct API to do so is
-+fbdev. Plus, we get compatibility with old, pure fbdev drivers for free.
-+With the fbdev emulation, there is *always* a well-defined framebuffer
-+to draw on. And the selection of mode has already been done by the
-+graphics driver, so we don't need to reinvent that wheel, either.
-+Finally, if userspace decides to use /dev/fbX, we don't have to worry
-+about wasting video RAM, either.
-+
-+
-+Why is the bootsplash integrated in fbcon?
-+------------------------------------------
-+
-+Right now, the bootsplash is drawn from within fbcon, as this allows us
-+to easily know *when* to draw - i.e. when we're safe from fbcon and
-+userspace drawing all over our beautiful splash logo.
-+
-+Separating them is not easy - see the to-do list below.
-+
-+
-+
-+TO DO list for future development
-+=================================
-+
-+Second enable/disable switch for the system
-+-------------------------------------------
-+
-+It may be helpful to differentiate between the system and the user
-+switching off the bootsplash. Thus, the system may make it disappear and
-+reappear e.g. for a password prompt, yet once the user has pressed ESC,
-+it could stay gone.
-+
-+
-+Fix buggy DRM/KMS drivers
-+-------------------------
-+
-+Currently, the splash code manually checks for fbdev emulation provided by
-+the ast, cirrus, and mgag200 DRM/KMS drivers.
-+These drivers use a manual mechanism similar to deferred I/O for their FB
-+emulation, and thus need to be manually flushed onto the screen in the same
-+way.
-+
-+This may be improved upon in several ways:
-+
-+1. Changing these drivers to expose the fbdev BO's memory directly, like
-+   bochsdrmfb does.
-+2. Creating a new fb_ops->fb_flush() API to allow the kernel to flush the
-+   framebuffer once the bootsplash has been drawn into it.
-+
-+
-+Separating from fbcon
-+---------------------
-+
-+Separating these two components would yield independence from fbcon being
-+compiled into the kernel, and thus lowering code size in embedded
-+applications.
-+
-+To do this cleanly will involve a clean separation of users of an FB device
-+within the kernel, i.e. fbcon, bootsplash, and userspace. Right now, the
-+legacy fbcon code and VT code co-operate to switch between fbcon and
-+userspace (by setting the VT into KD_GRAPHICS mode). Installing a muxer
-+between these components ensues refactoring of old code and checking for
-+correct locking.
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 5c237445761e..7ffac272434e 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -3619,6 +3619,8 @@
- M:     Max Staudt <mstaudt@suse.de>
- L:     linux-fbdev@vger.kernel.org
- S:     Maintained
-+F:     Documentation/ABI/testing/sysfs-platform-bootsplash
-+F:     Documentation/bootsplash.rst
- F:     drivers/video/fbdev/core/bootsplash*.*
- F:     drivers/video/fbdev/core/dummycon.c
- F:     include/linux/bootsplash.h
diff --git a/0411-bootsplash.patch b/0411-bootsplash.patch
deleted file mode 100644
index 8e87eb463187..000000000000
--- a/0411-bootsplash.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff --git a/Documentation/ABI/testing/sysfs-platform-bootsplash b/Documentation/ABI/testing/sysfs-platform-bootsplash
-index 742c7b035ded..f8f4b259220e 100644
---- a/Documentation/ABI/testing/sysfs-platform-bootsplash
-+++ b/Documentation/ABI/testing/sysfs-platform-bootsplash
-@@ -9,3 +9,35 @@ Description:
- 		1: Splash is shown whenever fbcon would show a text console
- 		   (i.e. no graphical application is running), and a splash
- 		   file is loaded.
-+
-+What:		/sys/devices/platform/bootsplash.0/drop_splash
-+Date:		Oct 2017
-+KernelVersion:	4.14
-+Contact:	Max Staudt <mstaudt@suse.de>
-+Description:
-+		Can only be set.
-+
-+		Any value written will cause the current splash theme file
-+		to be unloaded and the text console to be redrawn.
-+
-+What:		/sys/devices/platform/bootsplash.0/load_file
-+Date:		Oct 2017
-+KernelVersion:	4.14
-+Contact:	Max Staudt <mstaudt@suse.de>
-+Description:
-+		Can only be set.
-+
-+		Any value written will cause the splash to be disabled and
-+		internal memory structures to be freed.
-+
-+		A firmware path written will cause a new theme file to be
-+		loaded and the current bootsplash to be replaced.
-+		The current enabled/disabled status is not touched.
-+		If the splash is already active, it will be redrawn.
-+
-+		The path has to be a path in /lib/firmware since
-+		request_firmware() is used to fetch the data.
-+
-+		When setting the splash from the shell, echo -n has to be
-+		used as any trailing '\n' newline will be interpreted as
-+		part of the path.
-diff --git a/Documentation/bootsplash.rst b/Documentation/bootsplash.rst
-index 611f0c558925..b35aba5093e8 100644
---- a/Documentation/bootsplash.rst
-+++ b/Documentation/bootsplash.rst
-@@ -67,6 +67,14 @@ sysfs run-time configuration
-   a splash theme file is also loaded.
- 
- 
-+``/sys/devices/platform/bootsplash.0/drop_splash``
-+  Unload splash data and free memory.
-+
-+``/sys/devices/platform/bootsplash.0/load_file``
-+  Load a splash file from ``/lib/firmware/``.
-+  Note that trailing newlines will be interpreted as part of the file name.
-+
-+
- 
- Kconfig
- =======
-diff --git a/drivers/video/fbdev/core/bootsplash.c b/drivers/video/fbdev/core/bootsplash.c
-index 13fcaabbc2ca..16cb0493629d 100644
---- a/drivers/video/fbdev/core/bootsplash.c
-+++ b/drivers/video/fbdev/core/bootsplash.c
-@@ -251,11 +251,65 @@ static ssize_t splash_store_enabled(struct device *device,
- 	return count;
- }
- 
-+static ssize_t splash_store_drop_splash(struct device *device,
-+					struct device_attribute *attr,
-+					const char *buf, size_t count)
-+{
-+	struct splash_file_priv *fp;
-+
-+	if (!buf || !count || !splash_state.file)
-+		return count;
-+
-+	mutex_lock(&splash_state.data_lock);
-+	fp = splash_state.file;
-+	splash_state.file = NULL;
-+	mutex_unlock(&splash_state.data_lock);
-+
-+	/* Redraw the text console */
-+	schedule_work(&splash_state.work_redraw_vc);
-+
-+	bootsplash_free_file(fp);
-+
-+	return count;
-+}
-+
-+static ssize_t splash_store_load_file(struct device *device,
-+				      struct device_attribute *attr,
-+				      const char *buf, size_t count)
-+{
-+	struct splash_file_priv *fp, *fp_old;
-+
-+	if (!count)
-+		return 0;
-+
-+	fp = bootsplash_load_firmware(&splash_state.splash_device->dev,
-+				      buf);
-+
-+	if (!fp)
-+		return -ENXIO;
-+
-+	mutex_lock(&splash_state.data_lock);
-+	fp_old = splash_state.file;
-+	splash_state.splash_fb = NULL;
-+	splash_state.file = fp;
-+	mutex_unlock(&splash_state.data_lock);
-+
-+	/* Update the splash or text console */
-+	schedule_work(&splash_state.work_redraw_vc);
-+
-+	bootsplash_free_file(fp_old);
-+	return count;
-+}
-+
- static DEVICE_ATTR(enabled, 0644, splash_show_enabled, splash_store_enabled);
-+static DEVICE_ATTR(drop_splash, 0200, NULL, splash_store_drop_splash);
-+static DEVICE_ATTR(load_file, 0200, NULL, splash_store_load_file);
- 
- 
- static struct attribute *splash_dev_attrs[] = {
- 	&dev_attr_enabled.attr,
-+	&dev_attr_drop_splash.attr,
-+	&dev_attr_load_file.attr,
- 	NULL
- };
- 
diff --git a/0412-bootsplash.patch b/0412-bootsplash.patch
deleted file mode 100644
index c6597a15e425..000000000000
--- a/0412-bootsplash.patch
+++ /dev/null
@@ -1,511 +0,0 @@
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 7ffac272434e..ddff07cd794c 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -3625,6 +3625,7 @@
- F:     drivers/video/fbdev/core/dummycon.c
- F:     include/linux/bootsplash.h
- F:     include/uapi/linux/bootsplash_file.h
-+F:     tools/bootsplash/*
- 
- BPF [GENERAL] (Safe Dynamic Programs and Tools)
- M:     Alexei Starovoitov <ast@kernel.org>
-diff --git a/tools/bootsplash/.gitignore b/tools/bootsplash/.gitignore
-new file mode 100644
-index 000000000000..091b99a17567
---- /dev/null
-+++ b/tools/bootsplash/.gitignore
-@@ -0,0 +1 @@
-+bootsplash-packer
-diff --git a/tools/bootsplash/Makefile b/tools/bootsplash/Makefile
-new file mode 100644
-index 000000000000..0ad8e8a84942
---- /dev/null
-+++ b/tools/bootsplash/Makefile
-@@ -0,0 +1,9 @@
-+CC := $(CROSS_COMPILE)gcc
-+CFLAGS := -I../../usr/include
-+
-+PROGS := bootsplash-packer
-+
-+all: $(PROGS)
-+
-+clean:
-+	rm -fr $(PROGS)
-diff --git a/tools/bootsplash/bootsplash-packer.c b/tools/bootsplash/bootsplash-packer.c
-new file mode 100644
-index 000000000000..ffb6a8b69885
---- /dev/null
-+++ b/tools/bootsplash/bootsplash-packer.c
-@@ -0,0 +1,471 @@
-+/*
-+ * Kernel based bootsplash.
-+ *
-+ * (Splash file packer tool)
-+ *
-+ * Authors:
-+ * Max Staudt <mstaudt@suse.de>
-+ *
-+ * SPDX-License-Identifier: GPL-2.0
-+ */
-+
-+#include <endian.h>
-+#include <getopt.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include <linux/bootsplash_file.h>
-+
-+
-+static void print_help(char *progname)
-+{
-+	printf("Usage: %s [OPTIONS] outfile\n", progname);
-+	printf("\n"
-+	       "Options, executed in order given:\n"
-+	       "  -h, --help                   Print this help message\n"
-+	       "\n"
-+	       "  --bg_red <u8>                Background color (red part)\n"
-+	       "  --bg_green <u8>              Background color (green part)\n"
-+	       "  --bg_blue <u8>               Background color (blue part)\n"
-+	       "  --bg_reserved <u8>           (do not use)\n"
-+	       "  --frame_ms <u16>             Minimum milliseconds between animation steps\n"
-+	       "\n"
-+	       "  --picture                    Start describing the next picture\n"
-+	       "  --pic_width <u16>            Picture width in pixels\n"
-+	       "  --pic_height <u16>           Picture height in pixels\n"
-+	       "  --pic_position <u8>             Coarse picture placement:\n"
-+	       "                                  0x00 - Top left\n"
-+	       "                                  0x01 - Top\n"
-+	       "                                  0x02 - Top right\n"
-+	       "                                  0x03 - Right\n"
-+	       "                                  0x04 - Bottom right\n"
-+	       "                                  0x05 - Bottom\n"
-+	       "                                  0x06 - Bottom left\n"
-+	       "                                  0x07 - Left\n"
-+	       "\n"
-+	       "                                Flags:\n"
-+	       "                                 0x10 - Calculate offset from corner towards center,\n"
-+	       "                                         rather than from center towards corner\n"
-+	       "  --pic_position_offset <u16>  Distance from base position in pixels\n"
-+	       "  --pic_anim_type <u8>         Animation type:\n"
-+	       "                                 0 - None\n"
-+	       "                                 1 - Forward loop\n"
-+	       "  --pic_anim_loop <u8>         Loop point for animation\n"
-+	       "\n"
-+	       "  --blob <filename>            Include next data stream\n"
-+	       "  --blob_type <u16>            Type of data\n"
-+	       "  --blob_picture_id <u8>       Picture to associate this blob with, starting at 0\n"
-+	       "                                 (default: number of last --picture)\n"
-+	       "\n");
-+	printf("This tool will write %s files.\n\n",
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+	       "Big Endian (BE)");
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
-+	       "Little Endian (LE)");
-+#else
-+#error
-+#endif
-+}
-+
-+
-+struct blob_entry {
-+	struct blob_entry *next;
-+
-+	char *fn;
-+
-+	struct splash_blob_header header;
-+};
-+
-+
-+static void dump_file_header(struct splash_file_header *h)
-+{
-+	printf(" --- File header ---\n");
-+	printf("\n");
-+	printf("  version:     %5u\n", h->version);
-+	printf("\n");
-+	printf("  bg_red:      %5u\n", h->bg_red);
-+	printf("  bg_green:    %5u\n", h->bg_green);
-+	printf("  bg_blue:     %5u\n", h->bg_blue);
-+	printf("  bg_reserved: %5u\n", h->bg_reserved);
-+	printf("\n");
-+	printf("  num_blobs:   %5u\n", h->num_blobs);
-+	printf("  num_pics:    %5u\n", h->num_pics);
-+	printf("\n");
-+	printf("  frame_ms:    %5u\n", h->frame_ms);
-+	printf("\n");
-+}
-+
-+static void dump_pic_header(struct splash_pic_header *ph)
-+{
-+	printf(" --- Picture header ---\n");
-+	printf("\n");
-+	printf("  width:           %5u\n", ph->width);
-+	printf("  height:          %5u\n", ph->height);
-+	printf("\n");
-+	printf("  num_blobs:       %5u\n", ph->num_blobs);
-+	printf("\n");
-+	printf("  position:        %0x3x\n", ph->position);
-+	printf("  position_offset: %5u\n", ph->position_offset);
-+	printf("\n");
-+	printf("  anim_type:       %5u\n", ph->anim_type);
-+	printf("  anim_loop:       %5u\n", ph->anim_loop);
-+	printf("\n");
-+}
-+
-+static void dump_blob(struct blob_entry *b)
-+{
-+	printf(" --- Blob header ---\n");
-+	printf("\n");
-+	printf("  length:     %7u\n", b->header.length);
-+	printf("  type:       %7u\n", b->header.type);
-+	printf("\n");
-+	printf("  picture_id: %7u\n", b->header.picture_id);
-+	printf("\n");
-+}
-+
-+
-+#define OPT_MAX(var, max) \
-+	do { \
-+		if ((var) > max) { \
-+			fprintf(stderr, "--%s: Invalid value\n", \
-+			long_options[option_index].name); \
-+			break; \
-+		} \
-+	} while (0)
-+
-+static struct option long_options[] = {
-+	{"help", 0, 0, 'h'},
-+	{"bg_red", 1, 0, 10001},
-+	{"bg_green", 1, 0, 10002},
-+	{"bg_blue", 1, 0, 10003},
-+	{"bg_reserved", 1, 0, 10004},
-+	{"frame_ms", 1, 0, 10005},
-+	{"picture", 0, 0, 20000},
-+	{"pic_width", 1, 0, 20001},
-+	{"pic_height", 1, 0, 20002},
-+	{"pic_position", 1, 0, 20003},
-+	{"pic_position_offset", 1, 0, 20004},
-+	{"pic_anim_type", 1, 0, 20005},
-+	{"pic_anim_loop", 1, 0, 20006},
-+	{"blob", 1, 0, 30000},
-+	{"blob_type", 1, 0, 30001},
-+	{"blob_picture_id", 1, 0, 30002},
-+	{NULL, 0, NULL, 0}
-+};
-+
-+
-+int main(int argc, char **argv)
-+{
-+	FILE *of;
-+	char *ofn;
-+	int c;
-+	int option_index = 0;
-+
-+	unsigned long ul;
-+	struct splash_file_header fh = {};
-+	struct splash_pic_header ph[255];
-+	struct blob_entry *blob_first = NULL;
-+	struct blob_entry *blob_last = NULL;
-+	struct blob_entry *blob_cur = NULL;
-+
-+	if (argc < 2) {
-+		print_help(argv[0]);
-+		return EXIT_FAILURE;
-+	}
-+
-+
-+	/* Parse and and execute user commands */
-+	while ((c = getopt_long(argc, argv, "h",
-+			  long_options, &option_index)) != -1) {
-+		switch (c) {
-+		case 10001:	/* bg_red */
-+			ul = strtoul(optarg, NULL, 0);
-+			OPT_MAX(ul, 255);
-+			fh.bg_red = ul;
-+			break;
-+		case 10002:	/* bg_green */
-+			ul = strtoul(optarg, NULL, 0);
-+			OPT_MAX(ul, 255);
-+			fh.bg_green = ul;
-+			break;
-+		case 10003:	/* bg_blue */
-+			ul = strtoul(optarg, NULL, 0);
-+			OPT_MAX(ul, 255);
-+			fh.bg_blue = ul;
-+			break;
-+		case 10004:	/* bg_reserved */
-+			ul = strtoul(optarg, NULL, 0);
-+			OPT_MAX(ul, 255);
-+			fh.bg_reserved = ul;
-+			break;
-+		case 10005:	/* frame_ms */
-+			ul = strtoul(optarg, NULL, 0);
-+			OPT_MAX(ul, 65535);
-+			fh.frame_ms = ul;
-+			break;
-+
-+
-+		case 20000:	/* picture */
-+			if (fh.num_pics >= 255) {
-+				fprintf(stderr, "--%s: Picture array full\n",
-+					long_options[option_index].name);
-+				break;
-+			}
-+
-+			fh.num_pics++;
-+			break;
-+
-+		case 20001:	/* pic_width */
-+			ul = strtoul(optarg, NULL, 0);
-+			OPT_MAX(ul, 65535);
-+			ph[fh.num_pics - 1].width = ul;
-+			break;
-+
-+		case 20002:	/* pic_height */
-+			ul = strtoul(optarg, NULL, 0);
-+			OPT_MAX(ul, 65535);
-+			ph[fh.num_pics - 1].height = ul;
-+			break;
-+
-+		case 20003:	/* pic_position */
-+			ul = strtoul(optarg, NULL, 0);
-+			OPT_MAX(ul, 255);
-+			ph[fh.num_pics - 1].position = ul;
-+			break;
-+
-+		case 20004:	/* pic_position_offset */
-+			ul = strtoul(optarg, NULL, 0);
-+			OPT_MAX(ul, 255);
-+			ph[fh.num_pics - 1].position_offset = ul;
-+			break;
-+
-+		case 20005:	/* pic_anim_type */
-+			ul = strtoul(optarg, NULL, 0);
-+			OPT_MAX(ul, 255);
-+			ph[fh.num_pics - 1].anim_type = ul;
-+			break;
-+
-+		case 20006:	/* pic_anim_loop */
-+			ul = strtoul(optarg, NULL, 0);
-+			OPT_MAX(ul, 255);
-+			ph[fh.num_pics - 1].anim_loop = ul;
-+			break;
-+
-+
-+		case 30000:	/* blob */
-+			if (fh.num_blobs >= 65535) {
-+				fprintf(stderr, "--%s: Blob array full\n",
-+					long_options[option_index].name);
-+				break;
-+			}
-+
-+			blob_cur = calloc(1, sizeof(struct blob_entry));
-+			if (!blob_cur) {
-+				fprintf(stderr, "--%s: Out of memory\n",
-+					long_options[option_index].name);
-+				break;
-+			}
-+
-+			blob_cur->fn = optarg;
-+			if (fh.num_pics)
-+				blob_cur->header.picture_id = fh.num_pics - 1;
-+
-+			if (!blob_first)
-+				blob_first = blob_cur;
-+			if (blob_last)
-+				blob_last->next = blob_cur;
-+			blob_last = blob_cur;
-+			fh.num_blobs++;
-+			break;
-+
-+		case 30001:	/* blob_type */
-+			if (!blob_cur) {
-+				fprintf(stderr, "--%s: No blob selected\n",
-+					long_options[option_index].name);
-+				break;
-+			}
-+
-+			ul = strtoul(optarg, NULL, 0);
-+			OPT_MAX(ul, 255);
-+			blob_cur->header.type = ul;
-+			break;
-+
-+		case 30002:	/* blob_picture_id */
-+			if (!blob_cur) {
-+				fprintf(stderr, "--%s: No blob selected\n",
-+					long_options[option_index].name);
-+				break;
-+			}
-+
-+			ul = strtoul(optarg, NULL, 0);
-+			OPT_MAX(ul, 255);
-+			blob_cur->header.picture_id = ul;
-+			break;
-+
-+
-+
-+		case 'h':
-+		case '?':
-+		default:
-+			print_help(argv[0]);
-+			goto EXIT;
-+		} /* switch (c) */
-+	} /* while ((c = getopt_long(...)) != -1) */
-+
-+	/* Consume and drop lone arguments */
-+	while (optind < argc) {
-+		ofn = argv[optind];
-+		optind++;
-+	}
-+
-+
-+	/* Read file lengths */
-+	for (blob_cur = blob_first; blob_cur; blob_cur = blob_cur->next) {
-+		FILE *f;
-+		long pos;
-+		int i;
-+
-+		if (!blob_cur->fn)
-+			continue;
-+
-+		f = fopen(blob_cur->fn, "rb");
-+		if (!f)
-+			goto ERR_FILE_LEN;
-+
-+		if (fseek(f, 0, SEEK_END))
-+			goto ERR_FILE_LEN;
-+
-+		pos = ftell(f);
-+		if (pos < 0 || pos > (1 << 30))
-+			goto ERR_FILE_LEN;
-+
-+		blob_cur->header.length = pos;
-+
-+		fclose(f);
-+		continue;
-+
-+ERR_FILE_LEN:
-+		fprintf(stderr, "Error getting file length (or too long): %s\n",
-+			blob_cur->fn);
-+		if (f)
-+			fclose(f);
-+		continue;
-+	}
-+
-+
-+	/* Set magic headers */
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+	memcpy(&fh.id[0], BOOTSPLASH_MAGIC_BE, 16);
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
-+	memcpy(&fh.id[0], BOOTSPLASH_MAGIC_LE, 16);
-+#else
-+#error
-+#endif
-+	fh.version = BOOTSPLASH_VERSION;
-+
-+	/* Set blob counts */
-+	for (blob_cur = blob_first; blob_cur; blob_cur = blob_cur->next) {
-+		if (blob_cur->header.picture_id < fh.num_pics)
-+			ph[blob_cur->header.picture_id].num_blobs++;
-+	}
-+
-+
-+	/* Dump structs */
-+	dump_file_header(&fh);
-+
-+	for (ul = 0; ul < fh.num_pics; ul++)
-+		dump_pic_header(&ph[ul]);
-+
-+	for (blob_cur = blob_first; blob_cur; blob_cur = blob_cur->next)
-+		dump_blob(blob_cur);
-+
-+
-+	/* Write to file */
-+	printf("Writing splash to file: %s\n", ofn);
-+	of = fopen(ofn, "wb");
-+	if (!of)
-+		goto ERR_WRITING;
-+
-+	if (fwrite(&fh, sizeof(struct splash_file_header), 1, of) != 1)
-+		goto ERR_WRITING;
-+
-+	for (ul = 0; ul < fh.num_pics; ul++) {
-+		if (fwrite(&ph[ul], sizeof(struct splash_pic_header), 1, of)
-+		    != 1)
-+			goto ERR_WRITING;
-+	}
-+
-+	blob_cur = blob_first;
-+	while (blob_cur) {
-+		struct blob_entry *blob_old = blob_cur;
-+		FILE *f;
-+		char *buf[256];
-+		uint32_t left;
-+
-+		if (fwrite(&blob_cur->header,
-+			   sizeof(struct splash_blob_header), 1, of) != 1)
-+			goto ERR_WRITING;
-+
-+		if (!blob_cur->header.length || !blob_cur->fn)
-+			continue;
-+
-+		f = fopen(blob_cur->fn, "rb");
-+		if (!f)
-+			goto ERR_FILE_COPY;
-+
-+		left = blob_cur->header.length;
-+		while (left >= sizeof(buf)) {
-+			if (fread(buf, sizeof(buf), 1, f) != 1)
-+				goto ERR_FILE_COPY;
-+			if (fwrite(buf, sizeof(buf), 1, of) != 1)
-+				goto ERR_FILE_COPY;
-+			left -= sizeof(buf);
-+		}
-+		if (left) {
-+			if (fread(buf, left, 1, f) != 1)
-+				goto ERR_FILE_COPY;
-+			if (fwrite(buf, left, 1, of) != 1)
-+				goto ERR_FILE_COPY;
-+		}
-+
-+		/* Pad data stream to 16 bytes */
-+		if (left % 16) {
-+			if (fwrite("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-+					16 - (left % 16), 1, of) != 1)
-+				goto ERR_FILE_COPY;
-+		}
-+
-+		fclose(f);
-+		blob_cur = blob_cur->next;
-+		free(blob_old);
-+		continue;
-+
-+ERR_FILE_COPY:
-+		if (f)
-+			fclose(f);
-+		goto ERR_WRITING;
-+	}
-+
-+	fclose(of);
-+
-+EXIT:
-+	return EXIT_SUCCESS;
-+
-+
-+ERR_WRITING:
-+	fprintf(stderr, "Error writing splash.\n");
-+	fprintf(stderr, "The output file is probably corrupt.\n");
-+	if (of)
-+		fclose(of);
-+
-+	while (blob_cur) {
-+		struct blob_entry *blob_old = blob_cur;
-+
-+		blob_cur = blob_cur->next;
-+		free(blob_old);
-+	}
-+
-+	return EXIT_FAILURE;
-+}
diff --git a/0413-bootsplash.gitpatch b/0413-bootsplash.gitpatch
deleted file mode 100644
index 124ad077fbc3..000000000000
--- a/0413-bootsplash.gitpatch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff --git a/Documentation/bootsplash.rst b/Documentation/bootsplash.rst
-index b35aba5093e8..d4f132eca615 100644
---- a/Documentation/bootsplash.rst
-+++ b/Documentation/bootsplash.rst
-@@ -195,6 +195,16 @@ Hooks - how the bootsplash is integrated
- 
- 
- 
-+Crating a bootsplash theme file
-+===============================
-+
-+A simple tool for theme file creation is included in ``tools/bootsplash``.
-+
-+There is also an example shell script, as an example on how to use the tool
-+and in order to generate a reference bootsplash file.
-+
-+
-+
- FAQ: Frequently Asked Questions
- ===============================
- 
-diff --git a/tools/bootsplash/.gitignore b/tools/bootsplash/.gitignore
-index 091b99a17567..5dfced41ba82 100644
---- a/tools/bootsplash/.gitignore
-+++ b/tools/bootsplash/.gitignore
-@@ -1 +1,4 @@
- bootsplash-packer
-+bootsplash
-+logo.rgb
-+throbber*.rgb
-diff --git a/tools/bootsplash/ajax-loader.gif b/tools/bootsplash/ajax-loader.gif
-new file mode 100644
-index 0000000000000000000000000000000000000000..3288d1035d70bb86517e2c233f1a904e41f06b29
-GIT binary patch
-literal 3208
-zcmc(iX;4#H9>pJdFE7h`I{IF)0|5<6L}(j=N}5%L009EB2nYfyF)E0PvIqo$u!IC;
-z4PgyY5|S9AEh38G)(9eq4TbH7_UHg@yWrlIJ$6smIADL7s^P;_O;ykRc<bJ}b<Y2s
-zU)AOL`#QVCGXW;>9soXl`UC*LwQJXkii*0rx|*7rI2=x7WaRkx_~XZqFJ8R3c=2Kg
-zf@aSAv8+BJ8+^hyay>(QR@t*blbKzsf0}bscEqRc5Hd3o(-N5RyW=zWB*zQw6Zh>*
-z2CROCDAbu#D`)S|J_<lj7Yz9)#_Og>o(lL9Yn3l*+8RdiRD_>iNz$#_IAzCna&Wl5
-zSF_(rRCDD!wi#i8oAm&jYtn2_@VB%2-H*G%bN#|(6R6N?wM)3u`PiGzwuX7qmTgyF
-zpE)h0kuoxQ9?=kW7Y!=R@DmhU9)vwT<ZMc0Y;&y4jY1%TT3z!|H=R-GXDHPiKcVWh
-zY+!etO=DI2rIs8{iFWtPv(Lu|O3u|$F3Sbq;+xF{gTX$#T%m?MUUZy&ug3$=zXgXj
-zrxrf}reg*D3HB~8JyLgl$UCyV?EQ`@OKjW@tGrvh6ZqPD#+m=rK0T{FT01>*EZWzJ
-zrt+=2tqFts72yIp?|gvdLhs8Hfku^Z(){gmN%Y=K#<L1VKWYjwV^JDyeS;Y$p1xw*
-z#3VzfAV>P|%fkvg<hUP3U1Q=Hdgg~ik+2zyAc79kpuA<f*-~l+ZBH3*S2jBrEOF0w
-zrxe9#Vx$SxnL0JE4WeeXY1)ppOIy3@Vvexu&oeIa&QvoD`jBE#Gd7rT{j&OMLz1Wu
-zOEj;)PR^=mxjCG0NOUJb&U;ui6*-`3&wmcQ>Uj~HfIp3CuXqCtYGtJ#me+n+-LmP(
-z*XNuk%!aH8bIE@_Bj46>M*dSro|7<6vZ7WUHh5YQzN$>IJFqCb|CT!wj~R2C2%=q{
-zpt8rzY$aw?W?=Ustv{jo?Ow@<k6~~d?F>ZRkLe<)NItY>Cyhle*wR59dTdF6(@{5^
-zAQBOB*hNtc3bkY-8{Cm$nFS@elbTtSqrt7MB{h_4y+~`!mVa}?c&N>&?P}GqdMuhQ
-z&@TD5Czd((DcG_Su~dKKV)Pj$-qi1WHM8_vc^O4?^!oY|tmK~i!{fjd&@_1E(T~r7
-z_REZy&hMT^ySJB3W7l<L=l9ZMvC<Gz>$4YhR`M(J7S5S~+4Q&3HPa)z%zPpisOp$^
-zTEe99ig2$5_qFr!$;<oK+H}=wcaT3=%Nm!;Kw7MHnU5paWS{tI1+DOU?!7xefZ57L
-ze_iPrUrRQct0FSCtTFLtg*<#jo}Z3{E?T{skj>7A6CJ}PJmRhli>w?LC}Y`#HLGy6
-zMU4<C6_PR!wGq`HQyoWJb;nj8>EhL~dKCN5Ut;U2jd*83ShB<kA1Y@1U)Ar;N|HhS
-znIkwkT(&i5XhkI;xwmC%DvPhGNIi?aY<|8rajSt<ap(2E-#qSPQxAp@jIY@-@>Niu
-zcJB0l9>1Modc?-oM<<M{t-|U0{*W+=Ct2ZY_02y-De{7vW<f^HJQhd1l&4)Gw2oOS
-zm46KASlsKI@J$sA#$$|7D5QMbewIaFv4fXyNbL5Ac~kS&g^#5XHaYBvNxbF3Y2L*6
-ztrn?JmgOFAo1lh99BEb^pp>R<Z&2wFwWd*z2wF6&nmW9}nyMfWMO`hc&zkr2AeBP3
-zj75NZQ8-VthLviI^j@e=FN6wxR@1uCRv<b;Y<3t(dr<e}N%b}FQtKxHi9xU2C!#0Z
-zO2<#(;s&964KtWfkQVi``vIFT7kbT~d;ITb0T9+U1AwIgET*ciil)~4gl;xgoy5M!
-z-UJHerGNh_`lO!vA)%ly=~<}ykhlnQnoP$oqido+`qK(cOpmt^pbhf`n-FQaIK5ix
-zq@=#Sl2Y&s<pe8B!1!YA78W7dA?2Xu9v7QHc?}NN)sx(o6iZ#|kHX64nijZG(yB1J
-zfMQm;1rb5O!-+1Pov;csFu7z>4?<d6>}3g}UJ%@K);kriq>)e*rh%hdqM)5Q)*+O8
-zXm;SEbs@koiYS!9YXIclSg+5m_s~yrW#kKMdiRszg(gCP5HPmP7L)vCf8@fxUh6qY
-z@Z#TmkjzAZX{rwE+q|K~F2v5{_@vt%>yT_a#fF03SFt{0RX<yi^Bg0BS3UHmG;U4d
-z`2QlHs<l7ezUo)s<V^9ZccYv>vDAiaY~K9CgS1O>frXgAjBCS}mEd4mIWZ$=ovd5|
-zR?GRdU}d6+Q`+JRW)|=v7$)X<at#L3(d9WVd8CstDNPh>Nkn3yE`!nAiSCvOB1jKT
-zG<1aK3s<0b0m==egTD#8i(<nFTpHvxfx|aIng5yR81z6E<naz8-Ow^p@sCs8mz=%h
-zO$v$X0NS?ofjnp~62AE}^z%gY8Nsqj=NwUqyj+o6s$@kK@d+U4Vp-^_G32vzv@8nI
-z01{`FL$DXQL%WB*9R<xn7$ya31flsbiVh+-0m=YeB_ocaW;YRxI51d(jP?N!ane91
-z9~^yzJ;S;OWRKC8PrrXYkZCaruNYE>Of=1pGDTOCho0XpIOMQ&P87cVKY1W=C6kIg
-z9cH=@a&zbm2+`|{(_?YC9fdm?1TY~-pwlBn?>=(~1pDKbco6jloP;0-cqRiwV1A_S
-zEyV0Dj8Pwy!nekzaN>{)7rgZ&_QLxK{~1yRe865^<m)Ax^m58MY|zev&92(G7#vQU
-zn~8r)5oUrwM9`}05|I<Nx*n}jlvg&C9_310Dd4OT2txd91Z*_U8bRtrNaq+nGd{E#
-zVGckZFpr^;mv}%%T{jHtz<a=^%;mPXVY7SR`@6_Uw@(0*>yx>}+a!ECd>#MMwddow
-z@CU{l+Rt$xuXuf}?ga{3IAr?Raql^c@a%sI0U5m}HvJ5O1#I%_MMPt#BH>OqUZ{-k
-zt>4Xzz=%jT*FVW(uYkWyx}9Gw$HdN*qU?Bit#ji(Wi7p-u|_8?h^%szIS^s^fNM}b
-zgGy>|=cbEufpguY5_6w~&ZLv=Bo06UF9EYIY;Er-1VK)SyF&!|J{axiE1z^(hXwVq
-zsFS=K-#zC}CcOs^8W{KAt+kK)jYDgDYbCXv{{<mZ_TMxh0{w%6lzzG*pm+Dj4XaZ5
-zoJwkk5)~fyUmzYbwMERR3j)XePHj^2P!5GK`~^RXuEz>rwsgqtIU3<910$CJi)s??
-z_t8k{>7*0~4l~LLF7$WXT5OSq5QCTbP_l!SN|{R}3D&eWA8~0ltWh1IL+ZBX4rRSt
-zWF6Om3WDMu4xK^1(BF`2cL}rUCzhHAB`@j5&R-yk_l*t;mPGY|u2^o|myvcOdrg0W
-z%=lX;f^Vkqfp?u7*4qQq%A3Mpf!xspWBSKS@O%r*TSM}?dl(@*%{0Jm_8;(h{R__M
-Bt<?Yk
-
-literal 0
-HcmV?d00001
-
-diff --git a/tools/bootsplash/bootsplash-tux.sh b/tools/bootsplash/bootsplash-tux.sh
-new file mode 100755
-index 000000000000..1078f87644b9
---- /dev/null
-+++ b/tools/bootsplash/bootsplash-tux.sh
-@@ -0,0 +1,66 @@
-+#!/bin/bash
-+#
-+# A simple script to show how to create a bootsplash.
-+# Do with it whatever you wish.
-+#
-+# This needs ImageMagick for the 'convert' and 'identify' tools.
-+#
-+
-+LOGO=../../Documentation/logo.gif
-+LOGO_WIDTH=$(identify $LOGO | cut -d " " -f 3 | cut -d x -f 1)
-+LOGO_HEIGHT=$(identify $LOGO | cut -d " " -f 3 | cut -d x -f 2)
-+
-+THROBBER=ajax-loader.gif
-+THROBBER_WIDTH=$(identify $THROBBER | head -1 | cut -d " " -f 3 | \
-+						cut -d x -f 1)
-+THROBBER_HEIGHT=$(identify $THROBBER | head -1 | cut -d " " -f 3 | \
-+						 cut -d x -f 2)
-+
-+convert -alpha remove \
-+	-background "#ff3a40" \
-+	$LOGO \
-+	logo.rgb
-+
-+convert -alpha remove \
-+	-background "#ff3a40" \
-+	$THROBBER \
-+	throbber%02d.rgb
-+
-+
-+make clean
-+make bootsplash-packer
-+
-+
-+# Let's put Tux in the center of an orange background.
-+./bootsplash-packer \
-+	--bg_red 0xff \
-+	--bg_green 0x3a \
-+	--bg_blue 0x40 \
-+	--frame_ms 48 \
-+	--picture \
-+	--pic_width $LOGO_WIDTH \
-+	--pic_height $LOGO_HEIGHT \
-+	--pic_position 0 \
-+	--blob logo.rgb \
-+	--picture \
-+	--pic_width $THROBBER_WIDTH \
-+	--pic_height $THROBBER_HEIGHT \
-+	--pic_position 0x14 \
-+	--pic_position_offset 20 \
-+	--pic_anim_type 1 \
-+	--pic_anim_loop 0 \
-+	--blob throbber00.rgb \
-+	--blob throbber01.rgb \
-+	--blob throbber02.rgb \
-+	--blob throbber03.rgb \
-+	--blob throbber04.rgb \
-+	--blob throbber05.rgb \
-+	--blob throbber06.rgb \
-+	--blob throbber07.rgb \
-+	--blob throbber08.rgb \
-+	--blob throbber09.rgb \
-+	--blob throbber10.rgb \
-+	--blob throbber11.rgb \
-+	bootsplash
-+
-+rm *.rgb
diff --git a/0999-acs.gitpatch b/0999-acs.gitpatch
index 1fdf355a1681..f6a6411632d3 100644
--- a/0999-acs.gitpatch
+++ b/0999-acs.gitpatch
@@ -1,11 +1,11 @@
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 6b83886..bb479af 100644
+index 9e5bab2..d89b25a 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -4162,6 +4162,14 @@
- 		nomsi		[MSI] If the PCI_MSI kernel config parameter is
- 				enabled, this kernel boot option can be used to
- 				disable the use of MSI interrupts system-wide.
+@@ -4235,6 +4235,14 @@
+                nomsi           [MSI] If the PCI_MSI kernel config parameter is
+                                enabled, this kernel boot option can be used to
+                                disable the use of MSI interrupts system-wide.
 +                pci_acs_override [PCIE] Override missing PCIe ACS support for:
 +                                downstream
 +                                        All downstream ports - full ACS capabilities
@@ -14,11 +14,11 @@ index 6b83886..bb479af 100644
 +                                id:nnnn:nnnn
 +                                        Specific device - full ACS capabilities
 +                                        Specified as vid:did (vendor/device ID) in hex
- 		noioapicquirk	[APIC] Disable all boot interrupt quirks.
- 				Safety option to keep boot IRQs enabled. This
- 				should never be necessary.
+                noioapicquirk   [APIC] Disable all boot interrupt quirks.
+                                Safety option to keep boot IRQs enabled. This
+                                should never be necessary.
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 285acc4..d1cf120 100644
+index c525867..726e5f0 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
 @@ -194,6 +194,107 @@ static int __init pci_apply_final_quirks(void)
@@ -129,12 +129,12 @@ index 285acc4..d1cf120 100644
  /*
   * Decoding should be disabled for a PCI device during BAR sizing to avoid
   * conflict. But doing so may cause problems on host bridge and perhaps other
-@@ -4980,6 +5081,8 @@ static const struct pci_dev_acs_enabled {
- 	{ PCI_VENDOR_ID_NXP, 0x8d9b, pci_quirk_nxp_rp_acs },
- 	/* Zhaoxin Root/Downstream Ports */
- 	{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
-+        /* allow acs for any */
-+        { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
- 	{ 0 }
+@@ -5015,6 +5116,8 @@ static const struct pci_dev_acs_enabled {
+        { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
+        /* Wangxun nics */
+        { PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs },
++       /* allow acs for any */
++       { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
+        { 0 }
  };
- 
+
diff --git a/PKGBUILD b/PKGBUILD
index 4982847e3425..203ea8314208 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,13 +12,13 @@ pkgbase=linux-jcore
 pkgname=('linux-jcore' 'linux-jcore-headers')
 _kernelname=-jcore
 _hostname=jcore
-pkgver=6.3.9
+pkgver=6.4
 pkgrel=1
 pkgdesc="Kernel for Manjaro/EndeavourOS/Arch (ACS override patch include)"
 arch=('x86_64')
 url="https://www.kernel.org/"
 license=('GPL2')
-makedepends=(bc docbook-xsl libelf "pahole>=1:1.25-1" python-sphinx git inetutils kmod xmlto cpio perl tar xz)
+makedepends=(bc docbook-xsl libelf pahole python-sphinx git inetutils kmod xmlto cpio perl tar xz)
 replaces=('linux-acs-manjaro' 'linux-acs-manjaro-headers')
 options=('!strip')
 
@@ -26,54 +26,21 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$pkgver.tar.xz"
         'config'
         # ARCH Patches
         '0101-ZEN_Add_sysctl_and_CONFIG_to_disallow_unprivileged_CLONE_NEWUSER.patch'
-        '0103-Bluetooth_fix_deadlock_for_RFCOMM_sk_state_change.patch'
         # MANJARO Patches
         'mt7921e_Perform_FLR_to_recovery_the_device.patch'
         'rog_ally_sound.patch'
         'hid-asus-rog-ally.patch'
-        # Bootsplash
-        '0301-revert-fbcon-remove-now-unusued-softback_lines-cursor-argument.patch'
-        '0302-revert-fbcon-remove-no-op-fbcon_set_origin.patch'
-        '0303-revert-fbcon-remove-soft-scrollback-code.patch'
-        '0401-bootsplash.patch'
-        '0402-bootsplash.patch'
-        '0403-bootsplash.patch'
-        '0404-bootsplash.patch'
-        '0405-bootsplash.patch'
-        '0406-bootsplash.patch'
-        '0407-bootsplash.patch'
-        '0408-bootsplash.patch'
-        '0409-bootsplash.patch'
-        '0410-bootsplash.patch'
-        '0411-bootsplash.patch'
-        '0412-bootsplash.patch'
-        '0413-bootsplash.gitpatch'
+        'rog-ally-bluetooth.patch'
         # ACS override patch
         '0999-acs.gitpatch')
-sha256sums=('41ecf21399b17ab85163750ba22347d09b54fa099b80b63d0e2ef0066129b13e'
-            '4c355c0f35852dc94ed921ed144407e606097ed2b62d84dab9865c7bc03b06ec'
+sha256sums=('8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3'
+            'c90891bab4641983a84cb196ab7bd2a444581563198e5d28d285bee7a56a136c'
             '05f04019d4a2ee072238c32860fa80d673687d84d78ef436ae9332b6fb788467'
-            'a8a2d8b402b2877df1a949a106c634b6c366dd33b954c4b735ce1d3778214169'
             'd673d034fbcd80426fd8d9c6af56537c5fe5b55fe49d74e313474d7fc285ecc1'
             '2b64a6f677e3b1278f7ae0080b3e58383e097c28e63672a800272ff66d435976'
-            'bfb838dc7748af37b29c90fb216c9666a6f49e0f0e6df8827a5dfe84ef62d626'
-            '2b11905b63b05b25807dd64757c779da74dd4c37e36d3f7a46485b1ee5a9d326'
-            '94a8538251ad148f1025cc3de446ce64f73dc32b01815426fb159c722e8fa5bc'
-            '50f4ccc4aeb0ffb8ec648b90a84ff188dbfed5364075cf0c6045c5696caf6ca9'
-            'e95c4f988cb9337f6c1e3d8affbfe170bea18843f839a3334a38e0ec44ed9000'
-            'a26b3abaec1cd5731bc8431fecb8b3eb0ba47c1992e614643320df14ff859556'
-            '8c1c880f2caa9c7ae43281a35410203887ea8eae750fe8d360d0c8bf80fcc6e0'
-            '1144d51e5eb980fceeec16004f3645ed04a60fac9e0c7cf88a15c5c1e7a4b89e'
-            'dd4b69def2efacf4a6c442202ad5cb93d492c03886d7c61de87696e5a83e2846'
-            '028b07f0c954f70ca37237b62e04103e81f7c658bb8bd65d7d3c2ace301297dc'
-            'a0c548c5703d25ae34b57931f1162de8b18937e676e5791a0f039922090881e7'
-            '8dbb5ab3cb99e48d97d4e2f2e3df5d0de66f3721b4f7fd94a708089f53245c77'
-            'a7aefeacf22c600fafd9e040a985a913643095db7272c296b77a0a651c6a140a'
-            'cf06d959a53eff6d3c287327f1cb2a68346d725cfd1370bc7482a0edc75692fc'
-            '27471eee564ca3149dd271b0817719b5565a9594dc4d884fe3dc51a5f03832bc'
-            'b6e695edbe349505a89c98054a54443acd90830a312cd035393c5c0a624e45c0'
-            '035ea4b2a7621054f4560471f45336b981538a40172d8f17285910d4e0e0b3ef'
-            'e4764334717714cf2bc2e15d980c3ebcb8d78971a92463ef0fba4020da760643')
+            'a38b50b8c73332d3d16950bf8adcae7ead34391a60f74d05a58935cd3dc8a12d'
+            'b6806954a43ca362d80ea9ff4253a185eefb6afee5803749c7c1598bbcd86f6d'
+            '458d7e024d33d4965b14b9b987f01a2884ff28761cff5da7c6a54132a95e9f36')
 
 prepare() {
   cd "linux-${pkgver}"
@@ -87,9 +54,6 @@ prepare() {
       patch -Np1 < "../$src"
   done
 
-  msg2 "0513-bootsplash"
-  git apply -p1 < "../0413-bootsplash.gitpatch"
-
   msg2 "0999-acs"
   patch --ignore-whitespace --fuzz 3 -p1 < "../0999-acs.gitpatch"
 
diff --git a/config b/config
index 24d3e7324c4c..68d9516dd3ae 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.3.9-1 Kernel Configuration
+# Linux/x86 6.4.0-1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230429"
 CONFIG_CC_IS_GCC=y
@@ -15,6 +15,7 @@ CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=125
@@ -162,7 +163,6 @@ CONFIG_CPU_ISOLATION=y
 CONFIG_TREE_RCU=y
 CONFIG_PREEMPT_RCU=y
 CONFIG_RCU_EXPERT=y
-CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
 # CONFIG_FORCE_TASKS_RCU is not set
@@ -190,7 +190,6 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_PRINTK_INDEX=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 
@@ -246,7 +245,6 @@ CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
@@ -514,6 +512,7 @@ CONFIG_PHYSICAL_ALIGN=0x200000
 CONFIG_DYNAMIC_MEMORY_LAYOUT=y
 CONFIG_RANDOMIZE_MEMORY=y
 CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+# CONFIG_ADDRESS_MASKING is not set
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
@@ -815,6 +814,7 @@ CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
 CONFIG_MMU_GATHER_TABLE_FREE=y
 CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
 CONFIG_MMU_GATHER_MERGE_VMAS=y
+CONFIG_MMU_LAZY_TLB_REFCOUNT=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_HAS_NMI_SAFE_THIS_CPU_OPS=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
@@ -919,6 +919,8 @@ CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULE_SIG_FORMAT=y
 CONFIG_MODULES=y
+CONFIG_MODULE_DEBUGFS=y
+# CONFIG_MODULE_DEBUG is not set
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
@@ -946,6 +948,7 @@ CONFIG_BLOCK=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
 CONFIG_BLK_RQ_ALLOC_TIME=y
 CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_ICQ=y
 CONFIG_BLK_DEV_BSGLIB=y
@@ -994,7 +997,6 @@ CONFIG_EFI_PARTITION=y
 
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_MQ_RDMA=y
 CONFIG_BLK_PM=y
 CONFIG_BLOCK_HOLDER_DEPRECATED=y
 CONFIG_BLK_MQ_STACKING=y
@@ -1080,6 +1082,7 @@ CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_ARCH_WANT_OPTIMIZE_VMEMMAP=y
 CONFIG_HAVE_FAST_GUP=y
 CONFIG_NUMA_KEEP_MEMINFO=y
 CONFIG_MEMORY_ISOLATION=y
@@ -1147,6 +1150,7 @@ CONFIG_ARCH_HAS_PKEYS=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
+# CONFIG_DMAPOOL_TEST is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_MAPPING_DIRTY_HELPERS=y
 CONFIG_SECRETMEM=y
@@ -1158,6 +1162,8 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 CONFIG_LRU_GEN=y
 CONFIG_LRU_GEN_ENABLED=y
 # CONFIG_LRU_GEN_STATS is not set
+CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
+CONFIG_PER_VMA_LOCK=y
 
 #
 # Data Access Monitoring
@@ -1210,6 +1216,7 @@ CONFIG_SMC=m
 CONFIG_SMC_DIAG=m
 CONFIG_XDP_SOCKETS=y
 CONFIG_XDP_SOCKETS_DIAG=m
+CONFIG_NET_HANDSHAKE=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -1319,6 +1326,7 @@ CONFIG_NETFILTER_SKIP_EGRESS=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_FAMILY_BRIDGE=y
 CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_BPF_LINK=y
 CONFIG_NETFILTER_NETLINK_HOOK=m
 CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
@@ -1890,6 +1898,7 @@ CONFIG_NET_NCSI=y
 CONFIG_NCSI_OEM_CMD_GET_MAC=y
 CONFIG_NCSI_OEM_CMD_KEEP_PHY=y
 CONFIG_PCPU_DEV_REFCNT=y
+CONFIG_MAX_SKB_FRAGS=17
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_SOCK_RX_QUEUE_MAPPING=y
@@ -2000,6 +2009,7 @@ CONFIG_BT_MTKSDIO=m
 CONFIG_BT_MTKUART=m
 CONFIG_BT_HCIRSI=m
 CONFIG_BT_VIRTIO=m
+# CONFIG_BT_NXPUART is not set
 # end of Bluetooth device drivers
 
 CONFIG_AF_RXRPC=m
@@ -2117,7 +2127,7 @@ CONFIG_NET_SELFTESTS=m
 CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
 CONFIG_PAGE_POOL=y
-# CONFIG_PAGE_POOL_STATS is not set
+CONFIG_PAGE_POOL_STATS=y
 CONFIG_FAILOVER=m
 CONFIG_ETHTOOL_NETLINK=y
 
@@ -2176,24 +2186,24 @@ CONFIG_VMD=m
 CONFIG_PCI_HYPERV_INTERFACE=m
 
 #
-# DesignWare PCI Core Support
+# Cadence-based PCIe controllers
+#
+# end of Cadence-based PCIe controllers
+
+#
+# DesignWare-based PCIe controllers
 #
 CONFIG_PCIE_DW=y
 CONFIG_PCIE_DW_HOST=y
+CONFIG_PCI_MESON=y
 CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_DW_PLAT_HOST=y
-CONFIG_PCI_MESON=y
-# end of DesignWare PCI Core Support
+# end of DesignWare-based PCIe controllers
 
 #
-# Mobiveil PCIe Core Support
+# Mobiveil-based PCIe controllers
 #
-# end of Mobiveil PCIe Core Support
-
-#
-# Cadence PCIe controllers support
-#
-# end of Cadence PCIe controllers support
+# end of Mobiveil-based PCIe controllers
 # end of PCI controller drivers
 
 #
@@ -2252,6 +2262,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_DEBUG=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_FW_LOADER_SYSFS=y
 CONFIG_EXTRA_FIRMWARE=""
@@ -2288,6 +2299,7 @@ CONFIG_REGMAP_SCCB=m
 CONFIG_REGMAP_SPI_AVMM=m
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
+# CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set
 # end of Generic Driver Options
 
 #
@@ -2554,6 +2566,7 @@ CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_VIRTIO_BLK=m
 CONFIG_BLK_DEV_RBD=m
 CONFIG_BLK_DEV_UBLK=m
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
 CONFIG_BLK_DEV_RNBD=y
 CONFIG_BLK_DEV_RNBD_CLIENT=m
 CONFIG_BLK_DEV_RNBD_SERVER=m
@@ -2912,6 +2925,7 @@ CONFIG_PATA_PARPORT=m
 #
 CONFIG_PATA_PARPORT_ATEN=m
 CONFIG_PATA_PARPORT_BPCK=m
+# CONFIG_PATA_PARPORT_BPCK6 is not set
 CONFIG_PATA_PARPORT_COMM=m
 CONFIG_PATA_PARPORT_DSTR=m
 CONFIG_PATA_PARPORT_FIT2=m
@@ -2996,6 +3010,7 @@ CONFIG_TCM_FC=m
 CONFIG_ISCSI_TARGET=m
 CONFIG_ISCSI_TARGET_CXGB4=m
 CONFIG_SBP_TARGET=m
+# CONFIG_REMOTE_TARGET is not set
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -3098,6 +3113,8 @@ CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m
 # CONFIG_NET_DSA_LANTIQ_GSWIP is not set
 CONFIG_NET_DSA_MT7530=m
+CONFIG_NET_DSA_MT7530_MDIO=m
+CONFIG_NET_DSA_MT7530_MMIO=m
 CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
 CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
@@ -3111,6 +3128,7 @@ CONFIG_NET_DSA_MSCC_OCELOT_EXT=m
 CONFIG_NET_DSA_MSCC_SEVILLE=m
 CONFIG_NET_DSA_AR9331=m
 CONFIG_NET_DSA_QCA8K=m
+# CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT is not set
 CONFIG_NET_DSA_SJA1105=m
 CONFIG_NET_DSA_SJA1105_PTP=y
 CONFIG_NET_DSA_SJA1105_TAS=y
@@ -3157,6 +3175,7 @@ CONFIG_PCMCIA_NMCLAN=m
 CONFIG_AMD_XGBE=m
 CONFIG_AMD_XGBE_DCB=y
 CONFIG_AMD_XGBE_HAVE_ECC=y
+# CONFIG_PDS_CORE is not set
 CONFIG_NET_VENDOR_AQUANTIA=y
 CONFIG_AQTION=m
 CONFIG_NET_VENDOR_ARC=y
@@ -3265,7 +3284,6 @@ CONFIG_IGB=m
 CONFIG_IGB_HWMON=y
 CONFIG_IGB_DCA=y
 CONFIG_IGBVF=m
-CONFIG_IXGB=m
 CONFIG_IXGBE=m
 CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCA=y
@@ -3282,10 +3300,6 @@ CONFIG_ICE_SWITCHDEV=y
 CONFIG_ICE_HWTS=y
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_WANGXUN=y
-CONFIG_LIBWX=m
-CONFIG_NGBE=m
-CONFIG_TXGBE=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_ADI=y
 CONFIG_ADIN1110=m
@@ -3467,6 +3481,10 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WANGXUN=y
+CONFIG_LIBWX=m
+CONFIG_NGBE=m
+CONFIG_TXGBE=m
 CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_WIZNET_W5100=m
 CONFIG_WIZNET_W5300=m
@@ -3520,11 +3538,13 @@ CONFIG_MARVELL_88X2222_PHY=m
 CONFIG_MAXLINEAR_GPHY=m
 CONFIG_MEDIATEK_GE_PHY=m
 CONFIG_MICREL_PHY=m
+# CONFIG_MICROCHIP_T1S_PHY is not set
 CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_MOTORCOMM_PHY=m
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_CBTX_PHY is not set
 CONFIG_NXP_C45_TJA11XX_PHY=m
 CONFIG_NXP_TJA11XX_PHY=m
 CONFIG_NCN26000_PHY=m
@@ -3640,6 +3660,7 @@ CONFIG_MDIO_THUNDER=m
 #
 CONFIG_PCS_XPCS=m
 CONFIG_PCS_LYNX=m
+CONFIG_PCS_MTK_LYNXI=m
 CONFIG_PCS_ALTERA_TSE=m
 # end of PCS device drivers
 
@@ -3987,18 +4008,22 @@ CONFIG_RTL8XXXU_UNTESTED=y
 CONFIG_RTW88=m
 CONFIG_RTW88_CORE=m
 CONFIG_RTW88_PCI=m
+CONFIG_RTW88_SDIO=m
 CONFIG_RTW88_USB=m
 CONFIG_RTW88_8822B=m
 CONFIG_RTW88_8822C=m
 CONFIG_RTW88_8723D=m
 CONFIG_RTW88_8821C=m
 CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822BS=m
 CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8822CS=m
 CONFIG_RTW88_8822CU=m
 CONFIG_RTW88_8723DE=m
 CONFIG_RTW88_8723DU=m
 CONFIG_RTW88_8821CE=m
+CONFIG_RTW88_8821CS=m
 CONFIG_RTW88_8821CU=m
 CONFIG_RTW88_DEBUG=y
 CONFIG_RTW88_DEBUGFS=y
@@ -4043,8 +4068,8 @@ CONFIG_QTNFMAC=m
 CONFIG_QTNFMAC_PCIE=m
 CONFIG_PCMCIA_RAYCS=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_MAC80211_HWSIM=m
 CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_MAC80211_HWSIM=m
 CONFIG_VIRT_WIFI=m
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
@@ -4285,6 +4310,7 @@ CONFIG_TOUCHSCREEN_MMS114=m
 CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
 CONFIG_TOUCHSCREEN_MSG2638=m
 CONFIG_TOUCHSCREEN_MTOUCH=m
+# CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS is not set
 CONFIG_TOUCHSCREEN_IMAGIS=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
@@ -4532,6 +4558,7 @@ CONFIG_MOXA_INTELLIO=m
 CONFIG_MOXA_SMARTIO=m
 CONFIG_SYNCLINK_GT=m
 CONFIG_N_HDLC=m
+CONFIG_IPWIRELESS=m
 CONFIG_N_GSM=m
 CONFIG_NOZOMI=m
 CONFIG_NULL_TTY=m
@@ -4567,17 +4594,6 @@ CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM_XIPHERA=m
 CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_SCR24X=m
-CONFIG_IPWIRELESS=m
-# end of PCMCIA character devices
-
 CONFIG_MWAVE=m
 CONFIG_DEVMEM=y
 CONFIG_NVRAM=y
@@ -4679,7 +4695,6 @@ CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
-CONFIG_I2C_DESIGNWARE_AMDPSP=y
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
 CONFIG_I2C_DESIGNWARE_PCI=y
 CONFIG_I2C_EMEV2=m
@@ -4742,7 +4757,6 @@ CONFIG_SPI_DW_DMA=y
 CONFIG_SPI_DW_PCI=m
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DLN2=m
-CONFIG_SPI_NXP_FLEXSPI=m
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_INTEL=m
 CONFIG_SPI_INTEL_PCI=m
@@ -4755,7 +4769,6 @@ CONFIG_SPI_OC_TINY=m
 CONFIG_SPI_PCI1XXXX=m
 CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_PCI=m
-# CONFIG_SPI_ROCKCHIP is not set
 CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_SIFIVE=m
 CONFIG_SPI_MXIC=m
@@ -4808,6 +4821,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
 CONFIG_PTP_1588_CLOCK_OCP=m
+# CONFIG_PTP_DFL_TOD is not set
 # end of PTP clock support
 
 CONFIG_PINCTRL=y
@@ -4898,6 +4912,7 @@ CONFIG_GPIO_WS16C48=m
 #
 # I2C GPIO expanders
 #
+# CONFIG_GPIO_FXL6408 is not set
 CONFIG_GPIO_MAX7300=m
 CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_PCA953X=m
@@ -4917,6 +4932,7 @@ CONFIG_GPIO_CRYSTAL_COVE=m
 CONFIG_GPIO_DA9052=m
 CONFIG_GPIO_DA9055=m
 CONFIG_GPIO_DLN2=m
+# CONFIG_GPIO_ELKHARTLAKE is not set
 CONFIG_GPIO_JANZ_TTL=m
 CONFIG_GPIO_KEMPLD=m
 CONFIG_GPIO_LP3943=m
@@ -5233,6 +5249,7 @@ CONFIG_SENSORS_OXP=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
+# CONFIG_SENSORS_ACBEL_FSG032 is not set
 CONFIG_SENSORS_ADM1266=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_BEL_PFE=m
@@ -5392,7 +5409,6 @@ CONFIG_PROC_THERMAL_MMIO_RAPL=m
 CONFIG_INTEL_BXT_PMIC_THERMAL=m
 CONFIG_INTEL_PCH_THERMAL=m
 CONFIG_INTEL_TCC_COOLING=m
-CONFIG_INTEL_MENLOW=m
 CONFIG_INTEL_HFI_THERMAL=y
 # end of Intel thermal drivers
 
@@ -5720,10 +5736,12 @@ CONFIG_REGULATOR_PV88090=m
 CONFIG_REGULATOR_PWM=m
 CONFIG_REGULATOR_RC5T583=m
 CONFIG_REGULATOR_RT4801=m
+# CONFIG_REGULATOR_RT4803 is not set
 CONFIG_REGULATOR_RT4831=m
 CONFIG_REGULATOR_RT5033=m
 CONFIG_REGULATOR_RT5120=m
 CONFIG_REGULATOR_RT5190A=m
+# CONFIG_REGULATOR_RT5739 is not set
 CONFIG_REGULATOR_RT5759=m
 CONFIG_REGULATOR_RT6160=m
 CONFIG_REGULATOR_RT6190=m
@@ -5841,7 +5859,6 @@ CONFIG_V4L2_FWNODE=m
 CONFIG_V4L2_ASYNC=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
 # end of Video4Linux options
 
 #
@@ -6295,15 +6312,12 @@ CONFIG_VIDEO_IMX319=m
 CONFIG_VIDEO_IMX355=m
 CONFIG_VIDEO_MAX9271_LIB=m
 CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
 CONFIG_VIDEO_MT9M111=m
 CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
-CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 CONFIG_VIDEO_OV02A10=m
 CONFIG_VIDEO_OV08D10=m
@@ -6340,12 +6354,8 @@ CONFIG_VIDEO_RJ54N1=m
 CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K6AA=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_VS6624=m
 CONFIG_VIDEO_CCS=m
 CONFIG_VIDEO_ET8EK8=m
-CONFIG_VIDEO_M5MOLS=m
 # end of Camera sensor devices
 
 #
@@ -6621,6 +6631,7 @@ CONFIG_DVB_DUMMY_FE=m
 # Graphics support
 #
 CONFIG_APERTURE_HELPERS=y
+CONFIG_VIDEO_CMDLINE=y
 CONFIG_VIDEO_NOMODESET=y
 CONFIG_AGP=y
 CONFIG_AGP_AMD64=m
@@ -6649,6 +6660,7 @@ CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_TTM_HELPER=m
 CONFIG_DRM_GEM_DMA_HELPER=m
 CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_SUBALLOC_HELPER=m
 CONFIG_DRM_SCHED=m
 
 #
@@ -6682,8 +6694,7 @@ CONFIG_DRM_AMD_ACP=y
 # Display Engine Configuration
 #
 CONFIG_DRM_AMD_DC=y
-CONFIG_DRM_AMD_DC_DCN=y
-CONFIG_DRM_AMD_DC_HDCP=y
+CONFIG_DRM_AMD_DC_FP=y
 CONFIG_DRM_AMD_DC_SI=y
 CONFIG_DRM_AMD_SECURE_DISPLAY=y
 # end of Display Engine Configuration
@@ -6724,6 +6735,7 @@ CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
 CONFIG_DRM_QXL=m
 CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_VIRTIO_GPU_KMS=y
 CONFIG_DRM_PANEL=y
 
 #
@@ -6775,7 +6787,6 @@ CONFIG_DRM_PRIVACY_SCREEN=y
 #
 # Frame buffer Devices
 #
-CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
@@ -6834,7 +6845,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_VIRTUAL is not set
-CONFIG_XEN_FBDEV_FRONTEND=m
+# CONFIG_XEN_FBDEV_FRONTEND is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_HYPERV is not set
@@ -6907,7 +6918,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
-CONFIG_BOOTSPLASH=y
 # end of Console display driver support
 
 # CONFIG_LOGO is not set
@@ -6916,6 +6926,7 @@ CONFIG_BOOTSPLASH=y
 CONFIG_DRM_ACCEL=y
 CONFIG_DRM_ACCEL_HABANALABS=m
 CONFIG_DRM_ACCEL_IVPU=m
+# CONFIG_DRM_ACCEL_QAIC is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
@@ -7330,6 +7341,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE=m
 CONFIG_SND_SOC_SOF_INTEL_MTL=m
 CONFIG_SND_SOC_SOF_METEORLAKE=m
 CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_MLINK=m
 CONFIG_SND_SOC_SOF_HDA_LINK=y
 CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
 CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
@@ -7397,6 +7409,9 @@ CONFIG_SND_SOC_CS35L41_I2C=m
 CONFIG_SND_SOC_CS35L45=m
 CONFIG_SND_SOC_CS35L45_SPI=m
 CONFIG_SND_SOC_CS35L45_I2C=m
+# CONFIG_SND_SOC_CS35L56_I2C is not set
+# CONFIG_SND_SOC_CS35L56_SPI is not set
+# CONFIG_SND_SOC_CS35L56_SDW is not set
 CONFIG_SND_SOC_CS42L42_CORE=m
 CONFIG_SND_SOC_CS42L42=m
 CONFIG_SND_SOC_CS42L42_SDW=m
@@ -7444,6 +7459,7 @@ CONFIG_SND_SOC_MAX98504=m
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
 CONFIG_SND_SOC_MAX98520=m
+# CONFIG_SND_SOC_MAX98363 is not set
 CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_I2C=m
 CONFIG_SND_SOC_MAX98373_SDW=m
@@ -7508,6 +7524,7 @@ CONFIG_SND_SOC_RT711=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT712_SDCA_SDW=m
+# CONFIG_SND_SOC_RT712_SDCA_DMIC_SDW is not set
 CONFIG_SND_SOC_RT715=m
 CONFIG_SND_SOC_RT715_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
@@ -7783,6 +7800,7 @@ CONFIG_USB_HIDDEV=y
 
 CONFIG_I2C_HID=m
 CONFIG_I2C_HID_ACPI=m
+# CONFIG_I2C_HID_OF is not set
 CONFIG_I2C_HID_CORE=m
 
 #
@@ -7851,7 +7869,6 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PCI=y
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_UHCI_HCD=y
-CONFIG_USB_U132_HCD=m
 CONFIG_USB_SL811_HCD=m
 # CONFIG_USB_SL811_HCD_ISO is not set
 CONFIG_USB_SL811_CS=m
@@ -7970,7 +7987,6 @@ CONFIG_USB_ISP1760_DUAL_ROLE=y
 #
 # USB port drivers
 #
-CONFIG_USB_USS720=m
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_CONSOLE=y
 CONFIG_USB_SERIAL_GENERIC=y
@@ -8032,6 +8048,7 @@ CONFIG_USB_SERIAL_DEBUG=m
 #
 # USB Miscellaneous drivers
 #
+CONFIG_USB_USS720=m
 CONFIG_USB_EMI62=m
 CONFIG_USB_EMI26=m
 CONFIG_USB_ADUTUX=m
@@ -8041,7 +8058,6 @@ CONFIG_USB_LCD=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
 CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_APPLE_MFI_FASTCHARGE=m
 CONFIG_USB_SISUSBVGA=m
@@ -8317,6 +8333,7 @@ CONFIG_LEDS_DA9052=m
 CONFIG_LEDS_DAC124S085=m
 CONFIG_LEDS_PWM=m
 CONFIG_LEDS_REGULATOR=m
+# CONFIG_LEDS_BD2606MVV is not set
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
@@ -8346,6 +8363,7 @@ CONFIG_LEDS_TPS6105X=m
 #
 CONFIG_LEDS_AS3645A=m
 CONFIG_LEDS_LM3601X=m
+# CONFIG_LEDS_MT6370_FLASH is not set
 CONFIG_LEDS_RT8515=m
 CONFIG_LEDS_SGM3140=m
 
@@ -8353,6 +8371,7 @@ CONFIG_LEDS_SGM3140=m
 # RGB LED drivers
 #
 CONFIG_LEDS_PWM_MULTICOLOR=m
+# CONFIG_LEDS_MT6370_RGB is not set
 
 #
 # LED Triggers
@@ -8366,7 +8385,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_ACTIVITY=m
-CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 
 #
@@ -8726,6 +8744,7 @@ CONFIG_ALIBABA_ENI_VDPA=m
 CONFIG_SNET_VDPA=m
 CONFIG_VHOST_IOTLB=m
 CONFIG_VHOST_RING=m
+CONFIG_VHOST_TASK=y
 CONFIG_VHOST=m
 CONFIG_VHOST_MENU=y
 CONFIG_VHOST_NET=m
@@ -8738,6 +8757,7 @@ CONFIG_VHOST_VDPA=m
 # Microsoft Hyper-V guest support
 #
 CONFIG_HYPERV=m
+# CONFIG_HYPERV_VTL_MODE is not set
 CONFIG_HYPERV_TIMER=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_BALLOON=m
@@ -8837,14 +8857,6 @@ CONFIG_AD5933=m
 # end of Network Analyzer, Impedance Converters
 
 #
-# Active energy metering IC
-#
-CONFIG_ADE7854=m
-CONFIG_ADE7854_I2C=m
-CONFIG_ADE7854_SPI=m
-# end of Active energy metering IC
-
-#
 # Resolver to digital converters
 #
 CONFIG_AD2S1210=m
@@ -8853,7 +8865,17 @@ CONFIG_AD2S1210=m
 
 # CONFIG_FB_SM750 is not set
 CONFIG_STAGING_MEDIA=y
-# CONFIG_INTEL_ATOMISP is not set
+CONFIG_INTEL_ATOMISP=y
+CONFIG_VIDEO_ATOMISP=m
+CONFIG_VIDEO_ATOMISP_ISP2401=y
+CONFIG_VIDEO_ATOMISP_OV2722=m
+CONFIG_VIDEO_ATOMISP_GC2235=m
+CONFIG_VIDEO_ATOMISP_MSRLIST_HELPER=m
+CONFIG_VIDEO_ATOMISP_MT9M114=m
+CONFIG_VIDEO_ATOMISP_GC0310=m
+CONFIG_VIDEO_ATOMISP_OV2680=m
+CONFIG_VIDEO_ATOMISP_OV5693=m
+CONFIG_VIDEO_ATOMISP_LM3554=m
 CONFIG_DVB_AV7110_IR=y
 CONFIG_DVB_AV7110=m
 CONFIG_DVB_AV7110_OSD=y
@@ -8926,7 +8948,6 @@ CONFIG_ACPI_WMI=m
 CONFIG_WMI_BMOF=m
 CONFIG_HUAWEI_WMI=m
 CONFIG_MXM_WMI=m
-CONFIG_PEAQ_WMI=m
 CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
 CONFIG_XIAOMI_WMI=m
 CONFIG_GIGABYTE_WMI=m
@@ -8974,6 +8995,7 @@ CONFIG_HP_WMI=m
 CONFIG_WIRELESS_HOTKEY=m
 CONFIG_IBM_RTL=m
 CONFIG_IDEAPAD_LAPTOP=m
+# CONFIG_LENOVO_YMC is not set
 CONFIG_SENSORS_HDAPS=m
 CONFIG_THINKPAD_ACPI=m
 CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
@@ -8985,7 +9007,6 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_THINKPAD_LMI=m
 CONFIG_INTEL_ATOMISP2_PDX86=y
 CONFIG_INTEL_ATOMISP2_LED=m
-CONFIG_INTEL_ATOMISP2_PM=m
 CONFIG_INTEL_IFS=m
 CONFIG_INTEL_SAR_INT1092=m
 CONFIG_INTEL_SKL_INT3472=m
@@ -8997,6 +9018,7 @@ CONFIG_INTEL_PMT_CRASHLOG=m
 #
 # Intel Speed Select Technology interface support
 #
+CONFIG_INTEL_SPEED_SELECT_TPMI=m
 CONFIG_INTEL_SPEED_SELECT_INTERFACE=m
 # end of Intel Speed Select Technology interface support
 
@@ -9016,6 +9038,7 @@ CONFIG_INTEL_VBTN=m
 CONFIG_INTEL_INT0002_VGPIO=m
 CONFIG_INTEL_OAKTRAIL=m
 CONFIG_INTEL_BXTWC_PMIC_TMU=m
+# CONFIG_INTEL_BYTCRC_PWRSRC is not set
 CONFIG_INTEL_CHTDC_TI_PWRBTN=m
 CONFIG_INTEL_CHTWC_INT33FE=m
 CONFIG_INTEL_ISHTP_ECLITE=m
@@ -9027,6 +9050,7 @@ CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_INTEL_TPMI=m
 CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_VSEC=m
+# CONFIG_MSI_EC is not set
 CONFIG_MSI_LAPTOP=m
 CONFIG_MSI_WMI=m
 CONFIG_PCENGINES_APU2=m
@@ -9089,7 +9113,6 @@ CONFIG_MAILBOX=y
 CONFIG_PCC=y
 CONFIG_ALTERA_MBOX=m
 CONFIG_IOMMU_IOVA=y
-CONFIG_IOASID=y
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
 
@@ -9143,6 +9166,7 @@ CONFIG_SOUNDWIRE=m
 #
 # SoundWire Devices
 #
+# CONFIG_SOUNDWIRE_AMD is not set
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE_INTEL=m
 CONFIG_SOUNDWIRE_QCOM=m
@@ -9387,6 +9411,7 @@ CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
 CONFIG_TI_ADS7924=m
+# CONFIG_TI_ADS1100 is not set
 CONFIG_TI_ADS7950=m
 CONFIG_TI_ADS8344=m
 CONFIG_TI_ADS8688=m
@@ -9681,6 +9706,7 @@ CONFIG_ISL29125=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_PROX=m
 CONFIG_JSA1212=m
+# CONFIG_ROHM_BU27034 is not set
 CONFIG_RPR0521=m
 CONFIG_SENSORS_LM3533=m
 CONFIG_LTR501=m
@@ -9982,6 +10008,14 @@ CONFIG_DEV_DAX_HMEM_DEVICES=y
 CONFIG_DEV_DAX_KMEM=m
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
+
+#
+# Layout Types
+#
+# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
+# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
+# end of Layout Types
+
 CONFIG_NVMEM_RAVE_SP_EEPROM=m
 CONFIG_NVMEM_RMEM=m
 
@@ -10086,9 +10120,11 @@ CONFIG_JFS_SECURITY=y
 CONFIG_JFS_STATISTICS=y
 CONFIG_XFS_FS=m
 CONFIG_XFS_SUPPORT_V4=y
+CONFIG_XFS_SUPPORT_ASCII_CI=y
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_RT=y
+CONFIG_XFS_DRAIN_INTENTS=y
 CONFIG_XFS_ONLINE_SCRUB=y
 CONFIG_XFS_ONLINE_REPAIR=y
 # CONFIG_XFS_WARN is not set
@@ -10143,7 +10179,6 @@ CONFIG_FANOTIFY=y
 CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
 # CONFIG_QUOTA_DEBUG is not set
 CONFIG_QUOTA_TREE=m
 CONFIG_QFMT_V1=m
@@ -10223,7 +10258,6 @@ CONFIG_TMPFS_XATTR=y
 CONFIG_TMPFS_INODE64=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
-CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y
 CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y
 # CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set
 CONFIG_MEMFD_CREATE=y
@@ -10404,7 +10438,7 @@ CONFIG_SMB_SERVER=m
 CONFIG_SMB_SERVER_SMBDIRECT=y
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
 CONFIG_SMB_SERVER_KERBEROS5=y
-CONFIG_SMBFS_COMMON=m
+CONFIG_SMBFS=m
 CONFIG_CODA_FS=m
 CONFIG_AFS_FS=m
 # CONFIG_AFS_DEBUG is not set
@@ -10466,7 +10500,6 @@ CONFIG_NLS_MAC_ROMANIAN=m
 CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
-# CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM_DEBUG=y
 CONFIG_UNICODE=y
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
@@ -10501,10 +10534,8 @@ CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-# CONFIG_SECURITY_SELINUX_DISABLE is not set
 CONFIG_SECURITY_SELINUX_DEVELOP=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
 CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
 CONFIG_SECURITY_SMACK=y
@@ -10541,6 +10572,7 @@ CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
 CONFIG_INTEGRITY_TRUSTED_KEYRING=y
 CONFIG_INTEGRITY_PLATFORM_KEYRING=y
 CONFIG_INTEGRITY_MACHINE_KEYRING=y
+# CONFIG_INTEGRITY_CA_MACHINE_KEYRING is not set
 CONFIG_LOAD_UEFI_KEYS=y
 CONFIG_INTEGRITY_AUDIT=y
 # CONFIG_IMA is not set
@@ -10815,6 +10847,8 @@ CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_SP_PSP=y
 CONFIG_CRYPTO_DEV_CCP_DEBUGFS=y
+CONFIG_CRYPTO_DEV_NITROX=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_QAT=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_C3XXX=m
@@ -10823,8 +10857,6 @@ CONFIG_CRYPTO_DEV_QAT_4XXX=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
-CONFIG_CRYPTO_DEV_NITROX=m
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
@@ -10965,6 +10997,7 @@ CONFIG_INTERVAL_TREE_SPAN_ITER=y
 CONFIG_XARRAY_MULTI=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
 CONFIG_DMA_OPS=y
@@ -11071,9 +11104,9 @@ CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 CONFIG_DEBUG_INFO_DWARF5=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
-CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
+# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set
 # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
-# CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
+CONFIG_DEBUG_INFO_COMPRESSED_ZSTD=y
 # CONFIG_DEBUG_INFO_SPLIT is not set
 CONFIG_DEBUG_INFO_BTF=y
 CONFIG_PAHOLE_HAS_SPLIT_BTF=y
@@ -11138,6 +11171,7 @@ CONFIG_PTDUMP_CORE=y
 # CONFIG_PTDUMP_DEBUGFS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_PER_VMA_LOCK_STATS is not set
 # CONFIG_DEBUG_OBJECTS is not set
 CONFIG_SHRINKER_DEBUG=y
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -11316,6 +11350,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 CONFIG_FTRACE_MCOUNT_USE_CC=y
 CONFIG_TRACING_MAP=y
 CONFIG_SYNTH_EVENTS=y
+# CONFIG_USER_EVENTS is not set
 CONFIG_HIST_TRIGGERS=y
 # CONFIG_TRACE_EVENT_INJECT is not set
 # CONFIG_TRACEPOINT_BENCHMARK is not set
diff --git a/hid-asus-rog-ally.patch b/hid-asus-rog-ally.patch
index b75540bcee5b..8c763c6e8034 100644
--- a/hid-asus-rog-ally.patch
+++ b/hid-asus-rog-ally.patch
@@ -1,12 +1,17 @@
 diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
-index 01a27579ec02..cbdf8e1c6960 100644
+index d1094bb1aa42..47fb048bb5fd 100644
 --- a/drivers/hid/hid-asus.c
 +++ b/drivers/hid/hid-asus.c
-@@ -911,6 +911,11 @@ static int asus_input_mapping(struct hid_device *hdev,
+@@ -910,6 +910,16 @@ static int asus_input_mapping(struct hid_device *hdev,
  
  		/* Fn+Right Aura mode next on N-Key keyboard */
  		case 0xb3: asus_map_key_clear(KEY_PROG3);		break;
 +		
++		case 0xa0: asus_map_key_clear(KEY_F10);		break; /* ROG Ally back paddle + A */
++		case 0xa1: asus_map_key_clear(KEY_F11);		break;
++		case 0xa2: asus_map_key_clear(KEY_F12);		break; /* ROG Ally back paddle + D Pad Up */
++		case 0xa3: asus_map_key_clear(KEY_F13);		break;
++		case 0xa4: asus_map_key_clear(KEY_F14);		break; /* ROG Ally back paddle + Y */
 +		case 0xa5: asus_map_key_clear(KEY_F15);		break; /* ROG Ally left back */
 +		case 0xa6: asus_map_key_clear(KEY_F16);		break; /* ROG Ally QAM button */
 +		case 0xa7: asus_map_key_clear(KEY_F17);		break; /* ROG Ally ROG long-press */
@@ -14,7 +19,7 @@ index 01a27579ec02..cbdf8e1c6960 100644
  
  		default:
  			/* ASUS lazily declares 256 usages, ignore the rest,
-@@ -1268,6 +1273,9 @@ static const struct hid_device_id asus_devices[] = {
+@@ -1267,6 +1277,9 @@ static const struct hid_device_id asus_devices[] = {
  	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
  	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2),
  	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
@@ -25,7 +30,7 @@ index 01a27579ec02..cbdf8e1c6960 100644
  	    USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD),
  	  QUIRK_ROG_CLAYMORE_II_KEYBOARD },
 diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index 5d29abac2300..bf2a125f3d61 100644
+index c2e9b6d1fd7d..cd6efa46a2bd 100644
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
 @@ -207,6 +207,7 @@
diff --git a/rog-ally-bluetooth.patch b/rog-ally-bluetooth.patch
new file mode 100644
index 000000000000..e4461e989c9b
--- /dev/null
+++ b/rog-ally-bluetooth.patch
@@ -0,0 +1,22 @@
+---
+ drivers/bluetooth/btusb.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index 2a8e2bb038f5..7427da184fe0 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -613,6 +613,9 @@ static const struct usb_device_id blacklist_table[] = {
+ 	{ USB_DEVICE(0x0489, 0xe0d9), .driver_info = BTUSB_MEDIATEK |
+ 						     BTUSB_WIDEBAND_SPEECH |
+ 						     BTUSB_VALID_LE_STATES },
++	{ USB_DEVICE(0x0489, 0xe0f5), .driver_info = BTUSB_MEDIATEK |
++						     BTUSB_WIDEBAND_SPEECH |
++						     BTUSB_VALID_LE_STATES },
+ 	{ USB_DEVICE(0x13d3, 0x3568), .driver_info = BTUSB_MEDIATEK |
+ 						     BTUSB_WIDEBAND_SPEECH |
+ 						     BTUSB_VALID_LE_STATES },
+-- 
+2.41.0
+
+  
\ No newline at end of file