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: <alpine.LFD.2.00.0906180141130.8921@localhost.localdomain>
Date:	Thu, 18 Jun 2009 01:47:06 -0400 (EDT)
From:	Len Brown <lenb@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
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

> 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,
-Len Brown, Intel Open Source Technology Center


--
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/