OSDN Git Service

(root) / uclinux-h8 / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e716431) | patch
vxlan: Correct merge error.
authorDavid S. Miller <davem@davemloft.net>
Fri, 21 Dec 2018 00:14:22 +0000 (16:14 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 21 Dec 2018 00:14:22 +0000 (16:14 -0800)
commit3a6d528a5e0179b1e8b20033c5cb7384dd7a830d
treef0b06d6fc3d4fe5b7fc22f55ab34036cef1bef4btree | snapshot
parente716431356df2bc935f6516b14ebcff9fd3cc0d0commit | diff
vxlan: Correct merge error.

When resolving the conflict wrt. the vxlan_fdb_update call
in vxlan_changelink() I made the last argument false instead
of true.

Fix this.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/vxlan.c diff | blob | history
About OSDN
Find Software
Develop Software
Help