All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Doug Ledford <dledford@redhat.com>,
	Jason Gunthorpe <jgg@mellanox.com>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	ARM <linux-arm-kernel@lists.infradead.org>,
	Maxime Ripard <maxime@cerno.tech>, Christoph Hellwig <hch@lst.de>,
	Jason Gunthorpe <jgg@nvidia.com>, Jason Gunthorpe <jgg@ziepe.ca>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the rdma tree with the arm-soc tree
Date: Wed, 25 Nov 2020 09:36:52 +0100	[thread overview]
Message-ID: <20201125083652.GA31753@lst.de> (raw)
In-Reply-To: <20201125123351.16954b02@canb.auug.org.au>

On Wed, Nov 25, 2020 at 12:33:51PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rdma tree got a conflict in:
> 
>   include/linux/dma-mapping.h
> 
> between commit:
> 
>   16fee29b0735 ("dma-mapping: remove the dma_direct_set_offset export")
> 
> from the arm-soc tree and commit:
> 
>   172292be01db ("dma-mapping: remove dma_virt_ops")
> 
> from the rdma 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.

Thanks, the trivial fixup looks obviously good.

WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Jason Gunthorpe <jgg@ziepe.ca>,
	Doug Ledford <dledford@redhat.com>,
	Jason Gunthorpe <jgg@mellanox.com>,
	Maxime Ripard <maxime@cerno.tech>,
	Jason Gunthorpe <jgg@nvidia.com>, Olof Johansson <olof@lixom.net>,
	Christoph Hellwig <hch@lst.de>,
	ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: linux-next: manual merge of the rdma tree with the arm-soc tree
Date: Wed, 25 Nov 2020 09:36:52 +0100	[thread overview]
Message-ID: <20201125083652.GA31753@lst.de> (raw)
In-Reply-To: <20201125123351.16954b02@canb.auug.org.au>

On Wed, Nov 25, 2020 at 12:33:51PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rdma tree got a conflict in:
> 
>   include/linux/dma-mapping.h
> 
> between commit:
> 
>   16fee29b0735 ("dma-mapping: remove the dma_direct_set_offset export")
> 
> from the arm-soc tree and commit:
> 
>   172292be01db ("dma-mapping: remove dma_virt_ops")
> 
> from the rdma 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.

Thanks, the trivial fixup looks obviously good.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2020-11-25  8:36 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-25  1:33 linux-next: manual merge of the rdma tree with the arm-soc tree Stephen Rothwell
2020-11-25  1:33 ` Stephen Rothwell
2020-11-25  8:36 ` Christoph Hellwig [this message]
2020-11-25  8:36   ` Christoph Hellwig

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=20201125083652.GA31753@lst.de \
    --to=hch@lst.de \
    --cc=arnd@arndb.de \
    --cc=dledford@redhat.com \
    --cc=jgg@mellanox.com \
    --cc=jgg@nvidia.com \
    --cc=jgg@ziepe.ca \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=maxime@cerno.tech \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    /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.