Gentoo Archives: gentoo-user

From: Peter Humphrey <peter@××××××××××××.uk>
To: gentoo-user@l.g.o
Subject: Re: [gentoo-user] Soft scrolling on framebuffer consoles - New version of the patch - with GPM handling.
Date: Fri, 27 Jan 2023 12:24:49
Message-Id: 4776889.GXAFRqVoOG@wstn
In Reply to: Re: [gentoo-user] Soft scrolling on framebuffer consoles - New version of the patch - with GPM handling. by Alan Mackenzie
1 On Thursday, 26 January 2023 20:28:36 GMT Alan Mackenzie wrote:
2
3 --->8
4
5 > Again, on any problems please let me know and I'll try to fix them. As
6 > ever, there are no guarantees, etc., etc., etc. My only promise is that
7 > there's no malicious code in the patch.
8
9 Good news! Well, partly... :)
10
11 I applied the new patch to 5.15.88 and it seems fine. I'll have to test it in
12 use and let you know.
13
14 Patching 6.1.8 failed, though, whereas the previous 5.15.80-scroll.
15 20221212.diff succeeded:
16
17 # patch -p1 < /usr/local/src/5.15.80-GPM.20230126.diff
18 patching file drivers/tty/vt/vt.c
19 Hunk #37 succeeded at 4748 (offset -1 lines).
20 Hunk #38 succeeded at 5049 (offset -1 lines).
21 Hunk #39 FAILED at 5353.
22 1 out of 39 hunks FAILED -- saving rejects to file drivers/tty/vt/vt.c.rej
23 patching file drivers/video/console/Kconfig
24 Hunk #1 succeeded at 99 (offset 1 line).
25 patching file drivers/video/fbdev/core/fbcon.c
26 Hunk #1 succeeded at 3171 (offset 19 lines).
27 patching file include/linux/console_struct.h
28 Hunk #2 FAILED at 170.
29 1 out of 2 hunks FAILED -- saving rejects to file include/linux/
30 console_struct.h.rej
31 patching file include/linux/vt_kern.h
32 Hunk #1 succeeded at 114 (offset -1 lines).
33
34 I've attached the reject files.
35
36 --
37 Regards,
38 Peter.

Attachments

File name MIME type
vt.c.rej text/x-reject
console_struct.h.rej text/x-reject

Replies