Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the char-misc tree with the keys tree
@ 2019-10-22  2:38 Stephen Rothwell
  2019-10-22 17:39 ` Greg KH
  2019-11-28  0:43 ` Stephen Rothwell
  0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2019-10-22  2:38 UTC (permalink / raw)
  To: Greg KH, Arnd Bergmann, David Howells
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Tomas Winkler

[-- Attachment #1: Type: text/plain, Size: 1934 bytes --]

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/

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the char-misc tree with the keys tree
  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
  2019-11-28  0:43 ` Stephen Rothwell
  1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2019-10-22 17:39 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Arnd Bergmann, David Howells, Linux Next Mailing List,
	Linux Kernel Mailing List, Tomas Winkler

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the char-misc tree with the keys tree
  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
@ 2019-11-28  0:43 ` Stephen Rothwell
  1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2019-11-28  0:43 UTC (permalink / raw)
  To: David Howells
  Cc: Greg KH, Arnd Bergmann, Linux Next Mailing List,
	Linux Kernel Mailing List, Tomas Winkler, Linus

[-- Attachment #1: Type: text/plain, Size: 2237 bytes --]

Hi all,

On Tue, 22 Oct 2019 13:38:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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/

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 --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2019-11-28  0:43 ` Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git