From: Doug Ledford <dledford@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Jason Gunthorpe <jgg@mellanox.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Leon Romanovsky <leonro@mellanox.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the rdma-fixes tree with Linus' tree
Date: Mon, 29 Apr 2019 18:21:32 -0400 [thread overview]
Message-ID: <16bb268f0b5b62d71cc65204bccea856333b87d8.camel@redhat.com> (raw)
In-Reply-To: <20190430081346.3196b60f@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1180 bytes --]
On Tue, 2019-04-30 at 08:13 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma-fixes tree got a conflict in:
>
> drivers/infiniband/core/uverbs_main.c
>
> between commit:
>
> 6a5c5d26c4c6 ("rdma: fix build errors on s390 and MIPS due to bad ZERO_PAGE use")
>
> from Linus' tree and commit:
>
> d79a26b99f5f ("RDMA/uverbs: Fix compilation error on s390 and mips platforms")
>
> from the rdma-fixes tree.
>
> I fixed it up (I just used the version from Linus' tree) 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.
>
Sorry, I forgot to back that head commit out. Once Linus committed his
fix the one in the rdma tree was superfluous (and wrong anyway).
--
Doug Ledford <dledford@redhat.com>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-04-29 22:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-29 22:13 linux-next: manual merge of the rdma-fixes tree with Linus' tree Stephen Rothwell
2019-04-29 22:21 ` Doug Ledford [this message]
2019-04-30 0:28 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-04-25 21:37 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=16bb268f0b5b62d71cc65204bccea856333b87d8.camel@redhat.com \
--to=dledford@redhat.com \
--cc=heiko.carstens@de.ibm.com \
--cc=jgg@mellanox.com \
--cc=leonro@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).