Re: [GIT PULL] TTY / Serial driver changes for 6.16-rc1

Greg KH
2025-06-07T06:54:49Z

On Fri, Jun 06, 2025 at 12:36:53PM -0700, Linus Torvalds wrote:
> On Fri, 6 Jun 2025 at 01:39, Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > Here is the big set of tty and serial driver changes for 6.16-rc1.
> > A little more churn than normal in this portion of the kernel for this
> > development cycle, Jiri and Nicholas were busy with cleanups and reviews
> > and fixes for the vt unicode handling logic which composed most of the
> > overall work in here.
>
> That series of "revert one series to re-apply the other" looks
> absolutely disgusting.
>
> I was close to deciding to not pull this at all, because some of it is
> just inexcusably stupid. Lookie here:
>
> git diff d066989a3d41..d066989a3d41^^
> git log -2 --oneline d066989a3d41
>
> and just stare in wonder at the pure unadulterated garbage.

For some of the patches in the beginning of the series, yes, I could
have tried to figure out which ones matches up and had Nicholas respin
things, or picked through and seen what was identical as you show above.
Using b4 made it easier for me to just revert the original series and
add the new one without digging through them. In the end, the overall
diff between the two series was not trivial:

$ git diff --stat cb0ce93c8ba6882c591e7776a258cfd483af5717..c2d2c5c0d631f7de9697870e4eec89289177d445
drivers/tty/vt/Makefile | 29 ++++++++-
drivers/tty/vt/{gen_ucs_recompose.py => gen_ucs_recompose_table.py} | 122 +++++++++-----------------------------
drivers/tty/vt/gen_ucs_width.py | 336 ---------------------------------------------------------------------------------------------------------
drivers/tty/vt/gen_ucs_width_table.py | 307 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/tty/vt/ucs.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/tty/vt/{ucs_recompose.c => ucs_recompose_table.h_shipped} | 88 ++++------------------------
drivers/tty/vt/{ucs_width.c => ucs_width_table.h_shipped} | 111 +++++------------------------------
drivers/tty/vt/vt.c | 101 +++++++++++++++++++-------------
include/linux/consolemap.h | 4 +-
9 files changed, 610 insertions(+), 647 deletions(-)

I blame this on me taking the first series too early, and not waiting
for Jiri's review, and defering to Nicholas which he wanted to do as it
being my fault here, not Nicholas's:
https://lore.kernel.org/all/2EDC209B-7D6B-4EFB-ADD0-58D494D8AF98@fluxnic.net/

Anyway, thanks for taking this, yes, it was a mess, sorry, this was my
mistake.

greg k-h