linux-mips
[Top] [All Lists]

Re: Upcoming cross-tree build breakage on merge window

To: Rafał Miłecki <zajec5@gmail.com>
Subject: Re: Upcoming cross-tree build breakage on merge window
From: John Crispin <john@phrozen.org>
Date: Tue, 19 Feb 2013 21:45:15 +0100
Cc: ralf@linux-mips.org, "David S. Miller" <davem@davemloft.net>, linux-mips@linux-mips.org, Network Development <netdev@vger.kernel.org>, Hauke Mehrtens <hauke@hauke-m.de>
In-reply-to: <CACna6rwYZWsGhb8ksko+XGvod=hVyVHu2QrCfEisTG=YAEfBRQ@mail.gmail.com>
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>
References: <CACna6ryD3SjLN-oauvVuRa+q7an8DaULj+Uj4bwFSzQf2WCvMw@mail.gmail.com> <CACna6rwYZWsGhb8ksko+XGvod=hVyVHu2QrCfEisTG=YAEfBRQ@mail.gmail.com>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.7) Gecko/20120922 Icedove/10.0.7
On 19/02/13 20:44, Rafał Miłecki wrote:
2013/1/23 Rafał Miłecki<zajec5@gmail.com>:
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

Just a reminder.



Hi,

Ralf told me he will pull the fix into his upstream-sfr.git today so that the upcoming linux-next should not build break due to this patch

        John

<Prev in Thread] Current Thread [Next in Thread>
  • Re: Upcoming cross-tree build breakage on merge window, John Crispin <=