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:
diff --git a/arch/m68k/include/asm/swab.h b/arch/m68k/include/asm/swab.h
index 9e3054e..5b754aa 100644
--- a/arch/m68k/include/asm/swab.h
+++ b/arch/m68k/include/asm/swab.h
@@ -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__
diff --git a/arch/mn10300/include/asm/ptrace.h b/arch/mn10300/include/asm/ptrace.h
index 7b06cc6..00aa680 100644
--- a/arch/mn10300/include/asm/ptrace.h
+++ b/arch/mn10300/include/asm/ptrace.h
@@ -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 */
diff --git a/arch/mn10300/include/asm/setup.h b/arch/mn10300/include/asm/setup.h
index 08356c8..c229d1e 100644
--- a/arch/mn10300/include/asm/setup.h
+++ b/arch/mn10300/include/asm/setup.h
@@ -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 */
Hi Jaswinder,
On Wed, 10 Jun 2009 19:00:30 +0530 Jaswinder Singh Rajput <[email protected]> wrote:
>
> 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(-)
Is there some reason that these fixes are not just sent to the appropriate
maintainers? That way we would avoid unnecessary conflicts cropping up.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
* Stephen Rothwell <[email protected]> wrote:
> Hi Jaswinder,
>
> On Wed, 10 Jun 2009 19:00:30 +0530 Jaswinder Singh Rajput <[email protected]> wrote:
> >
> > 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(-)
>
> 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
Hello Stephen,
On Thu, 2009-06-11 at 00:19 +1000, Stephen Rothwell wrote:
> Hi Jaswinder,
>
> On Wed, 10 Jun 2009 19:00:30 +0530 Jaswinder Singh Rajput <[email protected]> wrote:
> >
> > 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(-)
>
> 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
Hi Jaswinder,
Jaswinder Singh Rajput wrote:
> Hello Stephen,
>
> On Thu, 2009-06-11 at 00:19 +1000, Stephen Rothwell wrote:
>> Hi Jaswinder,
>>
>> On Wed, 10 Jun 2009 19:00:30 +0530 Jaswinder Singh Rajput <[email protected]> wrote:
>>> 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(-)
>> 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 ;-)
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
On Thu, 2009-06-11 at 11:35 +1000, Greg Ungerer wrote:
> Hi Jaswinder,
>
> Jaswinder Singh Rajput wrote:
> > Hello Stephen,
> >
> > On Thu, 2009-06-11 at 00:19 +1000, Stephen Rothwell wrote:
> >> Hi Jaswinder,
> >>
> >> On Wed, 10 Jun 2009 19:00:30 +0530 Jaswinder Singh Rajput <[email protected]> wrote:
> >>> 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(-)
> >> 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 ;-)
>
> 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
Hi Jaswinder,
Jaswinder Singh Rajput wrote:
> On Thu, 2009-06-11 at 11:35 +1000, Greg Ungerer wrote:
>> Hi Jaswinder,
>>
>> Jaswinder Singh Rajput wrote:
>>> Hello Stephen,
>>>
>>> On Thu, 2009-06-11 at 00:19 +1000, Stephen Rothwell wrote:
>>>> Hi Jaswinder,
>>>>
>>>> On Wed, 10 Jun 2009 19:00:30 +0530 Jaswinder Singh Rajput <[email protected]> wrote:
>>>>> 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(-)
>>>> 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 ;-)
>> 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
> So now only mn10300 patches left :-)
>
> Thanks,
> --
> JSR
>
>
--
------------------------------------------------------------------------
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