Re: [PATCH v9 00/16] Add support for Clang LTO

From: Josh Poimboeuf
Date: Sat Jan 09 2021 - 12:05:33 EST


On Sat, Jan 09, 2021 at 05:45:47PM +0100, Sedat Dilek wrote:
> I tried merging with clang-cfi Git which is based on Linux v5.11-rc2+
> with a lot of merge conflicts.
>
> Did you try on top of cfi-10 Git tag which is based on Linux v5.10?
>
> Whatever you successfully did... Can you give me a step-by-step instruction?

Oops, my bad. My last three commits (which I just added) do conflict.
Sorry for the confusion.

Just drop my last three commits:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/jpoimboe/linux.git objtool-vmlinux
git checkout -B tmp FETCH_HEAD
git reset --hard HEAD~~~
git fetch https://github.com/samitolvanen/linux clang-lto
git rebase --onto FETCH_HEAD 79881bfc57be

--
Josh