Skip to contentSkip to conversation

please include init-v4.1-rc6 branch for v4.2

linux-next Paul Gortmaker 3 participants 6 messages Jun 2, 2015 – Jul 16, 2015 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi Stephen,

Please include init-v4.1-rc6 branch of:
git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux.git

This is a merge of several branches containing a scaled down version of the work done earlier for init cleanup on a baseline of v4.1-rc6 aimed at inclusion during 4.2-rc1 merge window. We had this in next quite some time ago, but it never got pulled:

https://lkml.kernel.org/r/[email protected]

There was no clear reason why it never got merged, so I took a guess and decided to factor it into separate components that will each get their own pull request, plus drop all the trivial changes as described here:

https://lkml.kernel.org/r/[email protected]

This makes it easier to review and digest, so fingers crossed this time...

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

This should be fine at or near the end of your merge list, so if there is any fallout, it can be cleaned up here in this content and not a burden to other tree owners.

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.

Thanks!
Paul.

#1 lore raw

Hi Paul,

Quoted 3 lines · On Tue, 2 Jun 2015 19:23:18 -0400 Paul Gortmaker…

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.

Quoted 10 lines

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.

Quoted 2 lines

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.

Signature · 3 lines
Cheers,
Stephen Rothwell 
[email protected]
maintainer
#2 lore raw
Quoted 7 lines · Stephen Rothwell
Quoted 2 lines · On Tue, 2 Jun 2015 19:23:18 -0400 Paul Gortmaker…

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.

It looks like this has broken every build that includes modules which I'm trying in my build reports - lots of implicit declarations breaking the build.

#3 lore raw
Quoted 6 lines · [Re: [linux-next] please include init-v4.1-rc6 branch for v4.2] On 03/06/2015…
Quoted 4 lines · Stephen Rothwell
Quoted 2 lines · On Tue, 2 Jun 2015 19:23:18 -0400 Paul Gortmaker…

Please include init-v4.1-rc6 branch of:
git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux.git

Quoted 6 lines
Quoted 2 lines

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

It looks like this has broken every build that includes modules which I'm trying in my build reports - lots of implicit declarations breaking the build.

The module build fails [on ARM] seem worse than they are since the one interaction with the tegra/fuse driver causes spew to appear from generic files like device.h

https://lkml.kernel.org/r/[email protected]

Thanks for the build coverage during the A/C outage; I'll follow up to your build report with more details shortly; indicating exatly what has been done to fix what.

Paul.

#4 lore raw
In reply to Stephen Rothwell
Quoted 10 lines · [Re: [linux-next] please include init-v4.1-rc6 branch for v4.2] On 03/06/2015…

Hi Paul,

Quoted 3 lines · On Tue, 2 Jun 2015 19:23:18 -0400 Paul Gortmaker…

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.

[...]

Quoted 5 lines
Quoted 3 lines

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.

As of today, the final commit from this tree is merged, so it can be removed.

Thanks again for access to the increased test coverage on all of this.

Paul.
--

Quoted 22 lines

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.

Signature · 3 lines
Cheers,
Stephen Rothwell 
[email protected]
#5 lore raw

Hi Paul,

Quoted 17 lines · On Wed, 15 Jul 2015 16:59:03 -0400 Paul Gortmaker…
Quoted 10 lines · [Re: [linux-next] please include init-v4.1-rc6 branch for v4.2] On 03/06/2015…

Hi Paul,

Quoted 3 lines · On Tue, 2 Jun 2015 19:23:18 -0400 Paul Gortmaker…

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.

[...]

Quoted 1 line
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

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.

As of today, the final commit from this tree is merged, so it can be removed.

Thanks for letting me know ... I will remove it today.

Signature · 2 lines
Cheers,
Stephen Rothwell                    [email protected]