Merge branch 'nfp-flower-tc-block-support-and-nfp-PCI-updates'
David S. Miller authored

Jakub Kicinski says:

====================
nfp: flower tc block support and nfp PCI updates

This series improves the nfp PCIe code by making use of the new
pcie_print_link_status() helper and resetting NFP locks when
driver loads.  This can help us avoid lock ups after host crashes
and is rebooted with PCIe reset or when kdump kernel is loaded.

The flower changes come from John, he says:

This patchset fixes offload issues when multiple repr netdevs are bound to
a tc block and filter rules added. Previously the rule would be passed to
the reprs and would be rejected in all but the first as the cookie value
will indicate a duplicate. The first patch extends the flow lookup
function to consider both host context and ingress netdev along with the
cookie value. This means that a rule with a given cookie can exist
multiple times assuming the ingress netdev is different. The host context
ensures that stats from fw are associated with the correct instance of the
rule.

The second patch protects against rejecting add/del/stat messages when a
rule has a repr as both an ingress port and an egress dev. In such cases a
callback can be triggered twice (once for ingress and once for egress)
and can lead to duplicate rule detection or incorrect double calls.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
81e696b5
Name Last commit Last update
Documentation ipconfig: Write NTP server IPs to /proc/net/ipconfig/ntp_servers
LICENSES LICENSES: Add MPL-1.1 license
arch Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
block blk-mq: Revert "blk-mq: reimplement blk_mq_hw_queue_mapped"
certs certs/blacklist_nohashes.c: fix const confusion in certs blacklist
crypto Merge tag 'kbuild-v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
drivers nfp: flower: ignore duplicate cb requests for same rule
firmware kbuild: remove all dummy assignments to obj-
fs Merge tag '4.17-rc1-SMB3-CIFS' of git://git.samba.org/sfrench/cifs-2.6
include sctp: fix const parameter violation in sctp_make_sack
init Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
ipc ipc/shm: fix use-after-free of shm file via remap_file_pages()
kernel Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
lib rhashtable: improve rhashtable_walk stability when stop/start used.
mm mm/filemap.c: fix NULL pointer in page_cache_tree_insert()
net net: rules: Move l3mdev attribute validation to a helper
samples Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
scripts Merge tag 'kbuild-v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
security Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
sound Merge tag 'sound-4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
tools Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
usr kbuild: rename built-in.o to built-in.a
virt Merge tag 'kvm-arm-for-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
.clang-format clang-format: add configuration file
.cocciconfig scripts: add Linux .cocciconfig for coccinelle
.get_maintainer.ignore
.gitattributes
.gitignore
.mailmap
COPYING
CREDITS
Kbuild
Kconfig
MAINTAINERS
Makefile
README
Linux kernel
============

There are several guides for kernel developers and users. These guides can
be rendered in a number of formats, like HTML and PDF. Please read
Documentation/admin-guide/README.rst first.

In order to build the documentation, use ``make htmldocs`` or
``make pdfdocs``.  The formatted documentation can also be read online at:

    https://www.kernel.org/doc/html/latest/

There are various text files in the Documentation/ subdirectory,
several of them using the Restructured Text markup notation.
See Documentation/00-INDEX for a list of what is contained in each file.

Please read the Documentation/process/changes.rst file, as it contains the
requirements for building and running the kernel, and information about
the problems which may result by upgrading your kernel.