From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Doug Ledford <dledford@redhat.com>
Cc: Jason Gunthorpe <jgg@mellanox.com>,
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: Tue, 30 Apr 2019 10:28:14 +1000 [thread overview]
Message-ID: <20190430102814.73f213e1@canb.auug.org.au> (raw)
In-Reply-To: <16bb268f0b5b62d71cc65204bccea856333b87d8.camel@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 342 bytes --]
Hi Doug,
On Mon, 29 Apr 2019 18:21:32 -0400 Doug Ledford <dledford@redhat.com> wrote:
>
> 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).
No worries - I even managed to choose the correct one by chance! :-)
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-04-30 0:28 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
2019-04-30 0:28 ` Stephen Rothwell [this message]
-- 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=20190430102814.73f213e1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=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=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).