linux-kernel - Re: linux-next: manual merge of the staging tree with the net-next 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: <20130123045242.GA3309@kroah.com>
Date:	Tue, 22 Jan 2013 20:52:42 -0800
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Florian Fainelli <florian@...nwrt.org>,
	David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
	Mark Einon <mark.einon@...il.com>
Subject: Re: linux-next: manual merge of the staging tree with the net-next
 tree

On Wed, Jan 23, 2013 at 03:45:25PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/et131x/et131x.c between commit f9a8f83b04e0 ("net: phy:
> remove flags argument from phy_{attach, connect, connect_direct}") from
> the net-next tree and commit 26ef1021c1c7 ("staging: et131x: Modify block
> comments to fit with networking style") from the staging tree.
> 
> I fixed it up (the former adjusted the white space in the same was as the
> latter, so I used thet) and can carry the fix as necessary (no action is
> required).

That sounds good to me, thanks.

greg k-h
--
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/