summaryrefslogtreecommitdiff
path: root/include/net/wext.h
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2017-01-18 18:30:09 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2017-02-08 14:16:19 +0100
commit1ba1c41408df8a9d2f8b9b67e4c9e6f59b29d8ee (patch)
treeef528ea2fda2687c6d8d57564fad83e9d9f1afd9 /include/net/wext.h
parentbaa2d42cff088d9f962697a10e0345b444c8c409 (diff)
netfilter: nf_tables: rename deactivate_one() to flush()
Although semantics are similar to deactivate() with no implicit element lookup, this is only called from the set flush path, so better rename this to flush(). Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net/wext.h')
0 files changed, 0 insertions, 0 deletions
6f9a506ee8a (diff)
Merge tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC fix from Alexandre Belloni: "A single fix for this cycle. It is worth taking it for 4.10 so that distributions will not have CONFIG_RTC_DRV_JZ4740 switching from m to y in their config. Summary: - Allow jz4740 to build as a module again by using kernel_halt()" * tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: rtc: jz4740: make the driver buildable as a module again
Diffstat (limited to 'tools/perf/util/comm.h')