OpenCloudOS-Kernel/drivers/net/ethernet/sfc
Linus Torvalds 7c225c69f8 Merge branch 'akpm' (patches from Andrew)
Merge updates from Andrew Morton:

 - a few misc bits

 - ocfs2 updates

 - almost all of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (131 commits)
  memory hotplug: fix comments when adding section
  mm: make alloc_node_mem_map a void call if we don't have CONFIG_FLAT_NODE_MEM_MAP
  mm: simplify nodemask printing
  mm,oom_reaper: remove pointless kthread_run() error check
  mm/page_ext.c: check if page_ext is not prepared
  writeback: remove unused function parameter
  mm: do not rely on preempt_count in print_vma_addr
  mm, sparse: do not swamp log with huge vmemmap allocation failures
  mm/hmm: remove redundant variable align_end
  mm/list_lru.c: mark expected switch fall-through
  mm/shmem.c: mark expected switch fall-through
  mm/page_alloc.c: broken deferred calculation
  mm: don't warn about allocations which stall for too long
  fs: fuse: account fuse_inode slab memory as reclaimable
  mm, page_alloc: fix potential false positive in __zone_watermark_ok
  mm: mlock: remove lru_add_drain_all()
  mm, sysctl: make NUMA stats configurable
  shmem: convert shmem_init_inodecache() to void
  Unify migrate_pages and move_pages access checks
  mm, pagevec: rename pagevec drained field
  ...
2017-11-15 19:42:40 -08:00
..
falcon Merge branch 'akpm' (patches from Andrew) 2017-11-15 19:42:40 -08:00
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
bitfield.h sfc: process RX event inner checksum flags 2017-02-09 16:47:53 -05:00
ef10.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-11-15 11:56:19 -08: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
efx.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-11-15 11:56:19 -08:00
efx.h net: ethernet/sfc: Convert timers to use timer_setup() 2017-10-25 12:57:33 +09: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.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-11-15 11:56:19 -08:00
farch_regs.h
filter.h sfc: insert catch-all filters for encapsulated traffic 2017-01-27 11:59:31 -05:00
io.h
mcdi.c net: ethernet/sfc: Convert timers to use timer_setup() 2017-10-25 12:57:33 +09:00
mcdi.h sfc: configure UDP tunnel offload ports 2017-02-09 16:47:53 -05: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 sfc: support rx-fcs and rx-all 2017-11-01 21:26:35 +09: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 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-11-15 11:56:19 -08:00
rx.c Merge branch 'akpm' (patches from Andrew) 2017-11-15 19:42:40 -08: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.c sfc: MSI-X is the only interrupt mode for EF10 VFs 2017-02-14 12:43:18 -05: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
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.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-11-15 11:56:19 -08:00
tx.h sfc: Firmware-Assisted TSO version 2 2016-11-18 11:55:38 -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
vfdi.h ethernet: codespell comment spelling fixes 2015-03-08 22:54:22 -04:00
workarounds.h sfc: tx ring can only have 2048 entries for all EF10 NICs 2017-04-25 11:19:21 -04:00