All of lore.kernel.org
 help / color / mirror / Atom feed
From: Josh Poimboeuf <jpoimboe@redhat.com>
To: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Sami Tolvanen <samitolvanen@google.com>,
	Masahiro Yamada <masahiroy@kernel.org>,
	Steven Rostedt <rostedt@goodmis.org>,
	Will Deacon <will@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	"Paul E. McKenney" <paulmck@kernel.org>,
	Kees Cook <keescook@chromium.org>,
	Nick Desaulniers <ndesaulniers@google.com>,
	Clang-Built-Linux ML <clang-built-linux@googlegroups.com>,
	kernel-hardening@lists.openwall.com, linux-arch@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-pci@vger.kernel.org
Subject: Re: [PATCH v9 00/16] Add support for Clang LTO
Date: Sat, 9 Jan 2021 11:03:53 -0600	[thread overview]
Message-ID: <20210109170353.litivfvc4zotnimv@treble> (raw)
In-Reply-To: <CA+icZUUszOHkJ8Acx2mDowg3StZw9EureDQ7YYkJkcAnpLBA+g@mail.gmail.com>

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


WARNING: multiple messages have this Message-ID (diff)
From: Josh Poimboeuf <jpoimboe@redhat.com>
To: Sedat Dilek <sedat.dilek@gmail.com>
Cc: linux-arch@vger.kernel.org, Kees Cook <keescook@chromium.org>,
	"Paul E. McKenney" <paulmck@kernel.org>,
	kernel-hardening@lists.openwall.com,
	Peter Zijlstra <peterz@infradead.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Masahiro Yamada <masahiroy@kernel.org>,
	linux-kbuild@vger.kernel.org,
	Nick Desaulniers <ndesaulniers@google.com>,
	linux-kernel@vger.kernel.org,
	Steven Rostedt <rostedt@goodmis.org>,
	Clang-Built-Linux ML <clang-built-linux@googlegroups.com>,
	Sami Tolvanen <samitolvanen@google.com>,
	linux-pci@vger.kernel.org, Will Deacon <will@kernel.org>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v9 00/16] Add support for Clang LTO
Date: Sat, 9 Jan 2021 11:03:53 -0600	[thread overview]
Message-ID: <20210109170353.litivfvc4zotnimv@treble> (raw)
In-Reply-To: <CA+icZUUszOHkJ8Acx2mDowg3StZw9EureDQ7YYkJkcAnpLBA+g@mail.gmail.com>

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


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2021-01-09 17:05 UTC|newest]

