Please include xshm in linux-next

Please include xshm in linux-next

[Linus Walleij]

Hi Stephen,

while we are in the process of setting up a kernel.org repo for
my colleague Sjur Brændeland, could you please include the
xshm-for-next branch from my ST-Ericsson tree on kernel.org
so we catch any build problems etc:

git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
xshm-for-next

Thanks,
Linus Walleij

Re: Please include xshm in linux-next

[Stephen Rothwell]

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

Hi Linus,

On Wed, 7 Dec 2011 13:27:33 +0100 Linus Walleij <linus.walleij@linaro.org> wrote:
>
> while we are in the process of setting up a kernel.org repo for
> my colleague Sjur Brændeland, could you please include the
> xshm-for-next branch from my ST-Ericsson tree on kernel.org
> so we catch any build problems etc:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
> xshm-for-next

I have added this tree with you and Sjur as contacts in case of trouble.

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

Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees.  You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next.  These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc.  The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc.  If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Please include modem_shm in linux-next

[Sjur BRENDELAND]

Hi Stephen,

Could you please consider pulling the driver tree 
git@github.com:sjurbren/modem-ipc.git for-next.
I have gpg-signed the tag modem_shm_v5.

This replaces the previous branch you pulled from Linus Walleij:
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git xshm-for-next

Please get back to me if any issues.

Thanks,
Sjur Brændeland

Re: Please include modem_shm in linux-next

[Stephen Rothwell]

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

Hi

On Fri, 13 Jan 2012 00:40:07 +0100 Sjur BRENDELAND <sjur.brandeland@stericsson.com> wrote:
>
> Could you please consider pulling the driver tree 
> git@github.com:sjurbren/modem-ipc.git for-next.

That is not a URL I can pull ... git://... please

> I have gpg-signed the tag modem_shm_v5.
> 
> This replaces the previous branch you pulled from Linus Walleij:
> git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git xshm-for-next
> 
> Please get back to me if any issues.

I don't like adding new trees during the merge window.  If this code is
for v3.4, please ping me after v3.3-rc1 is out.  Is the code in the old
xshm tree going to be sent to Linus Torvalds during this merge window?

I just had a look at this new version (I used
git://github.com/sjurbren/modem-ipc.git branch for-next to fetch it) and
there seems like a large amount of churn in the code if it is to be
merged this merge window.   Also, the last patch (that adds the cif shm
driver) you effectively change the module name of an existing driver - I
am not sure what impat that will have on existing users.

I would also like to hear from Linus Walleij ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: Please include modem_shm in linux-next

[Linus Walleij]

On Fri, Jan 13, 2012 at 1:10 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> I would also like to hear from Linus Walleij ...

Please replace my repo with Sjurs (whenever it merges fine).

Sjur, I guess an option would be if you rebase your for-next
onto 3.3-rc1 as soon as it appears? I usually do that as a
starter, then rebase to later -rc:s only if necessary (e.g. due to
massive fixes going in in the early -rc:s)

For example for the last merge window my pull request was
based on the 3.2-rc3 tag.

Linus Walleij

RE: Please include modem_shm in linux-next

[Sjur BRENDELAND]

Hi Stephen,

>> I would also like to hear from Linus Walleij ...
> 
> Please replace my repo with Sjurs (whenever it merges fine).
> 
> Sjur, I guess an option would be if you rebase your for-next
> onto 3.3-rc1 as soon as it appears? 

I have rebased to v3.3-rc1. Please pull:
git://github.com/sjurbren/modem-ipc.git for-next.

This replaces the previous branch "xshm-for-next" pulled from Linus Walleij.
Please get back to me if you get any issues.

Thanks,
Sjur Brændeland

Re: Please include modem_shm in linux-next

[Stephen Rothwell]

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

Hi Sjur,

On Tue, 31 Jan 2012 09:45:22 +0100 Sjur BRENDELAND <sjur.brandeland@stericsson.com> wrote:
>
> >> I would also like to hear from Linus Walleij ...
> > 
> > Please replace my repo with Sjurs (whenever it merges fine).
> > 
> > Sjur, I guess an option would be if you rebase your for-next
> > onto 3.3-rc1 as soon as it appears? 
> 
> I have rebased to v3.3-rc1. Please pull:
> git://github.com/sjurbren/modem-ipc.git for-next.
> 
> This replaces the previous branch "xshm-for-next" pulled from Linus Walleij.
> Please get back to me if you get any issues.

I have switched to this from today.

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]