Commit d9c96067 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Conflicts:

drivers/net/ethernet/google/gve/gve.h
  3ce93455 ("gve: Secure enough bytes in the first TX desc for all TCP pkts")
  75eaae15 ("gve: Add XDP DROP and TX support for GQI-QPL format")
https://lore.kernel.org/all/20230406104927.45d176f5@canb.auug.org.au/
https://lore.kernel.org/all/c5872985-1a95-0bc8-9dcc-b6f23b439e9d@tessares.net/



Adjacent changes:

net/can/isotp.c
  05173743 ("can: isotp: fix race between isotp_sendsmg() and isotp_release()")
  96d1c81e ("can: isotp: add module parameter for maximum pdu size")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0ebd4fd6 f2afccfe

Documentation/admin-guide/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ problems and bugs in particular. 


   reporting-issues

   reporting-regressions

   security-bugs

   bug-hunting

   bug-bisect

   tainted-kernels

Documentation/admin-guide/reporting-issues.rst

+2 −2
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ might want to be aware of; it for example explains how to add your issue to the 
list of tracked regressions, to ensure it won't fall through the cracks.



What qualifies as security issue is left to your judgment. Consider reading

Documentation/admin-guide/security-bugs.rst before proceeding, as it

Documentation/process/security-bugs.rst before proceeding, as it

provides additional details how to best handle security issues.



An issue is a 'really severe problem' when something totally unacceptably bad
@@ -1269,7 +1269,7 @@ them when sending the report by mail. If you filed it in a bug tracker, forward 
the report's text to these addresses; but on top of it put a small note where

you mention that you filed it with a link to the ticket.



See Documentation/admin-guide/security-bugs.rst for more information.

See Documentation/process/security-bugs.rst for more information.





Duties after the report went out

Documentation/devicetree/bindings/pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml

+2 −0
Original line number Diff line number Diff line
@@ -96,9 +96,11 @@ $defs: 
          2: Lower Slew rate (slower edges)

          3: Reserved (No adjustments)



      bias-bus-hold: true

      bias-pull-down: true

      bias-pull-up: true

      bias-disable: true

      input-enable: true

      output-high: true

      output-low: true

Documentation/process/howto.rst

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ required reading: 
    philosophy and is very important for people moving to Linux from

    development on other Operating Systems.



  :ref:`Documentation/admin-guide/security-bugs.rst <securitybugs>`

  :ref:`Documentation/process/security-bugs.rst <securitybugs>`

    If you feel you have found a security problem in the Linux kernel,

    please follow the steps in this document to help notify the kernel

    developers, and help solve the issue.

Documentation/process/index.rst

+8 −1
Original line number Diff line number Diff line
@@ -35,6 +35,14 @@ Below are the essential guides that every developer should read. 
   kernel-enforcement-statement

   kernel-driver-statement



For security issues, see:



.. toctree::

   :maxdepth: 1



   security-bugs

   embargoed-hardware-issues



Other guides to the community that are of interest to most developers are:



.. toctree::
@@ -47,7 +55,6 @@ Other guides to the community that are of interest to most developers are: 
   submit-checklist

   kernel-docs

   deprecated

   embargoed-hardware-issues

   maintainers

   researcher-guidelines