David S. Miller 6b6cbc1471 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts were simply overlapping changes.  In the net/ipv4/route.c
case the code had simply moved around a little bit and the same fix
was made in both 'net' and 'net-next'.

In the net/sched/sch_generic.c case a fix in 'net' happened at
the same time that a new argument was added to qdisc_hash_add().

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

2017-04-15 21:16:30 -04:00

..

f_acm.c

usb: gadget: acm: fix endianness in notifications

2017-03-22 11:20:52 +02:00

f_ecm.c

usb: gadget: Update usb_assign_descriptors for SuperSpeedPlus

2016-03-04 15:14:23 +02:00

f_eem.c

usb: gadget: prevent potenial null pointer dereference on skb->len

2016-09-06 10:44:03 +03:00

f_fs.c

Revert "usb: gadget: f_fs: Fix ExtCompat descriptor validation"

2017-03-06 16:55:04 +02:00

f_hid.c

usb: gadget: f_hid: fix: Don't access hidg->req without spinlock held

2017-03-22 11:21:10 +02:00

f_loopback.c

usb: gadget: remove variable ret and remove unnecessary if statement

2016-09-09 13:38:37 +03:00

f_mass_storage.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h>

2017-03-02 08:42:29 +01:00

f_mass_storage.h

usb: gadget: Add per-lun inquiry string

2016-08-25 12:13:13 +03:00

f_midi.c

usb: gadget: remove useless parameter in alloc_ep_req()

2016-08-25 12:13:19 +03:00

f_ncm.c

drivers: add explicit interrupt.h includes

2017-03-30 11:05:34 -07:00

f_obex.c

usb: gadget: Update usb_assign_descriptors for SuperSpeedPlus

2016-03-04 15:14:23 +02:00

f_phonet.c

net: use core MTU range checking in misc drivers

2016-10-20 14:51:10 -04:00

f_printer.c

usb: gadget: printer: Remove pnp_string static buffer

2017-01-24 11:04:08 +02:00

f_rndis.c

usb: gadget: function: f_rndis: socket buffer may be NULL

2016-08-22 10:45:12 +03:00

f_serial.c

usb: gadget: Update usb_assign_descriptors for SuperSpeedPlus

2016-03-04 15:14:23 +02:00

f_sourcesink.c

usb: gadget: remove useless parameter in alloc_ep_req()

2016-08-25 12:13:19 +03:00

f_subset.c

usb: gadget: Update usb_assign_descriptors for SuperSpeedPlus

2016-03-04 15:14:23 +02:00

f_tcm.c

usb: gadget: Correct usb EP argument for BOT status request

2017-03-30 01:36:50 -07:00

f_uac1.c

usb: gadget: Update usb_assign_descriptors for SuperSpeedPlus

2016-03-04 15:14:23 +02:00

f_uac2.c

usb: gadget: uac2: add req_number as parameter

2017-01-24 11:04:21 +02:00

f_uvc.c

usb: gadget: f_uvc: Sanity check wMaxPacketSize for SuperSpeed

2017-03-22 11:21:09 +02:00

f_uvc.h

usb: gadget: f_uvc: remove compatibility layer

2014-09-09 09:49:41 -05:00

g_zero.h

usb: gadget: define free_ep_req as universal function

2015-12-15 09:12:41 -06:00

Makefile

usb: gadget: f_tcm: convert to new function interface with backward compatibility

2015-12-20 19:40:34 -08:00

ndis.h

…

rndis.c

usb: gadget: Fix checkpatch error for braces

2016-11-18 13:54:41 +02:00

rndis.h

usb: gadget: Fix checkpatch error for braces

2016-11-18 13:54:41 +02:00

storage_common.c

usb: gadget: Add per-lun inquiry string

2016-08-25 12:13:13 +03:00

storage_common.h

usb: gadget: Add per-lun inquiry string

2016-08-25 12:13:13 +03:00

tcm.h

usb-gadget/tcm: Conversion to percpu_ida tag pre-allocation

2016-03-10 21:48:14 -08:00

u_ecm.h

…

u_eem.h

…

u_ether_configfs.h

usb: gadget: ether: Add \n to each attribute of ethernet functions

2017-01-24 11:04:07 +02:00

u_ether.c

usb: gadget: ether: Add \n to each attribute of ethernet functions

2017-01-24 11:04:07 +02:00

u_ether.h

usb: gadget: u_ether: add a flag to avoid skb_reserve() calling

2016-08-31 10:06:03 +03:00

u_fs.h

usb: gadget: f_fs: Accept up to 30 endpoints.

2017-01-24 11:04:23 +02:00

u_gether.h

…

u_hid.h

usb: gadget: hid: add configfs support

2014-11-06 16:18:19 -06:00

u_midi.h

usb: gadget: f_midi: add configfs support

2014-11-05 13:37:17 -06:00

u_ncm.h

…

u_phonet.h

…

u_printer.h

usb: gadget: printer: Remove pnp_string static buffer

2017-01-24 11:04:08 +02:00

u_rndis.h

usb: gadget: rndis: remove the limit of available rndis connections

2015-05-07 13:47:17 -05:00

u_serial.c

usb: gadget: serial: fix possible Oops caused by calling kthread_stop(NULL)

2016-11-18 13:55:19 +02:00

u_serial.h

…

u_tcm.h

usb: gadget: f_tcm: convert to new function interface with backward compatibility

2015-12-20 19:40:34 -08:00

u_uac1.c

usb: gadget: u_uac1: fix one code style problem

2015-01-15 09:41:48 -06:00

u_uac1.h

usb: gadget: remove gadget_chips.h

2015-08-06 09:35:20 -05:00

u_uac2.h

usb: gadget: uac2: add req_number as parameter

2017-01-24 11:04:21 +02:00

u_uvc.h

usb: gadget: uvc: configfs support in uvc function

2015-01-12 12:13:26 -06:00

uvc_configfs.c

fs: configfs: don't return anything from drop_link

2016-12-01 10:50:49 +01:00

uvc_configfs.h

usb: gadget: uvc: configfs support in uvc function

2015-01-12 12:13:26 -06:00

uvc_queue.c

[media] vb2: replace void *alloc_ctxs by struct device *alloc_devs

2016-07-08 14:45:07 -03:00

uvc_queue.h

[media] media: videobuf2: Restructure vb2_buffer

2015-10-01 09:04:43 -03:00

uvc_v4l2.c

usb: gadget: Fix checkpatch error for braces

2016-11-18 13:54:41 +02:00

uvc_v4l2.h

usb: gadget: uvc: separately compile some components of f_uvc

2014-09-09 09:49:12 -05:00

uvc_video.c

usb: gadget: composite: always set ep->mult to a sensible value

2016-10-31 11:15:33 +02:00

uvc_video.h

usb: gadget: uvc: separately compile some components of f_uvc

2014-09-09 09:49:12 -05:00

uvc.h

usb: gadget: Fix checkpatch error for braces

2016-11-18 13:54:41 +02:00