From: David Miller <davem@davemloft.net>
To: dledford@redhat.com
Cc: sfr@canb.auug.org.au, netdev@vger.kernel.org, jgg@mellanox.com,
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: Fri, 23 Mar 2018 00:19:00 -0400 (EDT) [thread overview]
Message-ID: <20180323.001900.849305099701511845.davem@davemloft.net> (raw)
In-Reply-To: <1521163082.18703.191.camel@redhat.com>
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'...
remote: Counting objects: 32, done.
remote: Compressing objects: 100% (31/31), done.
remote: Total 32 (delta 0), reused 32 (delta 0)
Receiving objects: 100% (32/32), 186.52 KiB | 3.01 MiB/s, done.
Checking connectivity: 5706198, done.
Checking out files: 100% (61622/61622), done.
[davem@localhost GIT]$ cd rdma
[davem@localhost rdma]$ git show 2d873449a202
fatal: ambiguous argument '2d873449a202': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
[davem@localhost rdma]$
next prev parent reply other threads:[~2018-03-23 4:19 UTC|newest]
Thread overview: 9+ 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 [this message]
2018-03-23 4:33 ` Jason Gunthorpe
2018-03-23 14:22 ` David Miller
2023-06-13 1:43 Stephen Rothwell
2023-06-13 12:39 ` Leon Romanovsky
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=20180323.001900.849305099701511845.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=jgg@mellanox.com \
--cc=leonro@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=markb@mellanox.com \
--cc=netdev@vger.kernel.org \
--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 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).