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

Conflicts:

tools/testing/selftests/net/fcnal-test.sh
  d7a2fc1437 ("selftests: net: fcnal-test: check if FIPS mode is enabled")
  dd017c72dd ("selftests: fcnal: Test SO_DONTROUTE on TCP sockets.")
https://lore.kernel.org/all/5007b52c-dd16-dbf6-8d64-b9701bfa498b@tessares.net/
https://lore.kernel.org/all/20230619105427.4a0df9b3@canb.auug.org.au/

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-06-22 18:40:38 -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
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2023-06-22 17:54:10 -07:00
arm64
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2023-06-22 18:40:38 -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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2023-06-22 18:40:38 -07:00
powerpc
Merge tag 'powerpc-6.4-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
2023-06-22 17:49:40 -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 'net-6.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2023-06-22 17:59:51 -07:00
xtensa
Merge tag 'xtensa-20230523' of https://github.com/jcmvbkbc/linux-xtensa
2023-05-23 15:21:34 -07:00
.gitignore
…
Kconfig
…