summaryrefslogtreecommitdiff
path: root/astraceroute/.gitignore
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-04-27 18:21:28 +0200
committerTobias Klauser <tklauser@distanz.ch>2015-04-27 18:21:28 +0200
commit38fbb82405aa00315bb3a5e380ea34a28f5b9de7 (patch)
treeb48804d073aee4b829f67a8825dc3acb5fc1a3ff /astraceroute/.gitignore
parent613be40b15d8e645a188a003b2b125b2e3aced8b (diff)
netsniff-ng: nlmsg: Rename function and dissector field
Netlink messages don't use the term `family' instead of `protocol', so stick to it when printing dissected information. Also, functions with the `nl_' prefix are used by libnl, so in order to not confuse it with libnl functions, rename nl_proto2str() to nlmsg_family2str() Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'astraceroute/.gitignore')
0 files changed, 0 insertions, 0 deletions
>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/arch/s390/include')