From: Jason Gunthorpe <jgg@mellanox•com>
To: David Miller <davem@davemloft•net>
Cc: dledford@redhat•com, sfr@canb•auug.org.au,
netdev@vger•kernel.org, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org, markb@mellanox•com,
leonro@mellanox•com
Subject: Re: linux-next: manual merge of the net-next tree with the rdma-fixes tree
Date: Thu, 22 Mar 2018 22:33:15 -0600 [thread overview]
Message-ID: <20180323043315.GB13185@mellanox.com> (raw)
In-Reply-To: <20180323.001900.849305099701511845.davem@davemloft.net>
On Fri, Mar 23, 2018 at 12:19:00AM -0400, David Miller wrote:
> From: Doug Ledford <dledford@redhat•com>
> Date: Thu, 15 Mar 2018 21:18:02 -0400
>
> > Here's the commit (from the rdma git repo) with the proper merge fix
> > (although it also has other minor merge stuff that needs to be ignored):
> >
> > 2d873449a202 (Merge branch 'k.o/wip/dl-for-rc' into k.o/wip/dl-for-next)
>
> Really?
>
> [davem@localhost GIT]$ git clone --reference linux/.git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
> Cloning into 'rdma'...
Doug and I moved to a shared repo location when we started maintain it
as a team:
git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
The commit is here:
https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/commit/?h=for-next&id=2d873449a202d02e0c4d90009fb2beb7013ac575
Jason
next prev parent reply other threads:[~2018-03-23 4:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-16 0:56 linux-next: manual merge of the net-next tree with the rdma-fixes tree Stephen Rothwell
2018-03-16 1:18 ` Doug Ledford
2018-03-16 2:05 ` Jason Gunthorpe
2018-03-16 6:54 ` Saeed Mahameed
2018-03-23 4:19 ` David Miller
2018-03-23 4:33 ` Jason Gunthorpe [this message]
2018-03-23 14:22 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2023-06-13 1:43 Stephen Rothwell
2023-06-13 12:39 ` Leon Romanovsky
2025-05-13 3:06 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=20180323043315.GB13185@mellanox.com \
--to=jgg@mellanox$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dledford@redhat$(echo .)com \
--cc=leonro@mellanox$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=markb@mellanox$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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