From: John Crispin <john@phrozen.org>
To: "Rafał Miłecki" <zajec5@gmail.com>
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>
Subject: Re: Upcoming cross-tree build breakage on merge window
Date: Tue, 19 Feb 2013 21:45:15 +0100 [thread overview]
Message-ID: <5123E45B.8060203@phrozen.org> (raw)
In-Reply-To: <CACna6rwYZWsGhb8ksko+XGvod=hVyVHu2QrCfEisTG=YAEfBRQ@mail.gmail.com>
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 parent reply other threads:[~2013-02-19 20:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-23 12:13 Upcoming cross-tree build breakage on merge window Rafał Miłecki
2013-02-19 19:44 ` Rafał Miłecki
2013-02-19 20:45 ` John Crispin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5123E45B.8060203@phrozen.org \
--to=john@phrozen.org \
--cc=davem@davemloft.net \
--cc=hauke@hauke-m.de \
--cc=linux-mips@linux-mips.org \
--cc=netdev@vger.kernel.org \
--cc=ralf@linux-mips.org \
--cc=zajec5@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).