linux-kernel - Re: linux-next: manual merge of the arm-mpidr 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: <20130619082619.GA31513@flint.arm.linux.org.uk>
Date:	Wed, 19 Jun 2013 09:26:19 +0100
From:	Russell King <rmk@....linux.org.uk>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Will Deacon <will.deacon@....com>,
	Jonathan Austin <jonathan.austin@....com>
Subject: Re: linux-next: manual merge of the arm-mpidr tree with the arm
	tree

On Wed, Jun 19, 2013 at 10:44:09AM +1000, Stephen Rothwell wrote:
> Hi Lorenzo,
> 
> Today's linux-next merge of the arm-mpidr tree got a conflict in
> arch/arm/kernel/suspend.c between commit aa1aadc3305c ("ARM: suspend: fix
> CPU suspend code for !CONFIG_MMU configurations") from the arm tree and
> commit 3fed6a1e3bf0 ("ARM: kernel: implement stack pointer save array
> through MPIDR hashing") from the arm-mpidr tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> P.S. that arm tree commit above has no Signed-off-by from its
> committer :-(

Oh bloody hell.  Now what do I do about that.  The branch is a declared
stable branch, and the commit came in from someone elses tree.  So it's
immutable...

Is there any script around which checks that kind of stuff?

-- 
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/