linux-kernel - Re: linux-next: manual merge of the tmem tree with the xen-two 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: <20121102001732.1c02f6a72c9cd2b894d9c6c4@canb.auug.org.au>
Date:	Fri, 2 Nov 2012 00:17:32 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mukesh Rathor <mukesh.rathor@...cle.com>
Subject: Re: linux-next: manual merge of the tmem tree with the xen-two tree

Hi Konrad,

On Thu, 1 Nov 2012 09:03:10 -0400 Konrad Rzeszutek Wilk <konrad.wilk@...cle.com> wrote:
>
> I am not really sure how this happen - the 'tmem' tree should not have
> had 7282a68f5aea, and more interestingly, I cannot find it in the
> tmem tree! Either way, let me just reset the #linux-next to v3.7-rc3
> in tmem tree and see if this shows up.

The version of the tmem tree I have has commit a728d5ea1c20 as its head
and has the shortlog below.  I has not changed since Sept 24.

$ git shortlog origin/master..tmem/linux-next 
Konrad Rzeszutek Wilk (3):
      Merge commit 'v3.6-rc5' into linux-next
      Merge branch 'stable/for-linus-3.7' into linux-next
      Merge commit 'v3.6-rc6' into linux-next

Mukesh Rathor (1):
      PVH: Basic and preparatory changes

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped