2
0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
linux/Documentation/arch
Jakub Kicinski 357660d759 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.14-rc5).

Conflicts:

drivers/net/ethernet/cadence/macb_main.c
  fa52f15c74 ("net: cadence: macb: Synchronize stats calculations")
  75696dd0fd ("net: cadence: macb: Convert to get_stats64")
https://lore.kernel.org/20250224125848.68ee63e5@canb.auug.org.au

Adjacent changes:

drivers/net/ethernet/intel/ice/ice_sriov.c
  79990cf5e7 ("ice: Fix deinitializing VF in error path")
  a203163274 ("ice: simplify VF MSI-X managing")

net/ipv4/tcp.c
  18912c5206 ("tcp: devmem: don't write truncated dmabuf CMSGs to userspace")
  297d389e9e ("net: prefix devmem specific helpers")

net/mptcp/subflow.c
  8668860b0a ("mptcp: reset when MPTCP opts are dropped after join")
  c3349a22c2 ("mptcp: consolidate subflow cleanup")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2025-02-27 10:20:58 -08:00
..
arc docs: kernel_feat.py: fix potential command injection 2024-01-11 09:21:01 -07:00
arm move asm/unaligned.h to linux/unaligned.h 2024-10-02 17:23:23 -04:00
arm64 arm64/gcs: Fix documentation for HWCAP 2025-02-04 12:26:26 +00:00
loongarch irqchip/loongson-eiointc: Add virt extension support 2024-11-13 16:18:27 +08:00
m68k Docs: typos/spelling 2024-05-02 10:02:29 -06:00
mips docs: kernel_feat.py: fix potential command injection 2024-01-11 09:21:01 -07:00
nios2 docs: kernel_feat.py: fix potential command injection 2024-01-11 09:21:01 -07:00
openrisc docs: kernel_feat.py: fix potential command injection 2024-01-11 09:21:01 -07:00
parisc docs: kernel_feat.py: fix potential command injection 2024-01-11 09:21:01 -07:00
powerpc cxl: Fix cross-reference in documentation and add deprecation warning 2025-02-19 13:33:58 +05:30
riscv riscv: hwprobe: Document thead vendor extensions and xtheadvector extension 2025-01-18 12:33:36 -08:00
s390 s390/net: Remove LCS driver 2025-02-05 18:19:01 -08:00
sh docs: kernel_feat.py: fix potential command injection 2024-01-11 09:21:01 -07:00
sparc Docs: typos/spelling 2024-05-02 10:02:29 -06:00
x86 docs: arch/x86/sva: Fix two grammar errors under Background and FAQ 2025-02-21 14:24:51 +01:00
xtensa docs: kernel_feat.py: fix potential command injection 2024-01-11 09:21:01 -07:00
index.rst The number of commits for documentation is not huge this time around, but 2023-11-01 17:11:41 -10:00