Skip to contentSkip to conversation

linux-kbuild.git

DISCUSSION Michal Marek 3 participants 7 messages Nov 26, 2009 – Dec 2, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

Hi Stephen,

I went through the patches posted to linux-kbuild and picked those that were easy enough to review, looked safe and worked for me. I also took Sam's series from kbuild-next.git, but I didn't really review it yet, so there is no signoff from me (TBD). The repo is at

git://repo.or.cz/linux-kbuild.git for-next

Please ignore the other branches. The shortlog is

Jie Zhang (1):
net: add net_tstamp.h to headers_install

Jonathan Nieder (2):
scripts/package: add KBUILD_PKG_ROOTCMD variable scripts/package: deb-pkg: use fakeroot if available

Michael Tokarev (1):
kbuild: fix bzImage build for x86

Michal Marek (2):
scripts/package: tar-pkg: use tar --owner=root
kbuild: create include/generated in silentoldconfig

Sam Ravnborg (14):
kbuild: search arch/$ARCH/include before include/
dontdiff: add generated
kbuild: move bounds.h to include/generated
kbuild: move asm-offsets.h to include/generated
ia64: move nr-irqs.h to include/generated
arm: move mach-types to include/generated
sh: move machtypes.h to include/generated
kbuild: drop include2/ used for O=... builds
kbuild: do not check for include/asm-$ARCH
kbuild: drop include/asm
kbuild: move compile.h to include/generated drop explicit include of autoconf.h
kbuild: move autoconf.h to include/generated
kbuild: move utsrelease.h to include/generated

Wenji Huang (2):
Kbuild: clear marker out of modpost
Kbuild: clean up marker

There are some more patches on the mailing list and in -mm, which I'm going to look at, but I think this should be a good start. What do you think? Could this be added to linux-next?

Michal

#1 lore raw
Quoted 41 lines · Michal Marek

Hi Stephen,

I went through the patches posted to linux-kbuild and picked those that were easy enough to review, looked safe and worked for me. I also took Sam's series from kbuild-next.git, but I didn't really review it yet, so there is no signoff from me (TBD). The repo is at

git://repo.or.cz/linux-kbuild.git for-next

Please ignore the other branches. The shortlog is

Jie Zhang (1):
net: add net_tstamp.h to headers_install

Jonathan Nieder (2):
scripts/package: add KBUILD_PKG_ROOTCMD variable scripts/package: deb-pkg: use fakeroot if available

Michael Tokarev (1):
kbuild: fix bzImage build for x86

Michal Marek (2):
scripts/package: tar-pkg: use tar --owner=root
kbuild: create include/generated in silentoldconfig

Sam Ravnborg (14):
kbuild: search arch/$ARCH/include before include/
dontdiff: add generated
kbuild: move bounds.h to include/generated
kbuild: move asm-offsets.h to include/generated
ia64: move nr-irqs.h to include/generated
arm: move mach-types to include/generated
sh: move machtypes.h to include/generated
kbuild: drop include2/ used for O=... builds
kbuild: do not check for include/asm-$ARCH
kbuild: drop include/asm
kbuild: move compile.h to include/generated drop explicit include of autoconf.h
kbuild: move autoconf.h to include/generated
kbuild: move utsrelease.h to include/generated

Quoted 7 lines

Wenji Huang (2):
Kbuild: clear marker out of modpost
Kbuild: clean up marker

There are some more patches on the mailing list and in -mm, which I'm going to look at, but I think this should be a good start. What do you think? Could this be added to linux-next?

Looks good.
Good to see you picked up some of the patches that were pending.

Stephen - please replace my kbuild trees with this.

Sam

#2 lore raw

Hi Michal,

Quoted 8 lines · On Thu, 26 Nov 2009 20:37:50 +0100 Sam Ravnborg <[email protected]> wrote:
Quoted 6 lines · Michal Marek

I went through the patches posted to linux-kbuild and picked those that were easy enough to review, looked safe and worked for me. I also took Sam's series from kbuild-next.git, but I didn't really review it yet, so there is no signoff from me (TBD). The repo is at

Quoted 6 lines
Quoted 1 line

git://repo.or.cz/linux-kbuild.git for-next

Looks good.
Good to see you picked up some of the patches that were pending.

Stephen - please replace my kbuild trees with this.

I have replaced this from today. Do you intend to run the equivalent of the kbuild-current tree (bug fixes for the current release while they are waiting to go to Linus)? I have removed the kbuild-current tree for now since the only commit in it is in the new kbuild 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 · 15 lines
Cheers,
Stephen Rothwell 
[email protected]

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.
#3 lore raw
Quoted 11 lines · Stephen Rothwell

Hi Michal,

Quoted 8 lines · On Thu, 26 Nov 2009 20:37:50 +0100 Sam Ravnborg <[email protected]> wrote:
Quoted 6 lines · Michal Marek

I went through the patches posted to linux-kbuild and picked those that were easy enough to review, looked safe and worked for me. I also took Sam's series from kbuild-next.git, but I didn't really review it yet, so there is no signoff from me (TBD). The repo is at

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

git://repo.or.cz/linux-kbuild.git for-next

Looks good.
Good to see you picked up some of the patches that were pending.

Stephen - please replace my kbuild trees with this.

I have replaced this from today.

Thanks!

Quoted 4 lines

Do you intend to run the equivalent of
the kbuild-current tree (bug fixes for the current release while they are waiting to go to Linus)? I have removed the kbuild-current tree for now since the only commit in it is in the new kbuild tree.

I plan to maintain such a branch, but I thought I would base the for-next branch on top of it, so that you get everything in one pack. Or would you still prefer to have two kbuild branches in linux-next, so that you can remove the for-next branch if necessary and keep the for-current branch? Just tell me what fits you best.

Quoted 14 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.

Quoted 2 lines

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.

OK, will keep that in mind.

Michal

#4 lore raw

Hi Michal,

Quoted 11 lines · On Fri, 27 Nov 2009 10:42:37 +0100 Michal Marek <[email protected]> wrote:
Quoted 5 lines

Do you intend to run the equivalent of
the kbuild-current tree (bug fixes for the current release while they are waiting to go to Linus)? I have removed the kbuild-current tree for now since the only commit in it is in the new kbuild tree.

I plan to maintain such a branch, but I thought I would base the for-next branch on top of it, so that you get everything in one pack. Or would you still prefer to have two kbuild branches in linux-next, so that you can remove the for-next branch if necessary and keep the for-current branch? Just tell me what fits you best.

Running a for-current branch allows you to queue up urgent fixes without disrupting your for-next branch. I will merge such a branch early on (actually before I do my first build) so that I don't have to worry about problems that are already have fixes pending for to be merged by Linus in his current tree. Also, as you say, if I have problems with your for-next branch, it does not affect the more urgent patches.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#5 lore raw
Quoted 7 lines · Stephen Rothwell
Quoted 5 lines · On Fri, 27 Nov 2009 10:42:37 +0100 Michal Marek <[email protected]> wrote:

I plan to maintain such a branch, but I thought I would base the for-next branch on top of it, so that you get everything in one pack. Or would you still prefer to have two kbuild branches in linux-next, so that you can remove the for-next branch if necessary and keep the for-current branch? Just tell me what fits you best.

Quoted 6 lines

Running a for-current branch allows you to queue up urgent fixes without disrupting your for-next branch. I will merge such a branch early on (actually before I do my first build) so that I don't have to worry about problems that are already have fixes pending for to be merged by Linus in his current tree. Also, as you say, if I have problems with your for-next branch, it does not affect the more urgent patches.

OK, I created a for-linus branch in git://repo.or.cz/linux-kbuild.git.
Currently it's empty, as there are no urgent kbuild fixes for 2.6.32.

Michal

#6 lore raw

Hi Michal,

Quoted 3 lines · On Mon, 30 Nov 2009 11:36:05 +0100 Michal Marek <[email protected]> wrote:

OK, I created a for-linus branch in git://repo.or.cz/linux-kbuild.git.
Currently it's empty, as there are no urgent kbuild fixes for 2.6.32.

OK, it will be included from tomorrow in case you find anything urgent.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/