From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Jun 2018 16:04:46 +0000 (-0700)
Subject: Merge branch 'faddr2line' (patches from Josh)
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9b68ac2204ec4cbd1ff8bf2dc24be378042efc83;p=linux.git

Merge branch 'faddr2line' (patches from Josh)

Merge faddr2line updates from Josh Poimboeuf:

 - revert faddr2line's default output to its original non-code-listing
   output, and make the code listing an optional feature

 - give faddr2line a real maintainer, so get_maintainer.pl will actually
   CC me on future patches

* emailed patches from Josh Poimboeuf <jpoimboe@redhat.com>:
  MAINTAINERS: add Josh Poimboeuf as faddr2line maintainer
  scripts/faddr2line: make the new code listing format optional
---

9b68ac2204ec4cbd1ff8bf2dc24be378042efc83