netdev - Upcoming cross-tree build breakage on merge window

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <CACna6ryD3SjLN-oauvVuRa+q7an8DaULj+Uj4bwFSzQf2WCvMw@mail.gmail.com>
Date:	Wed, 23 Jan 2013 13:13:53 +0100
From:	Rafał Miłecki <zajec5@...il.com>
To:	john@...ozen.org, ralf@...ux-mips.org,
	"David S. Miller" <davem@...emloft.net>
Cc:	linux-mips@...ux-mips.org,
	Network Development <netdev@...r.kernel.org>,
	Hauke Mehrtens <hauke@...ke-m.de>
Subject: Upcoming cross-tree build breakage on merge window

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ł
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html