linux-kernel - Re: linux-next: build failure after merge of the suspend 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] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 21 May 2010 07:51:57 +0200
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	David Miller <davem@...emloft.net>
Cc:	sfr@...b.auug.org.au, linville@...driver.com,
	torvalds@...ux-foundation.org, rjw@...k.pl,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Helmut.Schaa@....de, netdev@...r.kernel.org
Subject: Re: linux-next: build failure after merge of the suspend tree

Le jeudi 20 mai 2010 à 22:46 -0700, David Miller a écrit :
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Fri, 21 May 2010 10:29:13 +1000
> 
> > On Sat, 8 May 2010 04:13:24 +0200 "Rafael J. Wysocki" <rjw@...k.pl> wrote:
> >>
> >> On Friday 07 May 2010, Stephen Rothwell wrote:
> >> Both trees are based on Linus' current and I don't see a good way of fixing
> >> this issue in any of them individually.
> > 
> > The suspend tree has been merged into Linus' tree, so this patch is
> > needed in the net tree before it is merged (or as part of the merge).
> 
> Since the net tree is still on it's way to Linus, we'll just have to
> wait for him to do that merge.
> 
> Then we can sort this out.  I don't want to touch a tree that is
> already on it's way.

Linus merged your tree David.



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