| commit | d832c0051f4e9cc7d26ef3bc6e9b662bc6a90f3a | [log] [tgz] |
|---|---|---|
| author | Peter Zijlstra <peterz@infradead.org> | Thu Jun 18 17:55:29 2020 +0200 |
| committer | Peter Zijlstra <peterz@infradead.org> | Thu Jun 18 17:55:29 2020 +0200 |
| tree | f7980a9c140174713b703851d06ed61283631e13 | |
| parent | 14bda4e5293ed9722f1dc39b543024e37707d6c6 [diff] | |
| parent | 0f1441b44e823a74f3f3780902a113e07c73fbf6 [diff] |
Merge branch 'objtool/urgent' into objtool/core Conflicts: tools/objtool/elf.c tools/objtool/elf.h tools/objtool/orc_gen.c tools/objtool/check.c Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>