David S. Miller f9aa9dc7d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All conflicts were simple overlapping changes except perhaps for the Thunder driver. That driver has a change_mtu method explicitly for sending a message to the hardware. If that fails it returns an error. Normally a driver doesn't need an ndo_change_mtu method becuase those are usually just range changes, which are now handled generically. But since this extra operation is needed in the Thunder driver, it has to stay. However, if the message send fails we have to restore the original MTU before the change because the entire call chain expects that if an error is thrown by ndo_change_mtu then the MTU did not change. Therefore code is added to nicvf_change_mtu to remember the original MTU, and to restore it upon nicvf_update_hw_max_frs() failue. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-11-22 13:27:16 -05:00
..
agp	agp/intel: Flush chipset writes after updating a single PTE	2016-08-18 22:36:23 +01:00
hw_random	hwrng: core - Don't use a stack buffer in add_early_randomness()	2016-10-19 11:20:21 +08:00
ipmi	ipmi/bt-bmc: change compatible node to 'aspeed, ast2400-ibt-bmc'	2016-11-17 16:31:09 -08:00
mwave	char/mwave: remove custom BOOLEAN type	2016-08-31 14:22:49 +02:00
pcmcia	net: use core MTU range checking in WAN drivers	2016-10-20 14:51:09 -04:00
tpm	tpm: remove invalid min length check from tpm_do_selftest()	2016-10-31 09:15:27 -06:00
xilinx_hwicap	char:xilinx_hwicap:buffer_icap - change 1/0 to true/false for bool type variable in function buffer_icap_set_configuration().	2015-06-12 16:58:33 -07:00
xillybus	char: xillybus: Fix spelling mistake and comment	2016-08-31 14:47:54 +02:00
Kconfig	RTC for 4.8	2016-08-05 09:48:22 -04:00
Makefile	RTC for 4.8	2016-08-05 09:48:22 -04:00
apm-emulation.c	apm-emulation: add hibernation APM events to support suspend2disk	2014-01-07 13:50:28 +01:00
applicom.c	applicom: dereferencing NULL on error path	2014-05-27 17:43:12 -07:00
applicom.h	…
bfin-otp.c	miscdevice: Use module_misc_device() macro	2016-08-31 14:12:35 +02:00
bsr.c	bsr: avoid format string leaking into device name	2014-07-09 16:59:15 -07:00
ds1302.c	…
ds1620.c	ds1620: single_open() leak	2013-05-05 00:11:29 -04:00
dsp56k.c	dsp56k: prevent a harmless underflow	2016-07-14 16:21:53 +09:00
dtlk.c	new helper: file_inode(file)	2013-02-22 23:31:31 -05:00
efirtc.c	drivers/char: make efirtc.c driver explicitly non-modular	2015-09-20 19:32:35 -07:00
generic_nvram.c	don't open-code generic_file_llseek_size()	2015-12-09 13:00:45 -05:00
hangcheck-timer.c	hangcheck-timer: cleanup casting in hangcheck_init()	2014-11-07 11:24:01 -08:00
hpet.c	hpet: Drop stale URLs	2016-02-17 09:39:56 +01:00
lp.c	char: Int overflow in lp_do_ioctl().	2013-12-18 16:39:54 -08:00
mbcs.c	don't open-code generic_file_llseek_size()	2015-12-09 13:00:45 -05:00
mbcs.h	…
mem.c	drivers: char: mem: Check {read,write}_kmem() addresses	2016-08-31 15:21:18 +02:00
misc.c	char: make misc_deregister a void function	2015-08-05 10:35:49 -07:00
mmtimer.c	…
mspec.c	tree wide: use kvfree() than conditional kfree()/vfree()	2016-01-22 17:02:18 -08:00
nsc_gpio.c	new helper: file_inode(file)	2013-02-22 23:31:31 -05:00
nvram.c	char/nvram: set array of const as const	2016-02-08 14:57:30 -08:00
nwbutton.c	char: nwbutton: avoid unused variable warning	2016-02-09 17:39:56 -08:00
nwbutton.h	…
nwflash.c	new helpers: no_seek_end_llseek{,_size}()	2015-12-23 10:41:31 -05:00
pc8736x_gpio.c	…
powernv-op-panel.c	powerpc/powernv: Add driver for operator panel on FSP machines	2016-06-29 17:33:46 +10:00
ppdev.c	ppdev: fix double-free of pp->pdev->name	2016-11-10 15:24:02 +01:00
ps3flash.c	wrappers for ->i_mutex access	2016-01-22 18:04:28 -05:00
random.c	This adds a new gcc plugin named "latent_entropy". It is designed to	2016-10-15 10:03:15 -07:00
raw.c	drivers: char: raw: Removed unnecessary braces	2016-02-08 14:57:30 -08:00
rtc.c	various char drivers: remove deprecated IRQF_DISABLED	2013-10-16 12:36:10 -07:00
scx200_gpio.c	…
snsc.c	snsc: check return value of class_create	2016-08-31 14:47:54 +02:00
snsc.h	…
snsc_event.c	various char drivers: remove deprecated IRQF_DISABLED	2013-10-16 12:36:10 -07:00
sonypi.c	fs: Replace current_fs_time() with current_time()	2016-09-27 21:06:22 -04:00
tb0219.c	mips: separate extable.h, switch module.h to it	2016-10-05 18:36:18 -04:00
tile-srom.c	tile-srom: avoid krealloc(... __GFP_ZERO) pattern	2016-08-30 14:45:50 +02:00
tlclk.c	tlclk: remove deprecated IRQF_DISABLED	2013-10-16 12:36:10 -07:00
toshiba.c	toshiba laptop: replace ioremap_cache with ioremap	2015-08-05 17:26:00 -07:00
ttyprintk.c	ttyprintk: Neaten and simplify printing	2016-09-13 17:30:17 +02:00
uv_mmtimer.c	…
virtio_console.c	virtio: console: Unlock vqs while freeing buffers	2016-10-31 00:21:44 +02:00