Commit 3cbd2090 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/faraday/ftgmac100.c
  4186c8d9 ("net: ftgmac100: Ensure tx descriptor updates are visible")
  e24a6c87 ("net: ftgmac100: Get link speed and duplex for NC-SI")
https://lore.kernel.org/0b851ec5-f91d-4dd3-99da-e81b98c9ed28@kernel.org

net/ipv4/tcp.c
  bac76cf8 ("tcp: fix forever orphan socket caused by tcp_abort")
  edefba66 ("tcp: rstreason: introduce SK_RST_REASON_TCP_STATE for active reset")
https://lore.kernel.org/20240828112207.5c199d41@canb.auug.org.au

No adjacent changes.

Link: https://patch.msgid.link/20240829130829.39148-1-pabeni@redhat.com


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

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ Simon Kelley <simon@thekelleys.org.uk> 
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>

Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>

Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>

Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>

Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>

Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Documentation/core-api/workqueue.rst

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ Some users depend on strict execution ordering where only one work item 
is in flight at any given time and the work items are processed in

queueing order. While the combination of ``@max_active`` of 1 and

``WQ_UNBOUND`` used to achieve this behavior, this is no longer the

case. Use ``alloc_ordered_queue()`` instead.

case. Use alloc_ordered_workqueue() instead.





Example Execution Scenarios

Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ properties: 
      - focaltech,ft5426

      - focaltech,ft5452

      - focaltech,ft6236

      - focaltech,ft8201

      - focaltech,ft8719



  reg:

Documentation/process/coding-style.rst

+0 −12
Original line number Diff line number Diff line
@@ -629,18 +629,6 @@ The preferred style for long (multi-line) comments is: 
	 * with beginning and ending almost-blank lines.

	 */



For files in net/ and drivers/net/ the preferred style for long (multi-line)

comments is a little different.



.. code-block:: c



	/* The preferred comment style for files in net/ and drivers/net

	 * looks like this.

	 *

	 * It is nearly the same as the generally preferred comment style,

	 * but there is no initial almost-blank line.

	 */



It's also important to comment data, whether they are basic types or derived

types.  To this end, use just one data declaration per line (no commas for

multiple data declarations).  This leaves you room for a small comment on each

Documentation/process/maintainer-netdev.rst

+0 −17
Original line number Diff line number Diff line
@@ -355,23 +355,6 @@ just do it. As a result, a sequence of smaller series gets merged quicker and 
with better review coverage. Re-posting large series also increases the mailing

list traffic.



Multi-line comments

~~~~~~~~~~~~~~~~~~~



Comment style convention is slightly different for networking and most of

the tree.  Instead of this::



  /*

   * foobar blah blah blah

   * another line of text

   */



it is requested that you make it look like this::



  /* foobar blah blah blah

   * another line of text

   */



Local variable ordering ("reverse xmas tree", "RCS")

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~