linux-kernel - Re: linux-next: manual merge of the akpm tree with the block 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]

Date:	Tue, 25 Oct 2011 13:20:29 -0500
From:	Mike Miller <mike.miller@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Andrew Morton <akpm@...ux-foundation.org>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Jens Axboe <axboe@...nel.dk>
Subject: Re: linux-next: manual merge of the akpm tree with the block tree

On 10/25/2011 04:07 AM, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/block/cciss.c between commit ab5dbebe33e0 ("cciss: add small
> delay when using PCI Power Management to reset for kump") from the block
> tree and commit c9e69629e873 ("cciss: add half second delay to PCI PM
> reset code") from the akpm tree.
>
> These are essentially the same patch, so I dropped the akpm tree one.
That was my fault. I made multiple submissions. One because I had the 
wrong code base and the patch had an offset. Then another because I 
didn't hear from anyone.

-- mikem
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/