linux-kernel - Re: linux-next: build failure after merge of 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 for Android: free password hash cracker in your pocket

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

Date:	Tue, 11 May 2010 23:13: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,
	kaber@...sh.net, andreas.meissner@...airon.com
Subject: Re: linux-next: build failure after merge of the net tree

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Wed, 12 May 2010 12:56:53 +1000

> After merging the net tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> net/ipv4/ipmr.c: In function 'ipmr_cache_unresolved':
> net/ipv4/ipmr.c:1001: error: 'net' undeclared (first use in this function)
> 
> Caused by commit 0c12295a741d3186987f96f518cfbdaf01abb087 ("ipv4: ipmr:
> move mroute data into seperate structure") from the net tree interacting
> with commit bbd725435ddb1cac732f7a8c23c21ff67f24c60f ("IPv4: unresolved
> multicast route cleanup") from Linus' tree.

Tricky merge :-)

I'll clear all of these issues up for you tonight Stephen, thanks!

There should have been a merge conflict in
Documentation/feature-removal-schedule.txt due to some recent
netfilter commits too, I'll take care of that too of course :)
--
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/