Merge branch 'lsfd-raw' of https://github.com/masatake/util-linux

* 'lsfd-raw' of https://github.com/masatake/util-linux:
  lsfd: remove redundant parentheses surrounding return values
  lsfd: rename tcp_state to l4_state and use the type instead of unsigned int
  lsfd: use SCNu16 format specifier instead of cast operations (unsigned short)
  lsfd: use extra information loaded from /proc/net/raw
  lsfd: make TCP and UDP related code L3 protocol neutral
  lsfd: refactor the usage of tcp_decode_state()
  lsfd: move the field representing connection state from tcp_xinfo to the L4 abstract layer
  lsfd: add methods to the L4 abstract layer for hidding differences in L3 protocols
  lsfd: implement code scanning lines in /proc/net/$proto as a method in the L4 abstract layer
  lsfd: introduce L4 abstract layer stacked on IP and IP6
  lsfd: fix wrong identifier namings (L3->L4)
  lsfd: move kernel32_to_cpu() front in the source file
  lsfd: remove an unused field from struct sock_xinfo_class
  lsfd: (man) fix the description of NAME fields for TCP and UDP sockets
  lsfd: adjust coding style, insert space after "switch" keyword

diff --cc misc-utils/lsfd-sock-xinfo.c
Simple merge

diff --cc misc-utils/lsfd.c
Simple merge