tree 425e9761f3009300630ed927412276415a6f78ec
parent ea092676b0d9c13f20a3bc02c5b0bf537c27346e
parent 5d05dfd13f20b01a3cd5d293058baa7d5c1583b6
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1537682956 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1537682956 +0200

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Thomas writes:
  "- Provide a strerror_r wrapper so lib/bpf can be built on systems
     without _GNU_SOURCE
   - Unbreak the man page generator when building out of tree"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf Documentation: Fix out-of-tree asciidoctor man page generation
  tools lib bpf: Provide wrapper for strerror_r to build in !_GNU_SOURCE systems