Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the tip tree with the nfsd tree
@ 2019-11-21  3:28 Stephen Rothwell
  2019-11-21  8:35 ` Peter Zijlstra
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2019-11-21  3:28 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	J. Bruce Fields
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Chuck Lever

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

Hi all,

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

  include/trace/events/rpcrdma.h

between commit:

  832b2cb95543 ("svcrdma: Improve DMA mapping trace points")

from the nfsd tree and commit:

  60fdad00827c ("ftrace: Rework event_create_dir()")

from the tip tree.

I fixed it up (I just used the former) 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] 2+ messages in thread

* Re: linux-next: manual merge of the tip tree with the nfsd tree
  2019-11-21  3:28 linux-next: manual merge of the tip tree with the nfsd tree Stephen Rothwell
@ 2019-11-21  8:35 ` Peter Zijlstra
  0 siblings, 0 replies; 2+ messages in thread
From: Peter Zijlstra @ 2019-11-21  8:35 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, J. Bruce Fields,
	Linux Next Mailing List, Linux Kernel Mailing List, Chuck Lever

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

On Thu, Nov 21, 2019 at 02:28:33PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   include/trace/events/rpcrdma.h
> 
> between commit:
> 
>   832b2cb95543 ("svcrdma: Improve DMA mapping trace points")
> 
> from the nfsd tree and commit:
> 
>   60fdad00827c ("ftrace: Rework event_create_dir()")
> 
> from the tip tree.
> 
> I fixed it up (I just used the former) and can carry the fix as

Yes, that looks right. All I did was remove that stray ';' anyway, which
the nfs patch did too.

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

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

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-21  3:28 linux-next: manual merge of the tip tree with the nfsd tree Stephen Rothwell
2019-11-21  8:35 ` Peter Zijlstra

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