Commit 3150a733 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



No conflicts.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 1a2fb220 ded746bf

Documentation/admin-guide/blockdev/drbd/figures.rst

+2 −2
Original line number Diff line number Diff line
@@ -25,6 +25,6 @@ Sub graphs of DRBD's state transitions 
    :alt:   disk-states-8.dot

    :align: center



.. kernel-figure:: node-states-8.dot

    :alt:   node-states-8.dot

.. kernel-figure:: peer-states-8.dot

    :alt:   peer-states-8.dot

    :align: center

Documentation/admin-guide/blockdev/drbd/node-states-8.dot→Documentation/admin-guide/blockdev/drbd/peer-states-8.dot

+0 −5
Original line number Diff line number Diff line 
digraph node_states {

	Secondary -> Primary           [ label = "ioctl_set_state()" ]

	Primary   -> Secondary 	       [ label = "ioctl_set_state()" ]

}



digraph peer_states {

	Secondary -> Primary           [ label = "recv state packet" ]

	Primary   -> Secondary 	       [ label = "recv state packet" ]

Documentation/arm64/pointer-authentication.rst

+4 −5
Original line number Diff line number Diff line
@@ -53,11 +53,10 @@ The number of bits that the PAC occupies in a pointer is 55 minus the 
virtual address size configured by the kernel. For example, with a

virtual address size of 48, the PAC is 7 bits wide.



Recent versions of GCC can compile code with APIAKey-based return

address protection when passed the -msign-return-address option. This

uses instructions in the HINT space (unless -march=armv8.3-a or higher

is also passed), and such code can run on systems without the pointer

authentication extension.

When ARM64_PTR_AUTH_KERNEL is selected, the kernel will be compiled

with HINT space pointer authentication instructions protecting

function returns. Kernels built with this option will work on hardware

with or without pointer authentication support.



In addition to exec(), keys can also be reinitialized to random values

using the PR_PAC_RESET_KEYS prctl. A bitmask of PR_PAC_APIAKEY,

Documentation/conf.py

+10 −5
Original line number Diff line number Diff line
@@ -249,6 +249,11 @@ except ImportError: 


html_static_path = ['sphinx-static']



html_css_files = [

    'theme_overrides.css',

]



if major <= 1 and minor < 8:

    html_context = {

        'css_files': [

            '_static/theme_overrides.css',

Documentation/cpu-freq/core.rst

+3 −3
Original line number Diff line number Diff line
@@ -73,12 +73,12 @@ CPUFREQ_POSTCHANGE. 
The third argument is a struct cpufreq_freqs with the following

values:



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

cpu	number of the affected CPU

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

policy	a pointer to the struct cpufreq_policy

old	old frequency

new	new frequency

flags	flags of the cpufreq driver

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

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



3. CPUFreq Table Generation with Operating Performance Point (OPP)

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