David S. Miller 3118e6e19d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-08-09 16:28:45 -07:00

..

capi

isdn: kcapi: make capi_version const

2017-08-07 14:55:36 -07:00

divert

isdn: divert: fix sprintf buffer overflow warning

2017-07-14 09:03:11 -07:00

gigaset

net: introduce __skb_put_[zero, data, u8]

2017-06-20 13:30:14 -04:00

hardware

isdn: hfcsusb: constify usb_device_id

2017-08-08 21:38:27 -07:00

hisax

isdn: hisax: hfc_usb: constify usb_device_id

2017-08-08 21:38:27 -07:00

hysdn

hysdn: fix to a race condition in put_log_buffer

2017-08-07 11:25:14 -07:00

i4l

isdn/i4l: fix buffer overflow

2017-08-02 20:43:36 -07:00

isdnloop

Merge branch 'work.misc-set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-07-05 13:13:32 -07:00

mISDN

net: convert sk_buff.users from atomic_t to refcount_t

2017-07-01 07:39:07 -07:00

Kconfig

…

Makefile

isdn: i4l: move active-isdn drivers to staging

2016-03-05 15:00:38 -08:00