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: <20110927212342.GC7737@flint.arm.linux.org.uk>
Date:	Tue, 27 Sep 2011 22:23:43 +0100
From:	Russell King <rmk@....linux.org.uk>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Catalin Marinas <catalin.marinas@....com>,
	Jon Medhurst <tixy@...t.co.uk>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree

On Tue, Sep 27, 2011 at 05:24:46PM +0200, Arnd Bergmann wrote:
> Do you generally send one pull request for each branch you have
> in the for-next branch, or do you send a single request for something
> that roughly resembles the for-next branch at the time of the merge
> window?

It depends how much is queued and how I feel towards the stuff which
is queued.  I've tended to send initially a big pull request of 'ARM
updates' which contains mostly everything, though I've also sent
pull requests for individual topic branches when it makes more sense.

At the moment, the diffstat summary says:

 423 files changed, 3054 insertions(+), 2855 deletions(-)

but there's quite a spread outside arch/arm this time around due to
the GPIO stuff I'm carrying (mostly the change of mach/gpio.h to
asm/gpio.h).

So, at least the GPIO stuff will be a completely separate pull request
from the rest of the ARM stuff.  The 'amba' (primecell) changes will
probably also be a separate pull request because it touches stuff
outside of the arch/arm sub-tree (even though its ARM related.)

What I term 'devel-stable' (iow, stuff I've pulled in from other people
and a few bits of my own stuff which others are using) won't be split
up (that'd negate the point of devel-stable being... stable as it'd
mean there's commits in there which can't be relied upon.)

That leaves 'the rest' which I'll make a decision nearer the time,
along with deciding whether devel-stable ends up being part of
'the rest' or not.

What I will try to do is get the bulk of it in fairly early in the
merge cycle as normal.

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