Commit e6b0bd61 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'docs-5.10-warnings' of git://git.lwn.net/linux 

Pull documentation build warning fixes from Jonathan Corbet:
 "This contains a series of warning fixes from Mauro; once applied, the
  number of warnings from the once-noisy docs build process is nearly
  zero.

  Getting to this point has required a lot of work; once there,
  hopefully we can keep things that way.

  I have packaged this as a separate pull because it does a fair amount
  of reaching outside of Documentation/. The changes are all in comments
  and in code placement. It's all been in linux-next since last week"

* tag 'docs-5.10-warnings' of git://git.lwn.net/linux: (24 commits)
  docs: SafeSetID: fix a warning
  amdgpu: fix a few kernel-doc markup issues
  selftests: kselftest_harness.h: fix kernel-doc markups
  drm: amdgpu_dm: fix a typo
  gpu: docs: amdgpu.rst: get rid of wrong kernel-doc markups
  drm: amdgpu: kernel-doc: update some adev parameters
  docs: fs: api-summary.rst: get rid of kernel-doc include
  IB/srpt: docs: add a description for cq_size member
  locking/refcount: move kernel-doc markups to the proper place
  docs: lockdep-design: fix some warning issues
  MAINTAINERS: fix broken doc refs due to yaml conversion
  ice: docs fix a devlink info that broke a table
  crypto: sun8x-ce*: update entries to its documentation
  net: phy: remove kernel-doc duplication
  mm: pagemap.h: fix two kernel-doc markups
  blk-mq: docs: add kernel-doc description for a new struct member
  docs: userspace-api: add iommu.rst to the index file
  docs: hwmon: mp2975.rst: address some html build warnings
  docs: net: statistics.rst: remove a duplicated kernel-doc
  docs: kasan.rst: add two missing blank lines
  ...
parents ce2e33ba 6fee9372

Documentation/admin-guide/LSM/SafeSetID.rst

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ for a UID/GID will prevent that UID/GID from obtaining auxiliary setid 
privileges, such as allowing a user to set up user namespace UID/GID mappings.



Note on GID policies and setgroups()

==================

====================================

In v5.9 we are adding support for limiting CAP_SETGID privileges as was done

previously for CAP_SETUID. However, for compatibility with common sandboxing

related code conventions in userspace, we currently allow arbitrary

Documentation/admin-guide/sysctl/net.rst

+1 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ Note: 
      0:    0     1     2     3     4     5     6     7

  RSS hash key:

  84:50:f4:00:a8:15:d1:a7:e9:7f:1d:60:35:c7:47:25:42:97:74:ca:56:bb:b6:a1:d8:43:e3:c9:0c:fd:17:55:c2:3a:4d:69:ed:f1:42:89



netdev_tstamp_prequeue

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

Documentation/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ if major >= 3: 
        support for Sphinx v3.0 and above is brand new. Be prepared for

        possible issues in the generated output.

        ''')

    if minor > 0 or patch >= 2:

    if (major > 3) or (minor > 0 or patch >= 2):

        # Sphinx c function parser is more pedantic with regards to type

        # checking. Due to that, having macros at c:function cause problems.

        # Those needed to be scaped by using c_id_attributes[] array

Documentation/dev-tools/kasan.rst

+2 −0
Original line number Diff line number Diff line
@@ -295,11 +295,13 @@ print the number of the test and the status of the test: 
pass::



        ok 28 - kmalloc_double_kzfree



or, if kmalloc failed::



        # kmalloc_large_oob_right: ASSERTION FAILED at lib/test_kasan.c:163

        Expected ptr is not null, but is

        not ok 4 - kmalloc_large_oob_right



or, if a KASAN report was expected, but not found::



        # kmalloc_double_kzfree: EXPECTATION FAILED at lib/test_kasan.c:629

Documentation/devicetree/bindings/clock/hi6220-clock.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Clock control registers reside in different Hi6220 system controllers, 
please refer the following document to know more about the binding rules

for these system controllers:



Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt

Documentation/devicetree/bindings/arm/hisilicon/hisilicon.yaml



Required Properties:

CRA Git | Maintained and supported by SUSTech CRA and CCSE