linux-kernel - Re: linux-next: manual merge of the arm-soc tree with the arm tree

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-prev] [day] [month] [year] [list]

Message-ID: <20150129230535.GG26493@n2100.arm.linux.org.uk>
Date:	Thu, 29 Jan 2015 23:05:35 +0000
From:	Russell King - ARM Linux <linux@....linux.org.uk>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Daniel Thompson <daniel.thompson@...aro.org>,
	Guo Zeng <Guo.Zeng@....com>, Barry Song <Baohua.Song@....com>,
	Baruch Siach <baruch@...s.co.il>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree

On Fri, Jan 30, 2015 at 09:55:33AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/Kconfig.debug between commit 4d31e6641295 ("ARM: 8272/1: netx:
> Migrate DEBUG_LL macros to shared directory") from the  tree and
> commits 01ea63d99397 ("ARM: sirf: add two debug ports for CSRatlas7
> SoC") and e23814da8262 ("ARM: digicolor: add low level debug support")
> from the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Both of these conflict resolutions (the other one you sent after this)
look reasonable, thanks Stephen.

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/