Skip to contentSkip to conversation

headers_check fix patches 20090610

git-pull -tip Jaswinder Singh Rajput 4 participants 7 messages Jun 10, 2009 – Jun 11, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

The following changes since commit e271e1343a94e081723cb4180af3fdb5fecc1a49:
Ingo Molnar (1):

        Merge branch 'x86/mce4'

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-top.git master

Jaswinder Singh Rajput (3):
headers_check fix: m68k, swab.h
headers_check fix: mn10300, ptrace.h
headers_check fix: mn10300, setup.h

 arch/m68k/include/asm/swab.h      |    2 +-
 arch/mn10300/include/asm/ptrace.h |    5 ++---
 arch/mn10300/include/asm/setup.h  |    3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

Complete diff:

arch/m68k/include/asm/swab.h +1 -1
index 9e3054e..5b754aa 100644
@@ -1,7 +1,7 @@
 #ifndef _M68K_SWAB_H
 #define _M68K_SWAB_H
 
-#include <asm/types.h>
+#include <linux/types.h>
 #include <linux/compiler.h>
 
 #define __SWAB_64_THRU_32__
arch/mn10300/include/asm/ptrace.h +2 -3
index 7b06cc6..00aa680 100644
@@ -77,8 +77,6 @@ struct pt_regs {
 };
 #endif
 
-extern struct pt_regs *__frame; /* current frame pointer */
-
 /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
 #define PTRACE_GETREGS            12
 #define PTRACE_SETREGS            13
@@ -90,6 +88,8 @@ extern struct pt_regs *__frame; /* current frame pointer */
 
 #if defined(__KERNEL__)
 
+extern struct pt_regs *__frame;		/* current frame pointer */
+
 #if !defined(__ASSEMBLY__)
 #define user_mode(regs)			(((regs)->epsw & EPSW_nSL) == EPSW_nSL)
 #define instruction_pointer(regs)	((regs)->pc)
@@ -99,5 +99,4 @@ extern void show_regs(struct pt_regs *);
 #define profile_pc(regs) ((regs)->pc)
 
 #endif  /*  __KERNEL__  */
-
 #endif /* _ASM_PTRACE_H */
arch/mn10300/include/asm/setup.h +2 -1
index 08356c8..c229d1e 100644
@@ -11,7 +11,8 @@
 #ifndef _ASM_SETUP_H
 #define _ASM_SETUP_H
 
+#ifdef __KERNEL__
 extern void __init unit_setup(void);
 extern void __init unit_init_IRQ(void);
-
+#endif
 #endif /* _ASM_SETUP_H */
#1 lore raw

Hi Jaswinder,

Quoted 14 lines · On Wed, 10 Jun 2009 19:00:30 +0530 Jaswinder Singh Rajput…

The following changes since commit e271e1343a94e081723cb4180af3fdb5fecc1a49:
Ingo Molnar (1):

        Merge branch 'x86/mce4'

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-top.git master

Jaswinder Singh Rajput (3):
headers_check fix: m68k, swab.h
headers_check fix: mn10300, ptrace.h
headers_check fix: mn10300, setup.h

Quoted 4 lines
 arch/m68k/include/asm/swab.h      |    2 +-
 arch/mn10300/include/asm/ptrace.h |    5 ++---
 arch/mn10300/include/asm/setup.h  |    3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

Is there some reason that these fixes are not just sent to the appropriate maintainers? That way we would avoid unnecessary conflicts cropping up.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#2 lore raw
Quoted 17 lines · Stephen Rothwell

Hi Jaswinder,

Quoted 14 lines · On Wed, 10 Jun 2009 19:00:30 +0530 Jaswinder Singh Rajput…

The following changes since commit e271e1343a94e081723cb4180af3fdb5fecc1a49:
Ingo Molnar (1):

        Merge branch 'x86/mce4'

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-top.git master

Jaswinder Singh Rajput (3):
headers_check fix: m68k, swab.h
headers_check fix: mn10300, ptrace.h
headers_check fix: mn10300, setup.h

Quoted 8 lines
Quoted 4 lines
 arch/m68k/include/asm/swab.h      |    2 +-
 arch/mn10300/include/asm/ptrace.h |    5 ++---
 arch/mn10300/include/asm/setup.h  |    3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

Is there some reason that these fixes are not just sent to the appropriate maintainers? That way we would avoid unnecessary conflicts cropping up.

Yes, that is what should happen. The initial header fixes going via -tip was really a one-off effort due to the sheer mass of the changes needed and due to the concentrated review effort that was done by many people. Now the patches can go via the usual maintainer channels.

Ingo

#3 lore raw
In reply to Stephen Rothwell

Hello Stephen,

Quoted 17 lines · Stephen Rothwell

Hi Jaswinder,

Quoted 14 lines · On Wed, 10 Jun 2009 19:00:30 +0530 Jaswinder Singh Rajput…

The following changes since commit e271e1343a94e081723cb4180af3fdb5fecc1a49:
Ingo Molnar (1):

        Merge branch 'x86/mce4'

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-top.git master

Jaswinder Singh Rajput (3):
headers_check fix: m68k, swab.h
headers_check fix: mn10300, ptrace.h
headers_check fix: mn10300, setup.h

Quoted 8 lines
Quoted 4 lines
 arch/m68k/include/asm/swab.h      |    2 +-
 arch/mn10300/include/asm/ptrace.h |    5 ++---
 arch/mn10300/include/asm/setup.h  |    3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

