public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Gortmaker <paul.gortmaker@windriver•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: please include init-v4.1-rc6 branch for v4.2
Date: Wed, 3 Jun 2015 13:39:04 +1000	[thread overview]
Message-ID: <20150603133904.5d8b0bfb@canb.auug.org.au> (raw)
In-Reply-To: <20150602232318.GI29898@windriver.com>

[-- Attachment #1: Type: text/plain, Size: 1950 bytes --]

Hi Paul,

On Tue, 2 Jun 2015 19:23:18 -0400 Paul Gortmaker <paul.gortmaker@windriver•com> wrote:
>
> Please include init-v4.1-rc6 branch of:
> 	git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux.git

OK, I will add it in just before I merge Andrew's tree and see how it
goes.

> I've been cross building it and test merging it with next on and off for
> several weeks now, so it should be trouble free (hopefully).  There will
> be two relatively trivial conflicts upon merging to next:
> 
> 1) A removal of a __cpuinit from this tree will conflict with a removal
>    of the whole code block contaning the original __cpuinit in the file
>    arch/arm/mach-keystone/platsmp.c
> 
> 2) A removal of a __CPUINIT from this tree will conflict with a complete
>    file removal (removed, not renamed) of arch/arm/mach-hisi/headsmp.S

Thanks for the heads up on these.

> Assuming I can get Linus to pull the chunks this time, it should be a
> one shot (one version) tree from a linux-next point of view.

If he takes it, please remind me to remove the tree.

Thanks for adding your subsystem tree as a participant of linux-next.  As
you may know, this is not a judgment of your code.  The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window. 

You will need to ensure that the patches/commits in your tree/series have
been:
     * submitted under GPL v2 (or later) and include the Contributor's
        Signed-off-by,
     * posted to the relevant mailing list,
     * reviewed by you (or another maintainer of your subsystem tree),
     * successfully unit tested, and 
     * destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him
to fetch).  It is allowed to be rebased if you deem it necessary.

-- 
Cheers,
Stephen Rothwell 
sfr@canb•auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

next prev parent reply	other threads:[~2015-06-03  3:39 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-02 23:23 [linux-next] please include init-v4.1-rc6 branch for v4.2 Paul Gortmaker
2015-06-03  3:39 ` Stephen Rothwell [this message]
2015-06-03 18:54   ` Mark Brown
2015-06-03 21:41     ` Paul Gortmaker
2015-07-15 20:59   ` Paul Gortmaker
2015-07-16  0:06     ` [linux-next] " Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150603133904.5d8b0bfb@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=paul.gortmaker@windriver$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox