xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
89b1698c93a9dee043154f33d96bca9964e705f1
android_kernel_xiaomi_sm8450/net
History
David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 
The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-08-02 10:55:32 -07:00
..
6lowpan
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
9p
net/9p/client.c: put refcount of trans_mod in error case in parse_opts()
2018-07-14 11:11:09 -07:00
802
treewide: setup_timer() -> timer_setup()
2017-11-21 15:57:07 -08:00
8021q
net: remove blank lines at end of file
2018-07-24 14:10:43 -07:00
appletalk
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
atm
net: simplify sock_poll_wait
2018-07-30 09:10:25 -07:00
ax25
ax25: remove blank line at EOF
2018-07-24 14:10:42 -07:00
batman-adv
Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux
2018-07-20 21:17:12 -07:00
bluetooth
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
bpf
bpf: fix panic due to oob in bpf_prog_test_run_skb
2018-07-11 16:10:57 -07:00
bpfilter
bpfilter: remove trailing newline
2018-07-24 14:10:42 -07:00
bridge
net: bridge: add support for backup port
2018-07-23 09:32:15 -07:00
caif
net: simplify sock_poll_wait
2018-07-30 09:10:25 -07:00
can
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
ceph
Merge tag 'ceph-for-4.18-rc1' of git://github.com/ceph/ceph-client
2018-06-15 07:24:58 +09:00
core
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-08-02 10:55:32 -07:00
dcb
net: dcb: Add priority-to-DSCP map getters
2018-07-27 13:17:50 -07:00
dccp
net: simplify sock_poll_wait
2018-07-30 09:10:25 -07:00
decnet
decnet: whitespace fixes
2018-07-24 14:10:42 -07:00
dns_resolver
net: remove blank lines at end of file
2018-07-24 14:10:43 -07:00
dsa
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-08-02 10:55:32 -07:00
ethernet
net: Convert GRO SKB handling to list_head.
2018-06-26 11:33:04 +09:00
hsr
net: hsr: Convert timers to use timer_setup()
2017-10-25 13:00:27 +09:00
ieee802154
net: remove blank lines at end of file
2018-07-24 14:10:43 -07:00
ife
net: sched: ife: check on metadata length
2018-04-22 21:12:00 -04:00
ipv4
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-08-02 10:55:32 -07:00
ipv6
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-08-02 10:55:32 -07:00
iucv
net: simplify sock_poll_wait
2018-07-30 09:10:25 -07:00
kcm
net: remove blank lines at end of file
2018-07-24 14:10:43 -07:00
key
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2018-07-27 09:33:37 -07:00
l2tp
l2tp: drop ->mru from struct l2tp_session
2018-07-27 13:34:53 -07:00
l3mdev
…
lapb
treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts
2017-11-21 16:35:54 -08:00
llc
llc: fix whitespace issues
2018-07-24 14:10:42 -07:00
mac80211
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-07-24 19:21:58 -07:00
mac802154
net/mac802154: disambiguate mac80215 vs mac802154 trace events
2018-03-28 22:55:18 +02:00
mpls
mpls: remove trailing whitepace
2018-07-24 14:10:42 -07:00
ncsi
net/ncsi: Use netdev_dbg for debug messages
2018-06-20 07:26:58 +09:00
netfilter
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-07-24 19:21:58 -07:00
netlabel
audit: use inline function to get audit context
2018-05-14 17:24:18 -04:00
netlink
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-08-02 10:55:32 -07:00
netrom
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
nfc
net: simplify sock_poll_wait
2018-07-30 09:10:25 -07:00
nsh
nsh: set mac len based on inner packet
2018-07-12 16:55:29 -07:00
openvswitch
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-08-02 10:55:32 -07:00
packet
Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux
2018-07-20 21:17:12 -07:00
phonet
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
psample
MAINTAINERS: Update Yotam's E-mail
2017-11-01 12:19:03 +09:00
qrtr
net: qrtr: Reset the node and port ID of broadcast messages
2018-07-05 20:20:03 +09:00
rds
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-08-02 10:55:32 -07:00
rfkill
rfkill: Create rfkill-none LED trigger
2018-05-23 11:26:45 +02:00
rose
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
rxrpc
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-08-02 10:55:32 -07:00
sched
net: sched: make tcf_chain_{get,put}() static
2018-08-01 10:06:19 -07:00
sctp
sctp: whitespace fixes
2018-07-24 14:10:42 -07:00
smc
net: simplify sock_poll_wait
2018-07-30 09:10:25 -07:00
strparser
strparser: remove redundant variable 'rd_desc'
2018-08-01 10:00:06 -07:00
sunrpc
Merge tag 'nfs-for-4.18-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
2018-06-22 06:21:34 +09:00
switchdev
net: bridge: Add/del switchdev object on host join/leave
2017-11-10 13:41:40 +09:00
tipc
net/tipc: remove redundant variables 'tn' and 'oport'
2018-08-01 09:46:49 -07:00
tls
net/tls: Use kmemdup to simplify the code
2018-08-01 09:47:47 -07:00
unix
net: simplify sock_poll_wait
2018-07-30 09:10:25 -07:00
vmw_vsock
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
wimax
wimax: remove blank lines at EOF
2018-07-24 14:10:42 -07:00
wireless
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-07-24 19:21:58 -07:00
x25
x25: remove blank lines at EOF
2018-07-24 14:10:42 -07:00
xdp
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-08-02 10:55:32 -07:00
xfrm
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-08-02 10:55:32 -07:00
compat.c
net: support compat 64-bit time in {s,g}etsockopt
2018-04-27 19:46:06 -04:00
Kconfig
net: remove blank lines at end of file
2018-07-24 14:10:43 -07:00
Makefile
bpfilter: check compiler capability in Kconfig
2018-06-28 13:36:39 +09:00
socket.c
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-08-02 10:55:32 -07:00
sysctl_net.c
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00