Is there some reason that these fixes are not just sent to the appropriate maintainers? That way we would avoid unnecessary conflicts cropping up.

Maintainers are also in CC.
Patches were already sent on :

Subject: [PATCH 0/6] headers_check fix patches 20090604

Interested maintainers already pulled and applied patches. These are left-over patches. I am sending to Ingo hoping that he will merge it otherwise last option for me will be to prepare headers-check tree and send to linux-next ;-)

Thanks,
--
JSR

#4 lore raw

Hi Jaswinder,

Quoted 30 lines · Jaswinder Singh Rajput

Hello Stephen,

Quoted 16 lines · Stephen Rothwell

Hi Jaswinder,

Quoted 13 lines · On Wed, 10 Jun 2009 19:00:30 +0530 Jaswinder Singh Rajput…

The following changes since commit e271e1343a94e081723cb4180af3fdb5fecc1a49:
Ingo Molnar (1):

        Merge branch 'x86/mce4'

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-top.git master

Jaswinder Singh Rajput (3):
headers_check fix: m68k, swab.h
headers_check fix: mn10300, ptrace.h
headers_check fix: mn10300, setup.h

Quoted 7 lines
Quoted 4 lines
 arch/m68k/include/asm/swab.h      |    2 +-
 arch/mn10300/include/asm/ptrace.h |    5 ++---
 arch/mn10300/include/asm/setup.h  |    3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

Is there some reason that these fixes are not just sent to the appropriate maintainers? That way we would avoid unnecessary conflicts cropping up.

Maintainers are also in CC.
Patches were already sent on :

Quoted 6 lines

Subject: [PATCH 0/6] headers_check fix patches 20090604

Interested maintainers already pulled and applied patches. These are left-over patches. I am sending to Ingo hoping that he will merge it otherwise last option for me will be to prepare headers-check tree and send to linux-next ;-)

I am happy to take the m68k change and push that upstream. If it hasn't already been picked up by someone else.

Regards
Greg

------------------------------------------------------------------------

Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com
#5 lore raw
Quoted 35 lines · Greg Ungerer

Hi Jaswinder,

Quoted 32 lines · Jaswinder Singh Rajput

Hello Stephen,

Quoted 16 lines · Stephen Rothwell

Hi Jaswinder,

Quoted 13 lines · On Wed, 10 Jun 2009 19:00:30 +0530 Jaswinder Singh Rajput…

The following changes since commit e271e1343a94e081723cb4180af3fdb5fecc1a49:
Ingo Molnar (1):

        Merge branch 'x86/mce4'

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-top.git master

Jaswinder Singh Rajput (3):
headers_check fix: m68k, swab.h
headers_check fix: mn10300, ptrace.h
headers_check fix: mn10300, setup.h

Quoted 7 lines
Quoted 4 lines
 arch/m68k/include/asm/swab.h      |    2 +-
 arch/mn10300/include/asm/ptrace.h |    5 ++---
 arch/mn10300/include/asm/setup.h  |    3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

Is there some reason that these fixes are not just sent to the appropriate [email protected] maintainers? That way we would avoid unnecessary conflicts cropping up.

Maintainers are also in CC.
Patches were already sent on :

Subject: [PATCH 0/6] headers_check fix patches 20090604

Quoted 8 lines
Quoted 4 lines

Interested maintainers already pulled and applied patches. These are left-over patches. I am sending to Ingo hoping that he will merge it otherwise last option for me will be to prepare headers-check tree and send to linux-next ;-)

I am happy to take the m68k change and push that upstream. If it hasn't already been picked up by someone else.

Sure, take it.

So now only mn10300 patches left :-)

Thanks,
--
JSR

#6 lore raw

Hi Jaswinder,

Quoted 39 lines · Jaswinder Singh Rajput
Quoted 38 lines · Greg Ungerer

Hi Jaswinder,

Quoted 35 lines · Jaswinder Singh Rajput

Hello Stephen,

Quoted 16 lines · Stephen Rothwell

Hi Jaswinder,

Quoted 13 lines · On Wed, 10 Jun 2009 19:00:30 +0530 Jaswinder Singh Rajput…

The following changes since commit e271e1343a94e081723cb4180af3fdb5fecc1a49:
Ingo Molnar (1):

        Merge branch 'x86/mce4'

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-top.git master

Jaswinder Singh Rajput (3):
headers_check fix: m68k, swab.h
headers_check fix: mn10300, ptrace.h
headers_check fix: mn10300, setup.h

Quoted 7 lines
Quoted 4 lines
 arch/m68k/include/asm/swab.h      |    2 +-
 arch/mn10300/include/asm/ptrace.h |    5 ++---
 arch/mn10300/include/asm/setup.h  |    3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

Is there some reason that these fixes are not just sent to the appropriate [email protected] maintainers? That way we would avoid unnecessary conflicts cropping up.

Maintainers are also in CC.
Patches were already sent on :

Subject: [PATCH 0/6] headers_check fix patches 20090604

Interested maintainers already pulled and applied patches. These are left-over patches. I am sending to Ingo hoping that he will merge it otherwise last option for me will be to prepare headers-check tree and send to linux-next ;-)

Quoted 5 lines
Quoted 3 lines

I am happy to take the m68k change and push that upstream. If it hasn't already been picked up by someone else.

Sure, take it.

Ok, done. That one m68k patch is now in:

git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git for-linus

I will be pushing that to Linus some time in the next few days.

Regards
Greg

Quoted 7 lines

So now only mn10300 patches left :-)

Thanks,
--
JSR

Signature · 5 lines
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com