A handful of fixes in and around documentation. Some funky quotes in

LICENSES/dual/CC-BY-4.0 were giving spdxcheck.py grief; that has been
 fixed on both ends.  Also a couple of features updates and one docs
 build fix.
 -----BEGIN PGP SIGNATURE-----
 
 iQFDBAABCAAtFiEEIw+MvkEiF49krdp9F0NaE2wMflgFAmDwLAoPHGNvcmJldEBs
 d24ubmV0AAoJEBdDWhNsDH5YH+8H/05/iBOOJN33ibZp52A8NWkNx9XYt17hWalg
 DzB/q06v2uKyeV1+0H5/wH8arSwbgTxXdxMfTFlz6bcDMYYA1qq9A+3V9fxLBy9L
 7rYMjfDLXVJJHeAAmOcvGLQKUCBCFQhFzX4A/KT83Lt8k1+BhRNoGaocrq1E7mmW
 /2f6l9mXi0kGcw/ndZlKkHvE8k6jkSnOpQ2WObtfXZV6YQmpsQetWA4XmyYj9aev
 EnqG+L4yLQP2tC9EfvQFdaxrsFD5MUqmbqXmmHt5mNhDhMGj4BFN/mGv5gmTz9+h
 cvUfRZU2N4dKqJ9WUlLP7kpym+3vohJGfh6cRC2unzCw9ppB2xQ=
 =DK57
 -----END PGP SIGNATURE-----

Merge tag 'docs-5.14-2' of git://git.lwn.net/linux

Pull documentation fixes from Jonathan Corbet:
 "A handful of fixes in and around documentation.

  Some funky quotes in LICENSES/dual/CC-BY-4.0 were giving spdxcheck.py
  grief; that has been fixed on both ends. Also a couple of features
  updates and one docs build fix"

* tag 'docs-5.14-2' of git://git.lwn.net/linux:
  docs/zh_CN: add a missing space character
  Documentation/features: Add THREAD_INFO_IN_TASK feature matrix
  Documentation/features: Update the ARCH_HAS_TICK_BROADCAST entry
  LICENSES/dual/CC-BY-4.0: Git rid of "smart quotes"
  scripts/spdxcheck.py: Strictly read license files in utf-8
This commit is contained in:
Linus Torvalds 2021-07-16 13:35:04 -07:00
Родитель 0d18c12b28 530c4374e2
Коммит 872f8edeb6
5 изменённых файлов: 37 добавлений и 5 удалений

Просмотреть файл

@ -0,0 +1,32 @@
#
# Feature name: thread-info-in-task
# Kconfig: THREAD_INFO_IN_TASK
# description: arch makes use of the core kernel facility to embedd thread_info in task_struct
#
-----------------------
| arch |status|
-----------------------
| alpha: | TODO |
| arc: | TODO |
| arm: | TODO |
| arm64: | ok |
| csky: | TODO |
| h8300: | TODO |
| hexagon: | TODO |
| ia64: | TODO |
| m68k: | TODO |
| microblaze: | TODO |
| mips: | TODO |
| nds32: | ok |
| nios2: | TODO |
| openrisc: | TODO |
| parisc: | TODO |
| powerpc: | ok |
| riscv: | ok |
| s390: | ok |
| sh: | TODO |
| sparc: | TODO |
| um: | TODO |
| x86: | ok |
| xtensa: | TODO |
-----------------------

Просмотреть файл

@ -22,7 +22,7 @@
| openrisc: | TODO | | openrisc: | TODO |
| parisc: | TODO | | parisc: | TODO |
| powerpc: | ok | | powerpc: | ok |
| riscv: | TODO | | riscv: | ok |
| s390: | TODO | | s390: | TODO |
| sh: | ok | | sh: | ok |
| sparc: | TODO | | sparc: | TODO |

Просмотреть файл

@ -47,7 +47,7 @@
(顺便说一句,值得注意的是,合并窗口期间集成的更改并不是凭空产生的;它们是经 (顺便说一句,值得注意的是,合并窗口期间集成的更改并不是凭空产生的;它们是经
提前收集、测试和分级的。稍后将详细描述该过程的工作方式。) 提前收集、测试和分级的。稍后将详细描述该过程的工作方式。)
合并窗口持续大约两周。在这段时间结束时LinusTorvalds将声明窗口已关闭 合并窗口持续大约两周。在这段时间结束时Linus Torvalds将声明窗口已关闭
释放第一个“rc”内核。例如对于目标为5.6的内核,在合并窗口结束时发生的释放 释放第一个“rc”内核。例如对于目标为5.6的内核,在合并窗口结束时发生的释放
将被称为5.6-rc1。-rc1 版本是一个信号,表示合并新特性的时间已经过去,稳定下一 将被称为5.6-rc1。-rc1 版本是一个信号,表示合并新特性的时间已经过去,稳定下一
个内核的时间已经到来。 个内核的时间已经到来。
@ -168,7 +168,7 @@ Greg Kroah-Hartman领导。稳定团队将使用5.x.y编号方案不定期地发
补丁如何进入内核 补丁如何进入内核
---------------- ----------------
只有一个人可以将补丁合并到主线内核存储库中LinusTorvalds。但是在进入 只有一个人可以将补丁合并到主线内核存储库中Linus Torvalds。但是在进入
2.6.38内核的9500多个补丁中只有112个大约1.3%是由Linus自己直接选择的。 2.6.38内核的9500多个补丁中只有112个大约1.3%是由Linus自己直接选择的。
内核项目已经发展到一个没有一个开发人员可以在没有支持的情况下检查和选择每个 内核项目已经发展到一个没有一个开发人员可以在没有支持的情况下检查和选择每个
补丁的规模。内核开发人员处理这种增长的方式是使用围绕信任链构建的助理系统。 补丁的规模。内核开发人员处理这种增长的方式是使用围绕信任链构建的助理系统。

Просмотреть файл

@ -392,7 +392,7 @@ Section 8 -- Interpretation.
Creative Commons is not a party to its public Creative Commons is not a party to its public
licenses. Notwithstanding, Creative Commons may elect to apply one of licenses. Notwithstanding, Creative Commons may elect to apply one of
its public licenses to material it publishes and in those instances its public licenses to material it publishes and in those instances
will be considered the “Licensor.” The text of the Creative Commons will be considered the "Licensor." The text of the Creative Commons
public licenses is dedicated to the public domain under the CC0 Public public licenses is dedicated to the public domain under the CC0 Public
Domain Dedication. Except for the limited purpose of indicating that Domain Dedication. Except for the limited purpose of indicating that
material is shared under a Creative Commons public license or as material is shared under a Creative Commons public license or as

Просмотреть файл

@ -44,7 +44,7 @@ def read_spdxdata(repo):
continue continue
exception = None exception = None
for l in open(el.path).readlines(): for l in open(el.path, encoding="utf-8").readlines():
if l.startswith('Valid-License-Identifier:'): if l.startswith('Valid-License-Identifier:'):
lid = l.split(':')[1].strip().upper() lid = l.split(':')[1].strip().upper()
if lid in spdx.licenses: if lid in spdx.licenses: