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

..

i40e_adminq_cmd.h

i40e/i40evf: update WOL and I40E_AQC_ADDR_VALID_MASK flags

2017-06-20 18:17:10 -07:00

i40e_adminq.c

i40e: reduce wait time for adminq command completion

2017-04-19 17:38:25 -07:00

i40e_adminq.h

i40e: reduce wait time for adminq command completion

2017-04-19 17:38:25 -07:00

i40e_alloc.h

…

i40e_client.c

i40e: use dev_dbg instead of dev_info when warning about missing routine

2017-06-20 18:17:10 -07:00

i40e_client.h

i40e: KISS the client interface

2017-03-15 01:57:08 -07:00

i40e_common.c

i40e: prevent snprintf format specifier truncation

2017-08-27 15:43:41 -07:00

i40e_dcb_nl.c

i40e: Change some messages from info to debug only

2015-10-15 01:58:41 -07:00

i40e_dcb.c

i40e: Support firmware CEE DCB UP to TC map re-definition

2017-06-20 18:17:10 -07:00

i40e_dcb.h

i40e: Add parsing for CEE DCBX TLVs

2015-10-08 15:11:38 -07:00

i40e_debugfs.c

locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()

2017-10-25 11:01:08 +02:00

i40e_devids.h

i40e: Add support for 25G devices

2016-12-06 20:59:43 -08:00

i40e_diag.c

i40e: use BIT and BIT_ULL macros

2015-07-23 05:33:55 -07:00

i40e_diag.h

…

i40e_ethtool.c

locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()

2017-10-25 11:01:08 +02:00

i40e_fcoe.c

networking: make skb_put & friends return void pointers

2017-06-16 11:48:39 -04:00

i40e_fcoe.h

i40e: use BIT and BIT_ULL macros

2015-07-23 05:33:55 -07:00

i40e_hmc.c

i40e: fix an uninitialized variable bug

2016-05-14 00:21:51 -07:00

i40e_hmc.h

i40e: use BIT and BIT_ULL macros

2015-07-23 05:33:55 -07:00

i40e_lan_hmc.c

i40e: use explicit cast from u16 to u8

2015-12-12 21:08:26 -08:00

i40e_lan_hmc.h

i40e/i40evf: Big endian fixes for handling HMC

2014-06-26 04:44:57 -07:00

i40e_main.c

locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()

2017-10-25 11:01:08 +02:00

i40e_nvm.c

i40e: Fix comment about locking for __i40e_read_nvm_word()

2017-10-10 07:54:35 -07:00

i40e_osdep.h

i40e: Drop FCoE code from core driver files

2017-03-27 16:47:43 -07:00

i40e_prototype.h

i40e: avoid NVM acquire deadlock during NVM update

2017-09-05 17:48:22 -07:00

i40e_ptp.c

locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()

2017-10-25 11:01:08 +02:00

i40e_register.h

i40e: Expose some registers to program parser, FD and RSS logic

2016-02-18 23:49:31 -08:00

i40e_status.h

…

i40e_trace.h

i40e/i40evf: Add tracepoints

2017-04-19 16:47:31 -07:00

i40e_txrx.c

i40e: Add programming descriptors to cleaned_count

2017-10-26 07:42:58 -07:00

i40e_txrx.h

i40e/i40evf: avoid dynamic ITR updates when polling or low packet rate

2017-08-27 16:15:24 -07:00

i40e_type.h

i40e: Store the requested FEC information

2017-08-27 15:43:34 -07:00

i40e_virtchnl_pf.c

i40e/i40evf: support for VF VLAN tag stripping control

2017-08-27 15:47:43 -07:00

i40e_virtchnl_pf.h

virtchnl: convert to new macros

2017-06-01 14:15:21 -07:00

i40e.h

i40e: remove workaround for Open Firmware MAC address

2017-08-25 14:46:20 -07:00

Makefile

i40e/i40evf: Add tracepoints

2017-04-19 16:47:31 -07:00