All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kees Cook <keescook@chromium.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Masahiro Yamada <masahiroy@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kspp tree with the kbuild tree
Date: Mon, 13 May 2024 11:50:14 -0700	[thread overview]
Message-ID: <202405131148.A2D10C2320@keescook> (raw)
In-Reply-To: <20240513151316.6bd6fc87@canb.auug.org.au>

On Mon, May 13, 2024 at 03:13:16PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kspp tree got a conflict in:
> 
>   drivers/misc/lkdtm/Makefile
> 
> between commit:
> 
>   9cf51a6d1de0 ("Makefile: remove redundant tool coverage variables")

Ah! Interesting. I have replied to that tread now:
https://lore.kernel.org/lkml/202405131136.73E766AA8@keescook/

> 
> from the kbuild tree and commit:
> 
>   fb28a8862dc4 ("lkdtm: Disable CFI checking for perms functions")
> 
> from the kspp tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This

Thanks, this looks correct to me.

-- 
Kees Cook

  reply	other threads:[~2024-05-13 18:50 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-13  5:13 linux-next: manual merge of the kspp tree with the kbuild tree Stephen Rothwell
2024-05-13 18:50 ` Kees Cook [this message]
2024-05-14  0:21 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-02-26  5:58 Stephen Rothwell
2024-02-27  2:24 ` Kees Cook
2024-03-13 22:44 ` Stephen Rothwell
2021-08-26  6:48 Stephen Rothwell
2018-08-03  7:30 Stephen Rothwell
2018-08-15 23:56 ` Stephen Rothwell
2018-08-15 23:58   ` Stephen Rothwell

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=202405131148.A2D10C2320@keescook \
    --to=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=masahiroy@kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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.