linux-next: merge of the arm tree into the at91 tree

linux-next: merge of the arm tree into the at91 tree

[Stephen Rothwell]

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

Hi all,

I noticed that the for-next branch of the arm tree has been merged into
the at91 tree.  My understanding (and Russell, please correct me if I am
wrong) is that the for-next branch is *not* stable and may be rebased.
This will cause all sorts of problems in linux-next in the future (and
also when Russell or the arm=soc guys merge the at91 tree into theirs).

In fact, I am going to have problems today as Russell has already rebase
his for-next branch.  :-(

I assume that the merge was done to fix some conflicts or pick up some
functionality that is in Russell's tree.  This should be done by merging
topic branch(es) of that tree that Russell has explicitly said are stable.

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

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

Re: linux-next: merge of the arm tree into the at91 tree

[Russell King]

On Fri, Jan 27, 2012 at 09:36:19AM +1100, Stephen Rothwell wrote:
> I noticed that the for-next branch of the arm tree has been merged into
> the at91 tree.  My understanding (and Russell, please correct me if I am
> wrong) is that the for-next branch is *not* stable and may be rebased.
> This will cause all sorts of problems in linux-next in the future (and
> also when Russell or the arm=soc guys merge the at91 tree into theirs).

And has already been rebuilt (I won't use 'rebased' because that's really
not what happens to it.)  I've already re-explained this to Nicolas.  It's
equivalent to someone basing their work off linux-next and expecting to
have that pulled into some other tree.

What's even worse is that Nicolas has published this as an official
branch for other people.

> In fact, I am going to have problems today as Russell has already rebase
> his for-next branch.  :-(

I suggest that you drop the at91 tree this time around if you get
conflicts.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

Re: linux-next: merge of the arm tree into the at91 tree

[Nicolas Ferre]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 01/26/2012 11:36 PM, Stephen Rothwell :
> Hi all,
> 
> I noticed that the for-next branch of the arm tree has been merged 
> into the at91 tree.  My understanding (and Russell, please correct 
> me if I am wrong) is that the for-next branch is *not* stable and 
> may be rebased. This will cause all sorts of problems in
> linux-next in the future (and also when Russell or the arm=soc guys
> merge the at91 tree into theirs).
> 
> In fact, I am going to have problems today as Russell has already 
> rebase his for-next branch.  :-(
> 
> I assume that the merge was done to fix some conflicts or pick up 
> some functionality that is in Russell's tree.  This should be done 
> by merging topic branch(es) of that tree that Russell has 
> explicitly said are stable.

Yes, I was anticipating a stable branch from Russell and never should
have pushed into a branch that would have gone to linux-next: My
mistake, sorry.

Note that my intention was not to use this branch or one based on
rmk/for-next in any "pull request". It was just a hint for people that
wanted to work on at91 for 3.4...

So, Stephen, can I ask you to remove the at91-next branch from your
pull list. For the moment we can rely on arm-soc guys to experiment
our changes in linux-next. It may be simpler for everyone.

thanks for your understanding, best regards,
- -- 
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJPInTFAAoJEAf03oE53VmQ01UIALIkAxoj3Oxou45+Ts0hjqCk
ddQpqXsoZt44B/b+M+b2wPKK+stmjAVXT8KQJporgckmJyatc/H3BOdaCw5a4rGR
PPrBjEZRx+cH6IXnzII2b73MkdvmKrICOlKpcuIlJiXPcpWet0J1K4lmMWxDPC2D
zGeTFMqqUYMOxxADtRZhsHo/ryZivtaZf9LfYS5pYc7u4vhqjkCt8q07NabgIRaL
GpfyXSLFl30Sqx53Di6DLr0OUUmHGPvjDj1xR3yqdeXtO9vpoiwZequlVX+PYboL
S6OUPYjrDy8uRTNNkz1X8erruOx/y0T87/l4SHt28Aoz9p9sobcykcyRqQyHGJw=
=YhKe
-----END PGP SIGNATURE-----

Re: linux-next: merge of the arm tree into the at91 tree

[Stephen Rothwell]

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

Hi Nicolas,

On Fri, 27 Jan 2012 10:56:26 +0100 Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
>
> So, Stephen, can I ask you to remove the at91-next branch from your
> pull list. For the moment we can rely on arm-soc guys to experiment
> our changes in linux-next. It may be simpler for everyone.

Done.

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

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