diff options
author | 2016-05-02 12:02:09 +0100 | |
---|---|---|
committer | 2016-05-02 12:02:09 +0100 | |
commit | 0ce8428ba9ea13098b828d0881e28368a108709c (patch) | |
tree | 12cbe5d9c27319b8a18ac9fc9cb44e3c5f35408c /net/switchdev/switchdev.c | |
parent | ASoC: Intel: Atom: fix boot warning (diff) | |
parent | Merge remote-tracking branches 'asoc/fix/rt5640' and 'asoc/fix/wm8962' into asoc-linus (diff) | |
download | wireguard-linux-0ce8428ba9ea13098b828d0881e28368a108709c.tar.xz wireguard-linux-0ce8428ba9ea13098b828d0881e28368a108709c.zip |
Merge tag 'asoc-fix-v4.6-rc5' into asoc-intel
ASoC: Fixes for v4.6
This is a fairly large collection of fixes but almost all driver
specific ones, especially to the new Intel drivers which have had a lot
of recent development. The one core fix is a change to the debugfs code
to avoid crashes in some relatively unusual configurations.
Diffstat (limited to '')
-rw-r--r-- | net/switchdev/switchdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 8b5833c1ff2e..2b9b98f1c2ff 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -1079,7 +1079,7 @@ nla_put_failure: * @filter_dev: filter device * @idx: * - * Delete FDB entry from switch device. + * Dump FDB entries from switch device. */ int switchdev_port_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb, struct net_device *dev, |