[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20210109170558.meufvgwrjtqo5v3i@treble>
Date: Sat, 9 Jan 2021 11:05:58 -0600
From: Josh Poimboeuf <jpoimboe@...hat.com>
To: Sedat Dilek <sedat.dilek@...il.com>
Cc: Sami Tolvanen <samitolvanen@...gle.com>,
Masahiro Yamada <masahiroy@...nel.org>,
Steven Rostedt <rostedt@...dmis.org>, Will Deacon <will@...nel.org>,
Peter Zijlstra <peterz@...radead.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
"Paul E. McKenney" <paulmck@...nel.org>,
Kees Cook <keescook@...omium.org>,
Nick Desaulniers <ndesaulniers@...gle.com>,
Clang-Built-Linux ML <clang-built-linux@...glegroups.com>,
kernel-hardening@...ts.openwall.com, linux-arch@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-kbuild@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-pci@...r.kernel.org
Subject: Re: [PATCH v9 00/16] Add support for Clang LTO
On Sat, Jan 09, 2021 at 11:03:57AM -0600, Josh Poimboeuf wrote:
> 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
Last one should be:
git rebase --onto FETCH_HEAD 2c85ebc57b3e
--
Josh
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
