linux-kernel - Re: linux-next: manual merge of the net-next tree with the rdma-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20180323.001900.849305099701511845.davem@davemloft.net>
Date:   Fri, 23 Mar 2018 00:19:00 -0400 (EDT)
From:   David Miller <davem@...emloft.net>
To:     dledford@...hat.com
Cc:     sfr@...b.auug.org.au, netdev@...r.kernel.org, jgg@...lanox.com,
        linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        markb@...lanox.com, leonro@...lanox.com
Subject: Re: linux-next: manual merge of the net-next tree with the
 rdma-fixes tree

From: Doug Ledford <dledford@...hat.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@...alhost 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@...alhost GIT]$ cd rdma
[davem@...alhost 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@...alhost rdma]$