Commit c06a2ba6 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'docs-5.13-3' of git://git.lwn.net/linux

Pull documentation fixes from Jonathan Corbet:
 "A set of straightforward documentation fixes"

* tag 'docs-5.13-3' of git://git.lwn.net/linux:
  Remove link to nonexistent rocket driver docs
  docs: networking: device_drivers: fix bad usage of UTF-8 chars
  docs: hwmon: tmp103.rst: fix bad usage of UTF-8 chars
  docs: ABI: remove some spurious characters
  docs: ABI: remove a meaningless UTF-8 character
  docs: cdrom-standard.rst: get rid of uneeded UTF-8 chars
  Documentation: drop optional BOMs
  docs/zh_CN: Remove obsolete translation file
parents 8d02490c 7240cd20
This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.¬ This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.
What: /sys/kernel/fadump_registered What: /sys/kernel/fadump_registered
Date: Feb 2012 Date: Feb 2012
......
This ABI is renamed and moved to a new location /sys/kernel/fadump/release_mem.¬ This ABI is renamed and moved to a new location /sys/kernel/fadump/release_mem.
What: /sys/kernel/fadump_release_mem What: /sys/kernel/fadump_release_mem
Date: Feb 2012 Date: Feb 2012
......
...@@ -37,13 +37,13 @@ Description: Maximum time allowed for periodic transfers per microframe (μs) ...@@ -37,13 +37,13 @@ Description: Maximum time allowed for periodic transfers per microframe (μs)
What: /sys/module/*/{coresize,initsize} What: /sys/module/*/{coresize,initsize}
Date: Jan 2012 Date: Jan 2012
KernelVersion:»·3.3 KernelVersion: 3.3
Contact: Kay Sievers <kay.sievers@vrfy.org> Contact: Kay Sievers <kay.sievers@vrfy.org>
Description: Module size in bytes. Description: Module size in bytes.
What: /sys/module/*/taint What: /sys/module/*/taint
Date: Jan 2012 Date: Jan 2012
KernelVersion:»·3.3 KernelVersion: 3.3
Contact: Kay Sievers <kay.sievers@vrfy.org> Contact: Kay Sievers <kay.sievers@vrfy.org>
Description: Module taint flags: Description: Module taint flags:
== ===================== == =====================
......
============== ==============
Data Integrity Data Integrity
============== ==============
......
...@@ -146,18 +146,18 @@ with the kernel as a block device by registering the following general ...@@ -146,18 +146,18 @@ with the kernel as a block device by registering the following general
*struct file_operations*:: *struct file_operations*::
struct file_operations cdrom_fops = { struct file_operations cdrom_fops = {
NULL, /∗ lseek ∗/ NULL, /* lseek */
block _read , /∗ read—general block-dev read ∗/ block _read , /* read--general block-dev read */
block _write, /∗ write—general block-dev write ∗/ block _write, /* write--general block-dev write */
NULL, /∗ readdir ∗/ NULL, /* readdir */
NULL, /∗ select ∗/ NULL, /* select */
cdrom_ioctl, /∗ ioctl ∗/ cdrom_ioctl, /* ioctl */
NULL, /∗ mmap ∗/ NULL, /* mmap */
cdrom_open, /∗ open ∗/ cdrom_open, /* open */
cdrom_release, /∗ release ∗/ cdrom_release, /* release */
NULL, /∗ fsync ∗/ NULL, /* fsync */
NULL, /∗ fasync ∗/ NULL, /* fasync */
NULL /∗ revalidate ∗/ NULL /* revalidate */
}; };
Every active CD-ROM device shares this *struct*. The routines Every active CD-ROM device shares this *struct*. The routines
...@@ -569,7 +569,7 @@ the *CDC_CLOSE_TRAY* bit in *mask*. ...@@ -569,7 +569,7 @@ the *CDC_CLOSE_TRAY* bit in *mask*.
In the file `cdrom.c` you will encounter many constructions of the type:: In the file `cdrom.c` you will encounter many constructions of the type::
if (cdo->capability & ∼cdi->mask & CDC _⟨capability⟩) ... if (cdo->capability & ~cdi->mask & CDC _<capability>) ...
There is no *ioctl* to set the mask... The reason is that There is no *ioctl* to set the mask... The reason is that
I think it is better to control the **behavior** rather than the I think it is better to control the **behavior** rather than the
......
...@@ -19,7 +19,6 @@ Serial drivers ...@@ -19,7 +19,6 @@ Serial drivers
moxa-smartio moxa-smartio
n_gsm n_gsm
rocket
serial-iso7816 serial-iso7816
serial-rs485 serial-rs485
......
...@@ -21,10 +21,10 @@ Description ...@@ -21,10 +21,10 @@ Description
The TMP103 is a digital output temperature sensor in a four-ball The TMP103 is a digital output temperature sensor in a four-ball
wafer chip-scale package (WCSP). The TMP103 is capable of reading wafer chip-scale package (WCSP). The TMP103 is capable of reading
temperatures to a resolution of 1°C. The TMP103 is specified for temperatures to a resolution of 1°C. The TMP103 is specified for
operation over a temperature range of 40°C to +125°C. operation over a temperature range of -40°C to +125°C.
Resolution: 8 Bits Resolution: 8 Bits
Accuracy: ±1°C Typ (10°C to +100°C) Accuracy: ±1°C Typ (-10°C to +100°C)
The driver provides the common sysfs-interface for temperatures (see The driver provides the common sysfs-interface for temperatures (see
Documentation/hwmon/sysfs-interface.rst under Temperatures). Documentation/hwmon/sysfs-interface.rst under Temperatures).
......
...@@ -173,7 +173,7 @@ Director rule is added from ethtool (Sideband filter), ATR is turned off by the ...@@ -173,7 +173,7 @@ Director rule is added from ethtool (Sideband filter), ATR is turned off by the
driver. To re-enable ATR, the sideband can be disabled with the ethtool -K driver. To re-enable ATR, the sideband can be disabled with the ethtool -K
option. For example:: option. For example::
ethtool K [adapter] ntuple [off|on] ethtool -K [adapter] ntuple [off|on]
If sideband is re-enabled after ATR is re-enabled, ATR remains enabled until a If sideband is re-enabled after ATR is re-enabled, ATR remains enabled until a
TCP-IP flow is added. When all TCP-IP sideband rules are deleted, ATR is TCP-IP flow is added. When all TCP-IP sideband rules are deleted, ATR is
...@@ -688,7 +688,7 @@ shaper bw_rlimit: for each tc, sets minimum and maximum bandwidth rates. ...@@ -688,7 +688,7 @@ shaper bw_rlimit: for each tc, sets minimum and maximum bandwidth rates.
Totals must be equal or less than port speed. Totals must be equal or less than port speed.
For example: min_rate 1Gbit 3Gbit: Verify bandwidth limit using network For example: min_rate 1Gbit 3Gbit: Verify bandwidth limit using network
monitoring tools such as ifstat or sar –n DEV [interval] [number of samples] monitoring tools such as `ifstat` or `sar -n DEV [interval] [number of samples]`
2. Enable HW TC offload on interface:: 2. Enable HW TC offload on interface::
......
...@@ -179,7 +179,7 @@ shaper bw_rlimit: for each tc, sets minimum and maximum bandwidth rates. ...@@ -179,7 +179,7 @@ shaper bw_rlimit: for each tc, sets minimum and maximum bandwidth rates.
Totals must be equal or less than port speed. Totals must be equal or less than port speed.
For example: min_rate 1Gbit 3Gbit: Verify bandwidth limit using network For example: min_rate 1Gbit 3Gbit: Verify bandwidth limit using network
monitoring tools such as ifstat or sar –n DEV [interval] [number of samples] monitoring tools such as ``ifstat`` or ``sar -n DEV [interval] [number of samples]``
NOTE: NOTE:
Setting up channels via ethtool (ethtool -L) is not supported when the Setting up channels via ethtool (ethtool -L) is not supported when the
......
.. _process_statement_kernel: .. _process_statement_kernel:
Linux Kernel Enforcement Statement Linux Kernel Enforcement Statement
---------------------------------- ----------------------------------
......
============================= =============================
Virtual TPM interface for Xen Virtual TPM interface for Xen
============================= =============================
......
====================================== ======================================
NO_HZ: Reducing Scheduling-Clock Ticks NO_HZ: Reducing Scheduling-Clock Ticks
====================================== ======================================
......
Chinese translated version of Documentation/admin-guide/security-bugs.rst
If you have any comment or update to the content, please contact the
original document maintainer directly. However, if you have a problem
communicating in English you can also ask the Chinese maintainer for
help. Contact the Chinese maintainer if this translation is outdated
or if there is a problem with the translation.
Chinese maintainer: Harry Wei <harryxiyou@gmail.com>
---------------------------------------------------------------------
Documentation/admin-guide/security-bugs.rst 的中文翻译
如果想评论或更新本文的内容,请直接联系原文档的维护者。如果你使用英文
交流有困难的话,也可以向中文版维护者求助。如果本翻译更新不及时或者翻
译存在问题,请联系中文版维护者。
中文版维护者: 贾威威 Harry Wei <harryxiyou@gmail.com>
中文版翻译者: 贾威威 Harry Wei <harryxiyou@gmail.com>
中文版校译者: 贾威威 Harry Wei <harryxiyou@gmail.com>
以下为正文
---------------------------------------------------------------------
Linux内核开发者认为安全非常重要。因此,我们想要知道当一个有关于
安全的漏洞被发现的时候,并且它可能会被尽快的修复或者公开。请把这个安全
漏洞报告给Linux内核安全团队。
1) 联系
linux内核安全团队可以通过email<security@kernel.org>来联系。这是
一组独立的安全工作人员,可以帮助改善漏洞报告并且公布和取消一个修复。安
全团队有可能会从部分的维护者那里引进额外的帮助来了解并且修复安全漏洞。
当遇到任何漏洞,所能提供的信息越多就越能诊断和修复。如果你不清楚什么
是有帮助的信息,那就请重温一下admin-guide/reporting-bugs.rst文件中的概述过程。任
何攻击性的代码都是非常有用的,未经报告者的同意不会被取消,除非它已经
被公布于众。
2) 公开
Linux内核安全团队的宗旨就是和漏洞提交者一起处理漏洞的解决方案直
到公开。我们喜欢尽快地完全公开漏洞。当一个漏洞或者修复还没有被完全地理
解,解决方案没有通过测试或者供应商协调,可以合理地延迟公开。然而,我们
期望这些延迟尽可能的短些,是可数的几天,而不是几个星期或者几个月。公开
日期是通过安全团队和漏洞提供者以及供应商洽谈后的结果。公开时间表是从很
短(特殊的,它已经被公众所知道)到几个星期。作为一个基本的默认政策,我
们所期望通知公众的日期是7天的安排。
3) 保密协议
Linux内核安全团队不是一个正式的团体,因此不能加入任何的保密协议。
================ ================
mtouchusb driver mtouchusb driver
================ ================
......
========== ==========
USB serial USB serial
========== ==========
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment