linux-kernel - Re: linux-next: manual merge of the msm 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20101018081520.GA10551@flint.arm.linux.org.uk>
Date:	Mon, 18 Oct 2010 09:15:20 +0100
From:	Russell King <rmk@....linux.org.uk>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Daniel Walker <dwalker@...o99.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Jeremy Kerr <jeremy.kerr@...onical.com>,
	Jeff Ohlstein <johlstei@...eaurora.org>
Subject: Re: linux-next: manual merge of the msm tree with the arm tree

On Mon, Oct 18, 2010 at 11:02:07AM +1100, Stephen Rothwell wrote:
> [ Just cc'ing Russell, sorry about that]
> 
> On Mon, 18 Oct 2010 10:35:40 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > Hi Daniel,
> > 
> > Today's linux-next merge of the msm tree got a conflict in
> > arch/arm/mach-msm/include/mach/debug-macro.S between commit
> > 08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and
> > virtual addresses from addruart") from the arm tree and commit
> > 46fe5f29e3062f681cc3cf07a604d82396faea89 ("msm: allow uart to be
> > conditionally disabled") from the msm tree.
> > 
> > Just context changes.  I fixed it up (see below) and can carry the fix as
> > necessary.

Thanks, but I don't think there's much which can be done about these.
Changes such as 08a610d affect all ARM sub-architectures, and as they're
spread across multiple git trees...

I think there's going to be some problems during this forthcoming merge
window.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:
--
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/