mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
3a4f0edbb7939a16abb54668642ceed1decdbf4a
linux/arch
History
Jakub Kicinski 173780ff18 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Cross-merge networking fixes after downstream PR.

Conflicts:

include/linux/mlx5/driver.h
  617f5db1a6 ("RDMA/mlx5: Fix affinity assignment")
  dc13180824 ("net/mlx5: Enable devlink port for embedded cpu VF vports")
https://lore.kernel.org/all/20230613125939.595e50b8@canb.auug.org.au/

tools/testing/selftests/net/mptcp/mptcp_join.sh
  47867f0a7e ("selftests: mptcp: join: skip check if MIB counter not supported")
  425ba80312 ("selftests: mptcp: join: support RM_ADDR for used endpoints or not")
  45b1a1227a ("mptcp: introduces more address related mibs")
  0639fa230a ("selftests: mptcp: add explicit check for new mibs")
https://lore.kernel.org/netdev/20230609-upstream-net-20230610-mptcp-selftests-support-old-kernels-part-3-v1-0-2896fe2ee8a3@tessares.net/

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-06-15 22:19:41 -07:00
..
alpha
net: core: add getsockopt SO_PEERPIDFD
2023-06-12 10:45:50 +01:00
arc
Merge tag 'locking-core-2023-05-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2023-05-05 12:56:55 -07:00
arm
ARM: dts: Fix erroneous ADS touchscreen polarities
2023-06-05 17:39:22 +02:00
arm64
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2023-06-15 22:19:41 -07:00
csky
Merge tag 'csky-for-linus-6.4' of https://github.com/c-sky/csky-linux
2023-05-04 12:25:05 -07:00
hexagon
Merge tag 'locking-core-2023-05-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2023-05-05 12:56:55 -07:00
ia64
Merge tag 'locking-core-2023-05-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2023-05-05 12:56:55 -07:00
loongarch
LoongArch: Fix debugfs_create_dir() error checking
2023-06-15 14:35:56 +08:00
m68k
m68k: Move signal frame following exception on 68020/030
2023-05-22 13:51:20 +02:00
microblaze
Kconfig: introduce HAS_IOPORT option and select it as necessary
2023-04-05 22:15:19 +02:00
mips
net: core: add getsockopt SO_PEERPIDFD
2023-06-12 10:45:50 +01:00
nios2
nios2: dts: Fix tse_mac "max-frame-size" property
2023-06-13 16:59:46 -05:00
openrisc
Merge tag 'locking-core-2023-05-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2023-05-05 12:56:55 -07:00
parisc
net: core: add getsockopt SO_PEERPIDFD
2023-06-12 10:45:50 +01:00
powerpc
Merge tag 'mm-hotfixes-stable-2023-06-12-12-22' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2023-06-12 16:14:34 -07:00
riscv
Merge tag 'mm-hotfixes-stable-2023-06-12-12-22' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2023-06-12 16:14:34 -07:00
s390
Merge tag 's390-6.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2023-06-09 09:29:51 -07:00
sh
Merge tag 'locking-core-2023-05-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2023-05-05 12:56:55 -07:00
sparc
net: core: add getsockopt SO_PEERPIDFD
2023-06-12 10:45:50 +01:00
um
um: harddog: fix modular build
2023-05-10 00:21:30 +02:00
x86
Merge tag 'mm-hotfixes-stable-2023-06-12-12-22' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2023-06-12 16:14:34 -07:00
xtensa
Merge tag 'xtensa-20230523' of https://github.com/jcmvbkbc/linux-xtensa
2023-05-23 15:21:34 -07:00
.gitignore
…
Kconfig
lazy tlb: shoot lazies, non-refcounting lazy tlb mm reference handling scheme
2023-03-28 16:20:08 -07:00