linux-mips
[Top] [All Lists]

Upcoming cross-tree build breakage on merge window

To: john@phrozen.org, ralf@linux-mips.org, "David S. Miller" <davem@davemloft.net>
Subject: Upcoming cross-tree build breakage on merge window
From: Rafał Miłecki <zajec5@gmail.com>
Date: Wed, 23 Jan 2013 13:13:53 +0100
Cc: linux-mips@linux-mips.org, Network Development <netdev@vger.kernel.org>, Hauke Mehrtens <hauke@hauke-m.de>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=Buu41WyhP5DF7zOdjjLGomDK9DtRxQrUi9HKagfUDuI=; b=JuTX+nuo9NjaKuU4FTaYFvp2x23nsGODtIUBJ/RLMhElI1+A2chZ9WoYwqpFVUte0D lxC0Ikd+t/E5kow81yJIQr4rvCRHW9/rU/wIDvMlOPea+/8ptZNBV56iQwKSRBrl6lmA awAluy7rvPGcfiskQJQRLmU41Sjr/itT1CeBsyTmVY0jwWGaJalLjnPCSOyIPFPwe9u3 KSbdIyE1AqB5L4jvzwmEBacbhh136tyLeRO7qd0aXA4WZwewjn9sgWVHDY4azaPuA0Tt y0dJfbs5f+vJDbuDuT93wUA/4ehcbupjzpMBx7uqbhqdIxbqZLBGSdLQRN5i5vRhYP6A 5P9Q==
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Sender: linux-mips-bounce@linux-mips.org
I've noticed possible build breakage when two trees get merged:
net-next and linux-john (MIPS).

This is about two following commits:
http://git.kernel.org/?p=linux/kernel/git/davem/net-next.git;a=commit;h=dd4544f05469aaaeee891d7dc54d66430344321e
http://git.linux-mips.org/?p=john/linux-john.git;a=commit;h=a008ca117bc85a9d66c47cd5ab18a6c332411919

The first one adds "bgmac" driver which uses asm/mach-bcm47xx/nvram.h
and nvram_getenv. The second one renames them.

Can you handle this in some clever way during merge window, please?

The fix is trivial:
1) Use <bcm47xx_nvram.h>
2) Use bcm47xx_nvram_getenv

-- 
Rafał

<Prev in Thread] Current Thread [Next in Thread>
  • Upcoming cross-tree build breakage on merge window, Rafał Miłecki <=