[Top] [All Lists]

Re: Upcoming cross-tree build breakage on merge window

To: Rafał Miłecki <>
Subject: Re: Upcoming cross-tree build breakage on merge window
From: John Crispin <>
Date: Tue, 19 Feb 2013 21:45:15 +0100
Cc:, "David S. Miller" <>,, Network Development <>, Hauke Mehrtens <>
In-reply-to: <>
List-archive: <>
List-help: <>
List-id: linux-mips <>
List-owner: <>
List-post: <>
List-software: Ecartis version 1.0.0
List-subscribe: <>
List-unsubscribe: <>
References: <> <>
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<>:
I've noticed possible build breakage when two trees get merged:
net-next and linux-john (MIPS).

This is about two following commits:;a=commit;h=dd4544f05469aaaeee891d7dc54d66430344321e;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.


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


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