linux-kernel - Re: linux-next: Tree for June 18

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: <20090618164715.f16bb01c.sfr@canb.auug.org.au>
Date:	Thu, 18 Jun 2009 16:47:15 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Len Brown <lenb@...nel.org>
Cc:	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
	linux-acpi@...r.kernel.org
Subject: Re: linux-next: Tree for June 18

Hi Len,

On Thu, 18 Jun 2009 01:47:06 -0400 (EDT) Len Brown <lenb@...nel.org> wrote:
>
> > Merging acpi/test
> > CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig
> > CONFLICT (content): Merge conflict in drivers/platform/x86/toshiba_acpi.c
> 
> Okay, I've dropped the toshiba_acpi branch from test, pending a refresh
> 
> > [master 28e994e] Revert "Merge branch 'oqo-wmi-EXPECT-REFRESH' into test"
> 
> Okay, I've dropped the oqo branch from test, pending a refresh
> 
> > CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c
> 
> As I've sync'd my test tree with Linus' tree in preparation for
> a merge, it seems that I need a refreshed eeepc-laptop branch too:-(

Thanks for all that.

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

Content of type "application/pgp-signature" skipped