leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4134069f3e
linux/drivers/staging
History
David S. Miller 6e03f896b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/vxlan.c
	drivers/vhost/net.c
	include/linux/if_vlan.h
	net/core/dev.c

The net/core/dev.c conflict was the overlap of one commit marking an
existing function static whilst another was adding a new function.

In the include/linux/if_vlan.h case, the type used for a local
variable was changed in 'net', whereas the function got rewritten
to fix a stacked vlan bug in 'net-next'.

In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next'
overlapped with an endainness fix for VHOST 1.0 in 'net'.

In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter
in 'net-next' whereas in 'net' there was a bug fix to pass in the
correct network namespace pointer in calls to this function.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-02-05 14:33:28 -08:00
..
android Merge branch 'for-3.19' of git://linux-nfs.org/~bfields/linux 2014-12-16 15:25:31 -08:00
board
clocking-wizard Drivers:staging:clocking-wizard: Added a newline 2014-12-02 16:45:24 -08:00
comedi staging: comedi: change some printk calls to pr_err 2014-12-02 16:54:43 -08:00
cptm1217 staging: cptm1217: Remove useless cast on void pointer 2014-10-30 13:05:46 -07:00
dgap Drivers:staging:dgap: Added a blank line after declaration 2014-11-26 14:00:22 -08:00
dgnc staging: dgnc: Remove useless cast on void pointer 2014-10-30 13:05:46 -07:00
emxx_udc Staging patches for 3.19-rc1 2014-12-15 18:06:13 -08:00
ft1000 staging: ft1000 : replace __attribute ((__packed__) with __packed 2014-12-02 16:48:10 -08:00
fwserial staging: fwserial: remove multiple blank lines 2014-11-26 13:53:25 -08:00
gdm72xx More ACPI and power management updates for 3.19-rc1 2014-12-18 20:28:33 -08:00
gdm724x staging: gdm724x: Fix incorrect type in assignment 2014-10-20 10:29:18 +08:00
goldfish
gs_fpgaboot staging: gs_fpgaboot: fix a compiler warning with make W=2 2014-10-29 17:39:55 +08:00
iio Staging patches for 3.19-rc1 2014-12-15 18:06:13 -08:00
line6 staging: line6: fix midibuf.c coding style issue 2014-09-23 23:41:25 -07:00
lustre vm: add VM_FAULT_SIGSEGV handling support 2015-01-29 10:51:32 -08:00
media media fixes for v3.19-rc6 2015-01-24 14:34:54 -08:00
mt29f_spinand
netlogic staging: netlogic: drop owner assignment from platform_drivers 2014-10-20 16:21:40 +02:00
nvec staging: nvec: specify a platform-device base id 2015-01-25 19:04:31 +08:00
octeon Staging patches for 3.19-rc1 2014-12-15 18:06:13 -08:00
octeon-usb Staging patches for 3.19-rc1 2014-12-15 18:06:13 -08:00
olpc_dcon staging: olpc_dcon: Deletion of a check before backlight_device_unregister() 2014-11-26 14:00:22 -08:00
ozwpan Staging patches for 3.19-rc1 2014-12-15 18:06:13 -08:00
panel staging: panel: Move LCD-related state into struct lcd 2014-12-02 16:34:35 -08:00
rtl8188eu staging: rtl8188eu: hal: hal_intf.c: Cleaning up functions that are not used anywhere 2014-12-02 16:29:26 -08:00
rtl8192e drivers: staging: rtl8192e: Include "asm/unaligned.h" instead of "access_ok.h" in "rtl819x_BAProc.c" 2014-12-02 16:47:11 -08:00
rtl8192u Staging: rtl8192u: Use put_unaligned_le16 2014-11-03 16:09:27 -08:00
rtl8712 staging: rtl8712: remove unnecessary else after return 2014-12-02 16:54:43 -08:00
rtl8723au Here's a big pile of changes for this round. 2015-01-15 19:16:56 -05:00
rts5208 staging: rts5208: Remove useless cast on void pointer 2014-10-30 13:06:03 -07:00
skein staging: skein: fix sparse warnings related to shift operator 2014-11-22 10:53:09 -08:00
slicoss Staging: slicoss: Fix long line issues in slicoss.c 2014-12-02 16:54:43 -08:00
speakup staging: speakup: Use time_after_eq to compare jiffies in speakup_keypc.c 2014-10-20 10:29:19 +08:00
ste_rmi4 Staging: ste_rmi4: add new line after declarations 2014-09-23 13:44:11 -07:00
unisys staging: unisys: remove duplicate header 2014-12-02 16:50:08 -08:00
vme Staging: vme: devices: Use kasprintf 2014-10-27 10:33:05 +08:00
vt6655 staging: vt6655: fix sparse warning: argument type 2015-01-12 19:49:47 -08:00
vt6656 Staging patches for 3.19-rc1 2014-12-15 18:06:13 -08:00
wlan-ng Here's a big pile of changes for this round. 2015-01-15 19:16:56 -05:00
xgifb staging: xgifb: Removed a definition which was not used in driver 2014-11-03 16:10:38 -08:00
Kconfig Staging patches for 3.19-rc1 2014-12-15 18:06:13 -08:00
Makefile Staging patches for 3.19-rc1 2014-12-15 18:06:13 -08:00
staging.c