Resync for linux-5.11.y

README.md

@@ -2,14 +2,15 @@
 
 Patches from [Gentoo-zh/linux-cjktty](https://github.com/Gentoo-zh/linux-cjktty) with minor changes.
 
-**NOTE**: Starting from 5.10, the kernel config option `CONFIG_FONT_16x16_CJK` has been renamed to `CONFIG_FONT_CJK_16x16`.
+**Note**: Starting from 5.10, the kernel config option `CONFIG_FONT_16x16_CJK` has been renamed to `CONFIG_FONT_CJK_16x16`.
 
 ## CHANGES
 
-### 2020.12.31 / 5.11-rc1
+### 2020.02.22 / 5.11
 
 - Resync for linux-5.11.y
-- Update font data to GNU Unifont 13.0.05
+- Update CJK 32x32 font data to GNU Unifont 13.0.06
+- Reduce checkpatch.pl complaints
 - Remove charcount changes since it has been implemented (upstream)
   - [torvalds/linux@4ee5730](https://github.com/torvalds/linux/commit/4ee573086bd88ff3060dda07873bf755d332e9ba)
   - [torvalds/linux@a1ac250](https://github.com/torvalds/linux/commit/a1ac250a82a5e97db71f14101ff7468291a6aaef)
@@ -19,11 +20,11 @@ Patches from [Gentoo-zh/linux-cjktty](https://github.com/Gentoo-zh/linux-cjktty)
 - Resync for linux-5.10.y
 - Update glyphs for some Chinese punctuation marks
 - Support display rotation
-- Support `setfont` (NOTE: different font size can cause issues with this patch which expects to work with `8x16 / 16x32` font)
+- Support `setfont` (Note: different font size can cause issues with this patch which expects to work with 8x16 / 16x32 font)
 - Fix display for some single width characters
 - Fix line wrap for double width characters (<https://github.com/zhmars/cjktty-patches/issues/1>)
 - Workaround from [Gentoo-zh/linux-cjktty@6caf83a](https://github.com/Gentoo-zh/linux-cjktty/commit/6caf83a638886220d1e1880c92e8b18243c3965a)
-- Support `32x32` font size for high resolution screens (experimental, make sure the font data patch is applied)
+- Support 32x32 font size for high resolution screens (experimental, make sure the font data patch is applied)
 
 ### 2020.09.18 / 5.8.10
 

font/cjktty-add-uni32x32-font-data.patch

@@ -1,8 +1,8 @@
 diff --git a/lib/fonts/font_cjk_32x32.c b/lib/fonts/font_cjk_32x32.c
-index 060313f..4496fdf 100644
+index 88ba3f2..f8d7fe2 100644
 --- a/lib/fonts/font_cjk_32x32.c
 +++ b/lib/fonts/font_cjk_32x32.c
-@@ -22,5 +22,5 @@ const struct font_desc font_cjk_32x32 = {
+@@ -23,5 +23,5 @@ const struct font_desc font_cjk_32x32 = {
  	.height	= 32,
  	.charcount	= 65536 * 2,
  	.data	= fontdata_cjk_32x32.data,
@@ -10,10 +10,11 @@ index 060313f..4496fdf 100644
 +	.pref	= 19,
  };
 diff --git a/lib/fonts/font_cjk_32x32.h b/lib/fonts/font_cjk_32x32.h
-index e69de29..d385fc5 100644
+index e69de29..4154baf 100644
 --- a/lib/fonts/font_cjk_32x32.h
 +++ b/lib/fonts/font_cjk_32x32.h
-@@ -0,0 +1,589824 @@
+@@ -0,0 +1,589825 @@
++/* SPDX-License-Identifier: GPL-2.0 */
 +/* 0 0x0 */
 +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f,0xfc,0x7f,0xfc,
 +0x70,0x1c,0x70,0x1c,0x70,0x1c,0x70,0x1c,0x70,0x1c,0x70,0x1c,0x70,0x1c,0x70,0x1c,
@@ -741,7 +742,7 @@ index e69de29..d385fc5 100644
 +0x7f,0xfc,0x7f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 +/* 145 0x91 '‘' */
 +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f,0xf8,0x7f,0xfc,0x03,0x9e,0x03,0x8e,
++0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0xf8,0x7f,0xfc,0x03,0x9e,0x03,0x8e,
 +0x03,0x8e,0x3f,0x8e,0x7f,0xfe,0xf3,0xfe,0xe3,0x80,0xe3,0x80,0xe3,0x80,0xf3,0xce,
 +0x7f,0xfe,0x3e,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 +/* 146 0x92 '’' */