Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the kspp tree with the rdma tree
@ 2020-07-28  8:45 Stephen Rothwell
  2020-07-28  8:51 ` Leon Romanovsky
  2020-08-05  4:07 ` Stephen Rothwell
  0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2020-07-28  8:45 UTC (permalink / raw)
  To: Kees Cook, Doug Ledford, Jason Gunthorpe
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Leon Romanovsky


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

Hi all,

Today's linux-next merge of the kspp tree got a conflict in:

  drivers/infiniband/core/uverbs_cmd.c

between commit:

  29f3fe1d6854 ("RDMA/uverbs: Remove redundant assignments")

from the rdma tree and commit:

  3f649ab728cd ("treewide: Remove uninitialized_var() usage")

from the kspp tree.

I fixed it up (the former basically did what the latter did, so I used
the former version) 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

[-- 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 kspp tree with the rdma tree
  2020-07-28  8:45 linux-next: manual merge of the kspp tree with the rdma tree Stephen Rothwell
@ 2020-07-28  8:51 ` Leon Romanovsky
  2020-08-05  4:07 ` Stephen Rothwell
  1 sibling, 0 replies; 3+ messages in thread
From: Leon Romanovsky @ 2020-07-28  8:51 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Kees Cook, Doug Ledford, Jason Gunthorpe,
	Linux Next Mailing List, Linux Kernel Mailing List


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

On Tue, Jul 28, 2020 at 06:45:20PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
>   drivers/infiniband/core/uverbs_cmd.c
>
> between commit:
>
>   29f3fe1d6854 ("RDMA/uverbs: Remove redundant assignments")
>
> from the rdma tree and commit:
>
>   3f649ab728cd ("treewide: Remove uninitialized_var() usage")
>
> from the kspp tree.
>
> I fixed it up (the former basically did what the latter did, so I used
> the former version) 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.

Thanks Stephen,
The 29f3fe1d6854 > 3f649ab728cd for drivers/infiniband/core.

>
> --
> Cheers,
> Stephen Rothwell



[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

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

* Re: linux-next: manual merge of the kspp tree with the rdma tree
  2020-07-28  8:45 linux-next: manual merge of the kspp tree with the rdma tree Stephen Rothwell
  2020-07-28  8:51 ` Leon Romanovsky
@ 2020-08-05  4:07 ` Stephen Rothwell
  1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2020-08-05  4:07 UTC (permalink / raw)
  To: Doug Ledford, Jason Gunthorpe
  Cc: Kees Cook, Linux Next Mailing List, Linux Kernel Mailing List,
	Leon Romanovsky


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

Hi all,

On Tue, 28 Jul 2020 18:45:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the kspp tree got a conflict in:
> 
>   drivers/infiniband/core/uverbs_cmd.c
> 
> between commit:
> 
>   29f3fe1d6854 ("RDMA/uverbs: Remove redundant assignments")
> 
> from the rdma tree and commit:
> 
>   3f649ab728cd ("treewide: Remove uninitialized_var() usage")
> 
> from the kspp tree.
> 
> I fixed it up (the former basically did what the latter did, so I used
> the former version) 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.

This is now a conflict between the rdma 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 --
2020-07-28  8:45 linux-next: manual merge of the kspp tree with the rdma tree Stephen Rothwell
2020-07-28  8:51 ` Leon Romanovsky
2020-08-05  4:07 ` 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