mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
d2e11fd2b7fcd10b7bcef418c55490c934aa94e8
linux/net
History
Jakub Kicinski d2e11fd2b7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Conflicting commits, all resolutions pretty trivial:

drivers/bus/mhi/pci_generic.c
  5c2c853159 ("bus: mhi: pci-generic: configurable network interface MRU")
  56f6f4c4eb ("bus: mhi: pci_generic: Apply no-op for wake using sideband wake boolean")

drivers/nfc/s3fwrn5/firmware.c
  a0302ff590 ("nfc: s3fwrn5: remove unnecessary label")
  46573e3ab0 ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")
  801e541c79 ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")

MAINTAINERS
  7d901a1e87 ("net: phy: add Maxlinear GPY115/21x/24x driver")
  8a7b46fa79 ("MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-07-31 09:14:46 -07:00
..
6lowpan
6lowpan: Fix some typos in nhc_udp.c
2021-03-24 17:52:11 -07:00
9p
9p/trans_virtio: Fix spelling mistakes
2021-06-02 14:01:55 -07:00
802
net/802/garp: fix memleak in garp_request_join()
2021-07-01 11:21:57 -07:00
8021q
dev_ioctl: split out ndo_eth_ioctl
2021-07-27 20:11:45 +01:00
appletalk
net: socket: rework compat_ifreq_ioctl()
2021-07-23 14:20:25 +01:00
atm
atm: Use list_for_each_entry() to simplify code in resources.c
2021-06-10 14:08:09 -07:00
ax25
net/ax25: Delete obsolete TODO file
2021-03-30 16:54:50 -07:00
batman-adv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-06-18 19:47:02 -07:00
bluetooth
Merge tag 'tty-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2021-07-05 14:08:24 -07:00
bpf
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-07-23 16:13:06 +01:00
bpfilter
bpfilter: Specify the log level for the kmsg message
2021-06-25 13:13:50 +02:00
bridge
net: bridge: switchdev: treat local FDBs the same as entries towards the bridge
2021-07-28 20:25:50 +01:00
caif
net: fix uninit-value in caif_seqpkt_sendmsg
2021-07-15 11:08:33 -07:00
can
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-07-31 09:14:46 -07:00
ceph
Merge tag 'net-next-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2021-06-30 15:51:09 -07:00
core
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-07-31 09:14:46 -07:00
dcb
net: dcb: Return the correct errno code
2021-06-01 17:01:33 -07:00
dccp
memcg: enable accounting for inet_bin_bucket cache
2021-07-20 06:00:38 -07:00
decnet
net: convert fib_treeref from int to refcount_t
2021-07-30 15:33:24 +02:00
dns_resolver
net: remove redundant 'depends on NET'
2021-01-27 17:04:12 -08:00
dsa
net: dsa: don't set skb->offload_fwd_mark when not offloading the bridge
2021-07-29 22:17:37 +01:00
ethernet
Revert "net: dsa: Allow drivers to filter packets they can decode source port from"
2021-07-26 22:35:22 +01:00
ethtool
dev_ioctl: pass SIOCDEVPRIVATE data separately
2021-07-27 20:11:44 +01:00
hsr
net: hsr: don't check sequence number if tag removal is offloaded
2021-06-16 12:13:01 -07:00
ieee802154
net: socket: rework compat_ifreq_ioctl()
2021-07-23 14:20:25 +01:00
ife
net: remove redundant 'depends on NET'
2021-01-27 17:04:12 -08:00
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-07-31 09:14:46 -07:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-07-31 09:14:46 -07:00
iucv
s390: iucv: Avoid field over-reading memcpy()
2021-07-01 15:54:01 -07:00
kcm
net: sock: introduce sk_error_report
2021-06-29 11:28:21 -07:00
key
net: Remove unnecessary variables
2021-05-26 07:03:39 +02:00
l2tp
l2tp: Fix spelling mistakes
2021-06-07 14:08:30 -07:00
l3mdev
l3mdev: Correct function names in the kerneldoc comments
2021-03-28 17:56:55 -07:00
lapb
net: lapb: Use list_for_each_entry() to simplify code in lapb_iface.c
2021-06-08 16:31:25 -07:00
llc
net: llc: fix skb_over_panic
2021-07-27 13:05:56 +01:00
mac80211
mac80211: fix enabling 4-address mode on a sta vif after assoc
2021-07-23 10:34:13 +02:00
mac802154
net: mac802154: Fix general protection fault
2021-04-06 22:42:16 +02:00
mctp
mctp: Allow per-netns default networks
2021-07-29 15:06:50 +01:00
mpls
mpls: defer ttl decrement in mpls_forward()
2021-07-23 17:17:56 +01:00
mptcp
net: Use nlmsg_unicast() instead of netlink_unicast()
2021-07-13 09:28:29 -07:00
ncsi
net/ncsi: add dummy response handler for Intel boards
2021-07-08 14:16:39 -07:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-07-31 09:14:46 -07:00
netlabel
net: cipso: fix warnings in netlbl_cipsov4_add_std
2021-07-27 20:58:30 +01:00
netlink
net: netlink: Remove unused function
2021-07-30 18:35:47 +02:00
netrom
netrom: Decrease sock refcount when sock timers expire
2021-07-18 09:48:59 -07:00
nfc
nfc: hci: cleanup unneeded spaces
2021-07-30 17:22:53 +02:00
nsh
…
openvswitch
openvswitch: fix sparse warning incorrect type
2021-07-27 11:48:43 +01:00
packet
Merge tag 'net-next-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2021-06-30 15:51:09 -07:00
phonet
phonet: use siocdevprivate
2021-07-27 20:11:43 +01:00
psample
psample: Add additional metadata attributes
2021-03-14 15:00:43 -07:00
qrtr
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-07-31 09:14:46 -07:00
rds
Merge tag 'net-next-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2021-06-30 15:51:09 -07:00
rfkill
Merge tag 'mac80211-next-for-net-next-2021-04-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
2021-04-20 16:44:04 -07:00
rose
net: rose: Fix fall-through warnings for Clang
2021-03-10 12:45:15 -08:00
rxrpc
Merge tag 'net-next-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2021-06-30 15:51:09 -07:00
sched
net/sched: store the last executed chain also for clsact egress
2021-07-29 22:17:37 +01:00
sctp
sctp: fix return value check in __sctp_rcv_asconf_lookup
2021-07-28 09:25:18 +01:00
smc
net: sock: introduce sk_error_report
2021-06-29 11:28:21 -07:00
strparser
net: sock: introduce sk_error_report
2021-06-29 11:28:21 -07:00
sunrpc
Merge tag 'nfs-for-5.14-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
2021-07-09 09:43:57 -07:00
switchdev
net: switchdev: fix FDB entries towards foreign ports not getting propagated to us
2021-07-22 00:45:40 -07:00
tipc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-07-31 09:14:46 -07:00
tls
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-06-29 15:45:27 -07:00
unix
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-07-31 09:14:46 -07:00
vmw_vsock
Merge tag 'net-next-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2021-06-30 15:51:09 -07:00
wireless
cfg80211: Fix possible memory leak in function cfg80211_bss_update
2021-07-23 10:38:18 +02:00
x25
net: x25: Use list_for_each_entry() to simplify code in x25_route.c
2021-06-10 14:08:09 -07:00
xdp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-06-29 15:45:27 -07:00
xfrm
Merge tag 'net-next-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2021-06-30 15:51:09 -07:00
compat.c
net: Return the correct errno code
2021-06-03 15:13:56 -07:00
devres.c
net: devres: Correct a grammatical error
2021-06-11 12:55:28 -07:00
Kconfig
mctp: Add MCTP base
2021-07-29 15:06:49 +01:00
Makefile
mctp: Add MCTP base
2021-07-29 15:06:49 +01:00
socket.c
mctp: Add MCTP base
2021-07-29 15:06:49 +01:00
sysctl_net.c
net: Ensure net namespace isolation of sysctls
2021-04-12 13:27:11 -07:00