linux-kernel - Re: linux-next: Tree for March 10

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: <20090310220751.bd25139f.sfr@canb.auug.org.au>
Date:	Tue, 10 Mar 2009 22:07:51 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Wim Van Sebroeck <wim@...ana.be>
Cc:	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: Tree for March 10

Hi Wim,

On Tue, 10 Mar 2009 10:33:24 +0100 Wim Van Sebroeck <wim@...ana.be> wrote:
>
> > Merging watchdog/master
> > CONFLICT (content): Merge conflict in drivers/watchdog/orion5x_wdt.c
> > CONFLICT (content): Merge conflict in drivers/watchdog/rc32434_wdt.c
> 
> I redid the linux-2.6-watchdog-next tree. Should be fixed next time.

Thanks.  I could see that they were just continuations of patches that
went into Linus' tree, so was not worried about them.

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

Content of type "application/pgp-signature" skipped