Thread overview: 106+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-11 18:46 [PATCH v9 00/16] Add support for Clang LTO Sami Tolvanen
2020-12-11 18:46 ` Sami Tolvanen
2020-12-11 18:46 ` Sami Tolvanen
2020-12-11 18:46 ` [PATCH v9 01/16] tracing: move function tracer options to Kconfig Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2021-02-24 20:17   ` [PATCH v9 01/16] tracing: move function tracer options to Kconfig (causing parisc build failures) Guenter Roeck
2021-02-24 20:17     ` Guenter Roeck
2021-02-24 20:38     ` Kees Cook
2021-02-24 20:38       ` Kees Cook
2021-02-24 20:54       ` Sami Tolvanen
2021-02-24 20:54         ` Sami Tolvanen
2021-02-24 20:54         ` Sami Tolvanen
2021-02-24 22:29         ` Guenter Roeck
2021-02-24 22:29           ` Guenter Roeck
2021-02-24 22:28       ` Guenter Roeck
2021-02-24 22:28         ` Guenter Roeck
2021-02-24 22:42         ` Kees Cook
2021-02-24 22:42           ` Kees Cook
2020-12-11 18:46 ` [PATCH v9 02/16] kbuild: add support for Clang LTO Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46 ` [PATCH v9 03/16] kbuild: lto: fix module versioning Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46 ` [PATCH v9 04/16] kbuild: lto: limit inlining Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46 ` [PATCH v9 05/16] kbuild: lto: merge module sections Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2021-02-16 21:37   ` Stephen Boyd
2021-02-16 21:37     ` Stephen Boyd
2020-12-11 18:46 ` [PATCH v9 06/16] kbuild: lto: add a default list of used symbols Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 19:32   ` Kees Cook
2020-12-11 19:32     ` Kees Cook
2020-12-11 19:40     ` Sami Tolvanen
2020-12-11 19:40       ` Sami Tolvanen
2020-12-11 19:40       ` Sami Tolvanen
2020-12-11 19:45       ` Nick Desaulniers
2020-12-11 19:45         ` Nick Desaulniers
2020-12-11 19:45         ` Nick Desaulniers
2020-12-11 18:46 ` [PATCH v9 07/16] init: lto: ensure initcall ordering Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46 ` [PATCH v9 08/16] init: lto: fix PREL32 relocations Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46 ` [PATCH v9 09/16] PCI: Fix PREL32 relocations for LTO Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46 ` [PATCH v9 10/16] modpost: lto: strip .lto from module names Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46 ` [PATCH v9 11/16] scripts/mod: disable LTO for empty.c Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46 ` [PATCH v9 12/16] efi/libstub: disable LTO Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46 ` [PATCH v9 13/16] drivers/misc/lkdtm: disable LTO for rodata.o Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46 ` [PATCH v9 14/16] arm64: vdso: disable LTO Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46 ` [PATCH v9 15/16] arm64: disable recordmcount with DYNAMIC_FTRACE_WITH_REGS Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46 ` [PATCH v9 16/16] arm64: allow LTO to be selected Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 18:46   ` Sami Tolvanen
2020-12-11 19:38 ` [PATCH v9 00/16] Add support for Clang LTO Kees Cook
2020-12-11 19:38   ` Kees Cook
2021-01-09  0:27 ` Kees Cook
2021-01-09  0:27   ` Kees Cook
2021-01-09 14:54 ` Sedat Dilek
2021-01-09 14:54   ` Sedat Dilek
2021-01-09 14:54   ` Sedat Dilek
2021-01-09 15:36   ` Josh Poimboeuf
2021-01-09 15:36     ` Josh Poimboeuf
2021-01-09 15:46     ` Sedat Dilek
2021-01-09 15:46       ` Sedat Dilek
2021-01-09 15:46       ` Sedat Dilek
2021-01-09 16:07       ` Josh Poimboeuf
2021-01-09 16:07         ` Josh Poimboeuf
2021-01-09 16:21         ` Sedat Dilek
2021-01-09 16:21           ` Sedat Dilek
2021-01-09 16:21           ` Sedat Dilek
2021-01-09 16:32           ` Josh Poimboeuf
2021-01-09 16:32             ` Josh Poimboeuf
2021-01-09 16:45             ` Sedat Dilek
2021-01-09 16:45               ` Sedat Dilek
2021-01-09 16:45               ` Sedat Dilek
2021-01-09 17:03               ` Josh Poimboeuf [this message]
2021-01-09 17:03                 ` Josh Poimboeuf
2021-01-09 17:05                 ` Josh Poimboeuf
2021-01-09 17:05                   ` Josh Poimboeuf
2021-01-09 17:33                   ` Sedat Dilek
2021-01-09 17:33                     ` Sedat Dilek
2021-01-09 17:33                     ` Sedat Dilek
2021-01-09 23:44                   ` Sedat Dilek
2021-01-09 23:44                     ` Sedat Dilek
2021-01-09 23:44                     ` Sedat Dilek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210109170353.litivfvc4zotnimv@treble \
    --to=jpoimboe@redhat.com \
    --cc=clang-built-linux@googlegroups.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=keescook@chromium.org \
    --cc=kernel-hardening@lists.openwall.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=masahiroy@kernel.org \
    --cc=ndesaulniers@google.com \
    --cc=paulmck@kernel.org \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=samitolvanen@google.com \
    --cc=sedat.dilek@gmail.com \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.