aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_forward.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-03-01 17:28:01 -0500
committerDavid S. Miller <davem@davemloft.net>2016-03-01 17:28:01 -0500
commit8b4837c879176e8d9ab46672cd274c0f8aae4715 (patch)
tree0acd32393a267c63e7e89286a367b2e9dbe1735e /net/ipv4/ip_forward.c
parentnet: ipv6/l3mdev: Move host route on saved address if necessary (diff)
parentnet/mlx5: Fix global UAR mapping (diff)
downloadlinux-dev-8b4837c879176e8d9ab46672cd274c0f8aae4715.tar.xz
linux-dev-8b4837c879176e8d9ab46672cd274c0f8aae4715.zip
Merge branch 'mlx5-next'
Saeed Mahameed says: ==================== mlx5 driver updates This series includes some bug fixes and updates for the mlx5 core and ethernet driver. From Gal, two fixes that protects the update CQ moderation flows when it is not allowed. From Moshe, two fixes for the core and ethernet driver in non-cached(NC) and write combining(WC) buffers mappings, which prevents the driver from double memory mappings. From Or, reduce the firmware command completion timeout. From Tariq, several small trivial fixes. Changes from v0: - "Fix global UAR mapping" commit messages updated to explain ARCH_HAS_IOREMAP_WC usage. - rebased to commit 8d3f2806f8fb 'Merge branch ethtool-ksettings' Changes from v1: - Removed ARCH_HAS_IOREMAP_WC config flag from "Fix global UAR mapping" commit, as it was not accurate to use it. - Squashed "Fix global UAR mapping" and "net/mlx5: Avoid double mapping of io mapped memory" - Added more info for "Fix global UAR mapping" in commit message Changes from v2: - None. resubmission per Dave's request due to two parallel submissions to mlx5 driver. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_forward.c')
0 files changed, 0 insertions, 0 deletions