linux-kernel - linux-next: manual merge of the libata 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-next>] [day] [month] [year] [list]

Message-Id: <20100322124422.4a10bc4a.sfr@canb.auug.org.au>
Date:	Mon, 22 Mar 2010 12:44:22 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jeff Garzik <jeff@...zik.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Shane Huang <shane.huang@....com>,
	Anton Vorontsov <avorontsov@...mvista.com>
Subject: linux-next: manual merge of the libata tree with Linus' tree

Hi Jeff,

Today's linux-next merge of the libata tree got a conflict in
drivers/ata/ahci.c between commit
5db5b0215af94a36d4bf10900ff9707b6d5c1610 ("ahci: pp->active_link is not
reliable when FBS is enabled") from Linus' tree and commit
efd7cb719e07433588ee5c6a99b1208b0aff6295 ("ahci: Move generic code into
libahci") from the libata tree.

I applied the changes to drivers/ata/ahci.c from the former commit to
drivers/ata/libahci.c (where the latter commit moves it).

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

Content of type "application/pgp-signature" skipped