Skip to content

Commit 872f8ed

Browse files
committed
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
2 parents 0d18c12 + 530c437 commit 872f8ed

File tree

5 files changed

+37
-5
lines changed

5 files changed

+37
-5
lines changed
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#
2+
# Feature name: thread-info-in-task
3+
# Kconfig: THREAD_INFO_IN_TASK
4+
# description: arch makes use of the core kernel facility to embedd thread_info in task_struct
5+
#
6+
-----------------------
7+
| arch |status|
8+
-----------------------
9+
| alpha: | TODO |
10+
| arc: | TODO |
11+
| arm: | TODO |
12+
| arm64: | ok |
13+
| csky: | TODO |
14+
| h8300: | TODO |
15+
| hexagon: | TODO |
16+
| ia64: | TODO |
17+
| m68k: | TODO |
18+
| microblaze: | TODO |
19+
| mips: | TODO |
20+
| nds32: | ok |
21+
| nios2: | TODO |
22+
| openrisc: | TODO |
23+
| parisc: | TODO |
24+
| powerpc: | ok |
25+
| riscv: | ok |
26+
| s390: | ok |
27+
| sh: | TODO |
28+
| sparc: | TODO |
29+
| um: | TODO |
30+
| x86: | ok |
31+
| xtensa: | TODO |
32+
-----------------------

Documentation/features/time/arch-tick-broadcast/arch-support.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
| openrisc: | TODO |
2323
| parisc: | TODO |
2424
| powerpc: | ok |
25-
| riscv: | TODO |
25+
| riscv: | ok |
2626
| s390: | TODO |
2727
| sh: | ok |
2828
| sparc: | TODO |

Documentation/translations/zh_CN/process/2.Process.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
(顺便说一句,值得注意的是,合并窗口期间集成的更改并不是凭空产生的;它们是经
4848
提前收集、测试和分级的。稍后将详细描述该过程的工作方式。)
4949

50-
合并窗口持续大约两周。在这段时间结束时,LinusTorvalds将声明窗口已关闭,并
50+
合并窗口持续大约两周。在这段时间结束时,Linus Torvalds将声明窗口已关闭,并
5151
释放第一个“rc”内核。例如,对于目标为5.6的内核,在合并窗口结束时发生的释放
5252
将被称为5.6-rc1。-rc1 版本是一个信号,表示合并新特性的时间已经过去,稳定下一
5353
个内核的时间已经到来。
@@ -168,7 +168,7 @@ Greg Kroah-Hartman领导。稳定团队将使用5.x.y编号方案不定期地发
168168
补丁如何进入内核
169169
----------------
170170

171-
只有一个人可以将补丁合并到主线内核存储库中:LinusTorvalds。但是,在进入
171+
只有一个人可以将补丁合并到主线内核存储库中:Linus Torvalds。但是,在进入
172172
2.6.38内核的9500多个补丁中,只有112个(大约1.3%)是由Linus自己直接选择的。
173173
内核项目已经发展到一个没有一个开发人员可以在没有支持的情况下检查和选择每个
174174
补丁的规模。内核开发人员处理这种增长的方式是使用围绕信任链构建的助理系统。

LICENSES/dual/CC-BY-4.0

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ Section 8 -- Interpretation.
392392
Creative Commons is not a party to its public
393393
licenses. Notwithstanding, Creative Commons may elect to apply one of
394394
its public licenses to material it publishes and in those instances
395-
will be considered the Licensor. The text of the Creative Commons
395+
will be considered the "Licensor." The text of the Creative Commons
396396
public licenses is dedicated to the public domain under the CC0 Public
397397
Domain Dedication. Except for the limited purpose of indicating that
398398
material is shared under a Creative Commons public license or as

scripts/spdxcheck.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def read_spdxdata(repo):
4444
continue
4545

4646
exception = None
47-
for l in open(el.path).readlines():
47+
for l in open(el.path, encoding="utf-8").readlines():
4848
if l.startswith('Valid-License-Identifier:'):
4949
lid = l.split(':')[1].strip().upper()
5050
if lid in spdx.licenses:

0 commit comments

Comments
 (0)