Ingo Molnar 8c5db92a70 Merge branch 'linus' into locking/core, to resolve conflicts ... Conflicts: include/linux/compiler-clang.h include/linux/compiler-gcc.h include/linux/compiler-intel.h include/uapi/linux/stddef.h Signed-off-by: Ingo Molnar <mingo@kernel.org>		2017-11-07 10:32:44 +01:00
..
falcon	Merge branch 'linus' into locking/core, to resolve conflicts	2017-11-07 10:32:44 +01:00
bitfield.h	sfc: process RX event inner checksum flags	2017-02-09 16:47:53 -05:00
ef10_regs.h	sfc: Update EF10 register definitions	2016-11-18 11:55:37 -05:00
ef10_sriov.c	sfc: remove duplicate up_write on VF filter_sem	2017-06-20 15:40:00 -04:00
ef10_sriov.h	sfc: support ndo_get_phys_port_id even when !CONFIG_SFC_SRIOV	2017-01-10 14:16:17 -05:00
ef10.c	locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()	2017-10-25 11:01:08 +02:00
efx.c	locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()	2017-10-25 11:01:08 +02:00
efx.h	net: sched: get rid of struct tc_to_netdev	2017-08-07 09:42:37 -07:00
enum.h	sfc: remove RESET_TYPE_RX_RECOVERY	2016-12-01 15:39:38 -05:00
ethtool.c	sfc: process RX event inner checksum flags	2017-02-09 16:47:53 -05:00
farch_regs.h
farch.c	locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()	2017-10-25 11:01:08 +02:00
filter.h	sfc: insert catch-all filters for encapsulated traffic	2017-01-27 11:59:31 -05:00
io.h
Kconfig	ethernet: sfc: Add Kconfig entry for vendor Solarflare	2016-12-20 14:19:38 -05:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mcdi_mon.c	sfc: remove EFX_BUG_ON_PARANOID, use EFX_WARN_ON_[ONCE_]PARANOID instead	2016-12-03 16:11:00 -05:00
mcdi_pcol.h	scripts/spelling.txt: add "an one" pattern and fix typo instances	2017-02-27 18:43:46 -08:00
mcdi_port.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-08-15 20:23:23 -07:00
mcdi.c	sfc: correct comment on efx_mcdi_process_event	2017-07-01 15:24:06 -07:00
mcdi.h	sfc: configure UDP tunnel offload ports	2017-02-09 16:47:53 -05:00
mtd.c
net_driver.h	sfc: MSI-X is the only interrupt mode for EF10 VFs	2017-02-14 12:43:18 -05:00
nic.c	sfc: work around TRIGGER_INTERRUPT command not working on SFC9140	2016-08-26 21:43:52 -07:00
nic.h	locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()	2017-10-25 11:01:08 +02:00
ptp.c	locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()	2017-10-25 11:01:08 +02:00
rx.c	sfc: set csum_level for encapsulated packets	2017-02-09 16:47:53 -05:00
selftest.c	networking: make skb_put & friends return void pointers	2017-06-16 11:48:39 -04:00
selftest.h	sfc: work around TRIGGER_INTERRUPT command not working on SFC9140	2016-08-26 21:43:52 -07:00
siena_sriov.c	sfc: save old MAC address in case sriov_mac_address_changed fails	2015-05-21 18:43:53 -04:00
siena_sriov.h	sfc: save old MAC address in case sriov_mac_address_changed fails	2015-05-21 18:43:53 -04:00
siena.c	sfc: MSI-X is the only interrupt mode for EF10 VFs	2017-02-14 12:43:18 -05:00
sriov.c	sfc: support ndo_get_phys_port_id even when !CONFIG_SFC_SRIOV	2017-01-10 14:16:17 -05:00
sriov.h	sfc: support ndo_get_phys_port_id even when !CONFIG_SFC_SRIOV	2017-01-10 14:16:17 -05:00
tx_tso.c	sfc: remove EFX_BUG_ON_PARANOID, use EFX_WARN_ON_[ONCE_]PARANOID instead	2016-12-03 16:11:00 -05:00
tx.c	locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()	2017-10-25 11:01:08 +02:00
tx.h	sfc: Firmware-Assisted TSO version 2	2016-11-18 11:55:38 -05:00
vfdi.h
workarounds.h	sfc: tx ring can only have 2048 entries for all EF10 NICs	2017-04-25 11:19:21 -04:00