diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-10-05 11:17:24 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-10-05 11:17:24 -0300 |
| commit | 143ca87ada4aeca55c5418be921d07d12763878a (patch) | |
| tree | 8e132896e25ce365974fa59a3dfb3eb28ccefed5 /Documentation | |
| parent | a34846a378087b15e661c9b4c1a3eb42f4042f82 (diff) | |
| parent | 760adb59f6211e157dd587927ac26c42abc81550 (diff) | |
Merge tag 'v5.15.56' into 5.15-2.1.x-imx
This is the 5.15.56 stable release
Conflicts:
arch/arm/mm/mmu.c
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/driver-api/firmware/other_interfaces.rst | 6 | ||||
| -rw-r--r-- | Documentation/networking/ip-sysctl.rst | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/driver-api/firmware/other_interfaces.rst b/Documentation/driver-api/firmware/other_interfaces.rst index b81794e0cfbb..06ac89adaafb 100644 --- a/Documentation/driver-api/firmware/other_interfaces.rst +++ b/Documentation/driver-api/firmware/other_interfaces.rst @@ -13,6 +13,12 @@ EDD Interfaces .. kernel-doc:: drivers/firmware/edd.c :internal: +Generic System Framebuffers Interface +------------------------------------- + +.. kernel-doc:: drivers/firmware/sysfb.c + :export: + Intel Stratix10 SoC Service Layer --------------------------------- Some features of the Intel Stratix10 SoC require a level of privilege diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst index d91ab28718d4..b8b67041f955 100644 --- a/Documentation/networking/ip-sysctl.rst +++ b/Documentation/networking/ip-sysctl.rst @@ -1063,7 +1063,7 @@ cipso_cache_enable - BOOLEAN cipso_cache_bucket_size - INTEGER The CIPSO label cache consists of a fixed size hash table with each hash bucket containing a number of cache entries. This variable limits - the number of entries in each hash bucket; the larger the value the + the number of entries in each hash bucket; the larger the value is, the more CIPSO label mappings that can be cached. When the number of entries in a given hash bucket reaches this limit adding new entries causes the oldest entry in the bucket to be removed to make room. @@ -1157,7 +1157,7 @@ ip_autobind_reuse - BOOLEAN option should only be set by experts. Default: 0 -ip_dynaddr - BOOLEAN +ip_dynaddr - INTEGER If set non-zero, enables support for dynamic addresses. If set to a non-zero value larger than 1, a kernel log message will be printed when dynamic address rewriting |