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

Message-Id: <20090603.033351.193935428.davem@davemloft.net>
Date:	Wed, 03 Jun 2009 03:33:51 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	sfr@...b.auug.org.au
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	eswierk@...stanetworks.com, aabdulla@...dia.com
Subject: Re: linux-next: manual merge of the net tree with Linus' tree

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Wed, 3 Jun 2009 12:20:48 +1000

> Hi Dave,
> 
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/forcedeth.c between commit
> 5a9a8e32ebe269c71d8d3e78f9435fe7729f38e9 ("forcedeth: add phy_power_down
> parameter, leave phy powered up by default (v2)") from Linus' tree and
> commit 88d7d8b00cdc3117150faab4c4ace6d464b71c22 ("forcedeth: add clock
> gating feature <resend>") from the net tree.
> 
> Just context changing.  I fixed it up (see below) and can carry the fix
> for a while.

This will be fixed with a push I'll do in a few moments.

Thanks Stephen!
--
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/