Merge branch 'lslocks--Q' of https://github.com/masatake/util-linux

* 'lslocks--Q' of https://github.com/masatake/util-linux:
  tests: (lslocks) test -Q,--filter option
  tests: (test_mkfds::nop) new factory just printing pid
  lslocks: special-case PID for filtering (skip −1)
  lslocks: make SIZE filterable by normalizing to bytes
  lslocks: implement Q, --filter option
  lslocks: factor out code getting and setting the data from add_scols_line
  lslocks: (refactor) move proc_locks to struct lslocks
  lslocks: (refactor) move pid_locks in main to struct lslocks
  lslocks: (refactor) move "tab" file static variable to struct lslocks
  lslocks: (refactor) add struct lslocks representing the global context
  lslocks: (refactor) use global bytes in get_json_type_for_column()
  lslocks: (refactor) add a helper function refining value returned from get_lock
  lslocks: (refactor) don't use redundant callback functions
  lslocks: (refactor) specify list_head as type instead of abusing void*
  lslocks: (refactor) use separate function to initialize libscols_table
  lslocks: (refactor) remove an unused local variable
  lslocks: (refactor) use narrow variable scoping for loop counters
  lslocks: (comment) fix grammar

diff --cc tests/helpers/test_mkfds.c
Simple merge