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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20090902.003339.204452262.davem@davemloft.net>
Date:	Wed, 02 Sep 2009 00:33:39 -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,
	shemminger@...tta.com, roel.kluin@...il.com
Subject: Re: linux-next: manual merge of the net tree with Linus' tree

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Wed, 2 Sep 2009 13:37:58 +1000

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/yellowfin.c between commit
> e7a5965a81a29a13cd4994fa23a6a7a1488bcdb6 ("yellowfin: Fix buffer underrun
> after dev_alloc_skb() failure") from Linus' tree and commit
> 61357325f377889a1daffa14962d705dc814dd0e ("netdev: convert bulk of
> drivers to netdev_tx_t") from the net tree.
> 
> Just context changes.  I fixed it up (see below) and will carry the fix
> for a while.

I just merged net-2.6 into net-next-2.6 to clear this up for you.
--
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/