From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Howells <dhowells@redhat•com>
Cc: Daniel Borkmann <daniel@iogearbox•net>,
Alexei Starovoitov <ast@kernel•org>,
Networking <netdev@vger•kernel.org>,
David Miller <davem@davemloft•net>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
KP Singh <kpsingh@google•com>
Subject: Re: linux-next: manual merge of the keys tree with the bpf-next tree
Date: Sun, 5 Apr 2020 11:02:51 +1000 [thread overview]
Message-ID: <20200405110251.2a15afe2@canb.auug.org.au> (raw)
In-Reply-To: <20200330130636.0846e394@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2405 bytes --]
Hi all,
On Mon, 30 Mar 2020 13:06:36 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the keys tree got a conflict in:
>
> include/linux/lsm_hooks.h
>
> between commit:
>
> 98e828a0650f ("security: Refactor declaration of LSM hooks")
>
> from the bpf-next tree and commits:
>
> e8fa137bb3cb ("security: Add hooks to rule on setting a watch")
> 858bc27762c1 ("security: Add a hook for the point of notification insertion")
>
> from the keys tree.
>
> I fixed it up (I used the former version of this file and added the
> following merge resolution patch) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Mon, 30 Mar 2020 12:55:31 +1100
> Subject: [PATCH] security: keys: fixup for "security: Refactor declaration of
> LSM hooks"
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> include/linux/lsm_hook_defs.h | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
> index 9cd4455528e5..4f8d63fd1327 100644
> --- a/include/linux/lsm_hook_defs.h
> +++ b/include/linux/lsm_hook_defs.h
> @@ -252,6 +252,16 @@ LSM_HOOK(int, 0, inode_notifysecctx, struct inode *inode, void *ctx, u32 ctxlen)
> LSM_HOOK(int, 0, inode_setsecctx, struct dentry *dentry, void *ctx, u32 ctxlen)
> LSM_HOOK(int, 0, inode_getsecctx, struct inode *inode, void **ctx,
> u32 *ctxlen)
> +#ifdef CONFIG_KEY_NOTIFICATIONS
> +LSM_HOOK(int, 0, watch_key, struct key *key)
> +#endif
> +#ifdef CONFIG_DEVICE_NOTIFICATIONS
> +LSM_HOOK(int, 0, watch_devices, void)
> +#endif
> +#ifdef CONFIG_WATCH_QUEUE
> +LSM_HOOK(int, 0, post_notification, const struct cred *w_cred,
> + const struct cred *cred, struct watch_notification *n)
> +#endif
>
> #ifdef CONFIG_SECURITY_NETWORK
> LSM_HOOK(int, 0, unix_stream_connect, struct sock *sock, struct sock *other,
> --
> 2.25.0
This is now a conflict between the keys tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2020-04-05 1:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 2:06 linux-next: manual merge of the keys tree with the bpf-next tree Stephen Rothwell
2020-04-05 1:02 ` Stephen Rothwell [this message]
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=20200405110251.2a15afe2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ast@kernel$(echo .)org \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=dhowells@redhat$(echo .)com \
--cc=kpsingh@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox