From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Howells <dhowells@redhat•com>,
Masahiro Yamada <masahiroy@kernel•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the keys tree with the kbuild tree
Date: Tue, 12 May 2020 18:32:58 +1000 [thread overview]
Message-ID: <20200512183258.57d92642@canb.auug.org.au> (raw)
In-Reply-To: <20200504131655.2820b437@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2277 bytes --]
Hi all,
On Mon, 4 May 2020 13:16:55 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the keys tree got conflicts in:
>
> samples/Kconfig
> samples/Makefile
>
> between commit:
>
> 3ba9c29d1877 ("samples: watchdog: use 'userprogs' syntax")
>
> from the kbuild tree and commit:
>
> 631ec151fd96 ("Add sample notification program")
>
> from the keys tree.
>
> I fixed it up (see below) 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc samples/Kconfig
> index 5005f74ac0eb,5c31971a5745..000000000000
> --- a/samples/Kconfig
> +++ b/samples/Kconfig
> @@@ -205,8 -190,11 +205,15 @@@ config SAMPLE_INTEL_ME
> help
> Build a sample program to work with mei device.
>
> +config SAMPLE_WATCHDOG
> + bool "watchdog sample"
> + depends on CC_CAN_LINK
> +
> + config SAMPLE_WATCH_QUEUE
> + bool "Build example /dev/watch_queue notification consumer"
> + depends on HEADERS_INSTALL
> + help
> + Build example userspace program to use the new mount_notify(),
> + sb_notify() syscalls and the KEYCTL_WATCH_KEY keyctl() function.
> +
> endif # SAMPLES
> diff --cc samples/Makefile
> index 29c66aadd954,8617edf7f19a..000000000000
> --- a/samples/Makefile
> +++ b/samples/Makefile
> @@@ -26,4 -24,4 +26,5 @@@ obj-$(CONFIG_VIDEO_PCI_SKELETON) += v4l
> obj-y += vfio-mdev/
> subdir-$(CONFIG_SAMPLE_VFS) += vfs
> obj-$(CONFIG_SAMPLE_INTEL_MEI) += mei/
> +subdir-$(CONFIG_SAMPLE_WATCHDOG) += watchdog
5fb5efa63ea4 ("samples: watchdog: use 'userprogs' syntax")> + subdir-$(CONFIG_SAMPLE_WATCH_QUEUE) += watch_queue
This is now a conflict between commit
5fb5efa63ea4 ("samples: watchdog: use 'userprogs' syntax")
from the kbuild tree and commit
b8c9527a31b0 ("Add sample notification program")
from the notifications tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2020-05-12 8:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-04 3:16 linux-next: manual merge of the keys tree with the kbuild tree Stephen Rothwell
2020-05-12 8:32 ` 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=20200512183258.57d92642@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=masahiroy@kernel$(echo .)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