Commit 872f8ede authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0d18c12b 530c4374

Documentation/features/core/thread-info-in-task/arch-support.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
#

# 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 |

    -----------------------

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

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    |    openrisc: | TODO |

    |      parisc: | TODO |

    |     powerpc: |  ok  |

    |       riscv: | TODO |

    |       riscv: |  ok  |

    |        s390: | TODO |

    |          sh: |  ok  |

    |       sparc: | TODO |

LICENSES/dual/CC-BY-4.0

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ Section 8 -- Interpretation. 
Creative Commons is not a party to its public

licenses. Notwithstanding, Creative Commons may elect to apply one of

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

Domain Dedication. Except for the limited purpose of indicating that

material is shared under a Creative Commons public license or as

scripts/spdxcheck.py

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ def read_spdxdata(repo): 
                continue



            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:'):

                    lid = l.split(':')[1].strip().upper()

                    if lid in spdx.licenses:

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

+2 −2

File changed.

Contains only whitespace changes.