From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
David Howells <dhowells@redhat.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Tomas Winkler <tomas.winkler@intel.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the keys tree
Date: Tue, 22 Oct 2019 13:39:24 -0400 [thread overview]
Message-ID: <20191022173924.GG230934@kroah.com> (raw)
In-Reply-To: <20191022133804.32ef6f86@canb.auug.org.au>
On Tue, Oct 22, 2019 at 01:38:04PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got conflicts in:
>
> samples/Kconfig
> samples/Makefile
>
> between commit:
>
> 0b9c31597d81 ("Add sample notification program")
>
> from the keys tree and commit:
>
> 6859eba4f6fb ("samples: mei: use hostprogs kbuild constructs")
>
> from the char-misc 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 d0761f29ccb0,b663d9d24114..000000000000
> --- a/samples/Kconfig
> +++ b/samples/Kconfig
> @@@ -169,11 -169,11 +169,17 @@@ config SAMPLE_VF
> as mount API and statx(). Note that this is restricted to the x86
> arch whilst it accesses system calls that aren't yet in all arches.
>
> +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.
> +
> + config SAMPLE_INTEL_MEI
> + bool "Build example program working with intel mei driver"
> + depends on INTEL_MEI
> + help
> + Build a sample program to work with mei device.
> +
> -
> endif # SAMPLES
> diff --cc samples/Makefile
> index a61a39047d02,d6062ab25347..000000000000
> --- a/samples/Makefile
> +++ b/samples/Makefile
> @@@ -20,4 -20,4 +20,5 @@@ obj-$(CONFIG_SAMPLE_TRACE_PRINTK) += tr
> obj-$(CONFIG_VIDEO_PCI_SKELETON) += v4l/
> obj-y += vfio-mdev/
> subdir-$(CONFIG_SAMPLE_VFS) += vfs
> +subdir-$(CONFIG_SAMPLE_WATCH_QUEUE) += watch_queue
> + obj-$(CONFIG_SAMPLE_INTEL_MEI) += mei/
Looks good to me, thanks!
greg k-h
next prev parent reply other threads:[~2019-10-22 17:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-22 2:38 linux-next: manual merge of the char-misc tree with the keys tree Stephen Rothwell
2019-10-22 17:39 ` Greg KH [this message]
2019-11-28 0:43 ` 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=20191022173924.GG230934@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tomas.winkler@intel.com \
/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.