From: Doug Ledford <dledford@xxxxxxxxxx> 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]$ -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
