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] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100110.225055.167520274.davem@davemloft.net>
Date:	Sun, 10 Jan 2010 22:50:55 -0800 (PST)
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, hawk@...x.dk, hadi@...erus.ca
Subject: Re: linux-next: manual merge of the net tree with Linus' tree

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Mon, 11 Jan 2010 13:31:09 +1100

> Hi all,
> 
> Today's linux-next merge of the net tree got a conflict in include/linux/sysctl.h between commit 28f6aeea3f12d37bd258b2c0d5ba891bff4ec479 ("net: restore ip source validation") from Linus' tree and commit 65324144b50bc7022cc9b6ca8f4a536a957019e3 ("net: RFC3069, private VLAN proxy arp support") from the net tree.

That latter commit is specially in the net-next-2.6 tree not the
net-2.6 tree.

> They both use the same number in an enum...  I fixed it up (see below) and
> can carry the fix (or some other) for a while.

I'll merge net-2.6 into net-next-2.6 to resolve this, thanks!
--
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/