linux-kernel - Re: linux-next: manual merge of the net-next tree with the net 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: <20120301.172427.782491081561180393.davem@davemloft.net>
Date:	Thu, 01 Mar 2012 17:24:27 -0500 (EST)
From:	David Miller <davem@...emloft.net>
To:	sfr@...b.auug.org.au
Cc:	netdev@...r.kernel.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, mcarlson@...adcom.com,
	mchan@...adcom.com
Subject: Re: linux-next: manual merge of the net-next tree with the net tree

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Thu, 1 Mar 2012 13:33:33 +1100

> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/broadcom/tg3.c between commit 65ec698d1368 ("tg3:
> Fix tg3_get_stats64 for 5700 / 5701 devs") from the net tree and various
> commits from the net-next tree.
> 
> I just used the version from the net-next tree for today (assuming that
> this conflict will be fixed shortly).

I'll try to take care of this now, 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/