linux-kernel - Re: linux-next: manual merge of the block tree with Linus' 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] [day] [month] [year] [list]

Message-Id: <20100226101101.136af742.sfr@canb.auug.org.au>
Date:	Fri, 26 Feb 2010 10:11:01 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jens Axboe <jens.axboe@...cle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Alan D. Brunelle" <Alan.Brunelle@...com>
Subject: Re: linux-next: manual merge of the block tree with Linus' tree

Hi Jens,

On Thu, 25 Feb 2010 08:47:57 +0100 Jens Axboe <jens.axboe@...cle.com> wrote:
>
> I was, unfortunately I forgot to resolve the conflict yesterday. Your
> fix confuses me a bit - I was expecting the first hunk, but what is the
> second hunk doing? Conceptually good though, perhaps there are more
> conflicts than I was expecting :-)

The second hunk was not part of the conflict, but "git diff" gives us more
than just the conflicted bit of the file.

> I'll update here as well so it disappears next time you pull.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped