* Upcoming cross-tree build breakage on merge window @ 2013-01-23 12:13 Rafał Miłecki 2013-02-19 19:44 ` Rafał Miłecki 0 siblings, 1 reply; 3+ messages in thread From: Rafał Miłecki @ 2013-01-23 12:13 UTC (permalink / raw) To: john, ralf, David S. Miller Cc: linux-mips, Network Development, Hauke Mehrtens 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ł ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Upcoming cross-tree build breakage on merge window 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 0 siblings, 1 reply; 3+ messages in thread From: Rafał Miłecki @ 2013-02-19 19:44 UTC (permalink / raw) To: john, ralf, David S. Miller Cc: linux-mips, Network Development, Hauke Mehrtens 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. -- Rafał ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Upcoming cross-tree build breakage on merge window 2013-02-19 19:44 ` Rafał Miłecki @ 2013-02-19 20:45 ` John Crispin 0 siblings, 0 replies; 3+ messages in thread From: John Crispin @ 2013-02-19 20:45 UTC (permalink / raw) To: Rafał Miłecki Cc: ralf, David S. Miller, linux-mips, Network Development, Hauke Mehrtens 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 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-19 20:50 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 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 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).