ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
01adc4851a8090b46c7a5ed9cfc4b97e65abfbf4
linux_media/net
History
David S. Miller 01adc4851a Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next 
Minor conflict, a CHECK was placed into an if() statement
in net-next, whilst a newline was added to that CHECK
call in 'net'.  Thanks to Daniel for the merge resolution.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-05-07 23:35:08 -04:00
..
6lowpan
…
9p
net/9p/client.c: fix potential refcnt problem of trans module
2018-04-05 21:36:23 -07:00
802
…
8021q
vlan: also check phy_driver ts_info for vlan's real device
2018-04-01 20:53:50 -04:00
appletalk
net: Use octal not symbolic permissions
2018-03-26 12:07:48 -04:00
atm
net: Use octal not symbolic permissions
2018-03-26 12:07:48 -04:00
ax25
net: Use octal not symbolic permissions
2018-03-26 12:07:48 -04:00
batman-adv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-04-01 19:49:34 -04:00
bluetooth
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
2018-04-08 17:19:15 -04:00
bpf
bpf: making bpf_prog_test run aware of possible data_end ptr change
2018-04-18 23:34:16 +02:00
bridge
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2018-05-06 21:51:37 -04:00
caif
net: caif: fix spelling mistake "UKNOWN" -> "UNKNOWN"
2018-04-19 13:37:10 -04:00
can
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
ceph
libceph: validate con->state at the top of try_write()
2018-04-26 17:39:08 +02:00
core
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
2018-05-07 23:35:08 -04:00
dcb
…
dccp
dccp: fix tasklet usage
2018-05-03 15:14:57 -04:00
decnet
net: fib_rules: add extack support
2018-04-23 10:21:24 -04:00
dns_resolver
KEYS: DNS: limit the length of option strings
2018-04-17 15:17:41 -04:00
dsa
switchdev: Add fdb.added_by_user to switchdev notifications
2018-05-03 13:46:47 -04:00
ethernet
…
hsr
…
ieee802154
inet: frags: fix ip6frag_low_thresh boundary
2018-04-04 12:04:59 -04:00
ife
net: sched: ife: check on metadata length
2018-04-22 21:12:00 -04:00
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2018-05-06 21:51:37 -04:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2018-05-06 21:51:37 -04:00
iucv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-03-23 11:31:58 -04:00
kcm
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
key
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
l2tp
l2tp: consistent reference counting in procfs and debufs
2018-04-27 11:06:35 -04:00
l3mdev
…
lapb
…
llc
llc: fix NULL pointer deref for SOCK_ZAPPED
2018-04-22 14:56:22 -04:00
mac80211
Merge tag 'mac80211-next-for-davem-2018-03-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
2018-03-29 16:23:26 -04:00
mac802154
net/mac802154: disambiguate mac80215 vs mac802154 trace events
2018-03-28 22:55:18 +02:00
mpls
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
ncsi
net/ncsi: Refactor MAC, VLAN filters
2018-04-17 13:50:58 -04:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2018-05-06 21:51:37 -04:00
netlabel
netlabel: If PF_INET6, check sk_buff ip header version
2018-02-14 14:01:41 -05:00
netlink
netlink: fix uninit-value in netlink_sendmsg
2018-04-07 22:32:31 -04:00
netrom
net: Use octal not symbolic permissions
2018-03-26 12:07:48 -04:00
nfc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-02-19 18:46:11 -05:00
nsh
…
openvswitch
netfilter: add NAT support for shifted portmap ranges
2018-04-24 10:29:12 +02:00
packet
dev: packet: make packet_direct_xmit a common function
2018-05-03 15:55:24 -07:00
phonet
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
psample
…
qrtr
net: qrtr: Expose tunneling endpoint to user space
2018-04-27 15:06:10 -04:00
rds
rds: do not leak kernel memory to user land
2018-05-03 11:26:14 -04:00
rfkill
vfs: do bulk POLL* -> EPOLL* replacement
2018-02-11 14:34:03 -08:00
rose
net: Use octal not symbolic permissions
2018-03-26 12:07:48 -04:00
rxrpc
rxrpc: Fix undefined packet handling
2018-04-04 11:04:08 -04:00
sched
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-05-04 09:58:56 -04:00
sctp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-05-04 09:58:56 -04:00
smc
smc: add support for splice()
2018-05-04 11:45:06 -04:00
strparser
strparser: Do not call mod_delayed_work with a timeout of LONG_MAX
2018-04-22 21:09:16 -04:00
sunrpc
rpc_pipefs: fix double-dput()
2018-04-15 23:49:27 -04:00
switchdev
…
tipc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-05-04 09:58:56 -04:00
tls
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-05-04 09:58:56 -04:00
unix
af_unix: remove redundant lockdep class
2018-04-04 11:13:40 -04:00
vmw_vsock
VSOCK: make af_vsock.ko removable again
2018-04-17 09:44:30 -04:00
wimax
…
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
2018-03-31 23:33:04 -04:00
x25
net: Use octal not symbolic permissions
2018-03-26 12:07:48 -04:00
xdp
xsk: statistics support
2018-05-03 15:55:25 -07:00
xfrm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-04-01 19:49:34 -04:00
compat.c
net: support compat 64-bit time in {s,g}etsockopt
2018-04-27 19:46:06 -04:00
Kconfig
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
2018-05-07 23:35:08 -04:00
Makefile
xsk: add user memory registration support sockopt
2018-05-03 15:55:23 -07:00
socket.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2018-04-05 11:56:35 -07:00
sysctl_net.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00