Mailing List Archive: Linux: Kernel

linux-next: manual merge of the m68knommu tree with the m68k tree

Index | Next | Previous | View Threaded

sfr at canb

Nov 25, 2009, 4:58 PM

Post #1 of 11 (295 views)
Permalink

linux-next: manual merge of the m68knommu tree with the m68k tree

Hi Greg,

Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/include/asm/ptrace.h between commit
63c361b65f6540043c4baabf1a044a45c7465858 ("m68k: use generic code for
ptrace requests") from the m68k tree and commit
03a03164e8084b810e9f92906a51232d63bac72c ("m68knommu: define
arch_has_single_step() and friends") from the m68knommu tree.

These mostly add the same stuff but not quite :-(

I have done a fixup (see below) and can carry it as necessary. Please
check the result.
--
Cheers,
Stephen Rothwell sfr [at] canb

diff --cc arch/m68k/include/asm/ptrace.h
index eef9309,beb2091..0000000
--- a/arch/m68k/include/asm/ptrace.h
+++ b/arch/m68k/include/asm/ptrace.h
@@@ -86,14 -84,15 +86,18 @@@ struct switch_stack
extern void show_regs(struct pt_regs *);

/*
- * These are defined as per linux/ptrace.h.
+ * These are defined as per linux/ptrace.h, which see.
*/
+ struct task_struct;
+
-#ifndef CONFIG_MMU
-#define arch_has_single_step() (1)
+#define arch_has_single_step() (1)
extern void user_enable_single_step(struct task_struct *);
extern void user_disable_single_step(struct task_struct *);
+
++#ifdef CONFIG_MMU
+#define arch_has_block_step() (1)
+extern void user_enable_block_step(struct task_struct *);
+ #endif

#endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

geert at linux-m68k

Nov 26, 2009, 1:29 PM

Post #2 of 11 (273 views)
Permalink

Re: linux-next: manual merge of the m68knommu tree with the m68k tree [In reply to]

On Thu, Nov 26, 2009 at 01:58, Stephen Rothwell <sfr [at] canb> wrote:
> Today's linux-next merge of the m68knommu tree got a conflict in
> arch/m68k/include/asm/ptrace.h between commit
> 63c361b65f6540043c4baabf1a044a45c7465858 ("m68k: use generic code for
> ptrace requests") from the m68k tree and commit
> 03a03164e8084b810e9f92906a51232d63bac72c ("m68knommu: define
> arch_has_single_step() and friends") from the m68knommu tree.
>
> These mostly add the same stuff but not quite :-(

Ah sorry, my bad. I'm not yet used to the uClinux guys touching "my"
includes ;-)
So we need better coordination between us.

IIRC, Greg's changes were inspired by Andreas' patch.

> I have done a fixup (see below) and can carry it as necessary. Please
> check the result.

At first sight, it looks OK. Thanks for fixing it up!

> --
> Cheers,
> Stephen Rothwell sfr [at] canb
>
> diff --cc arch/m68k/include/asm/ptrace.h
> index eef9309,beb2091..0000000
> --- a/arch/m68k/include/asm/ptrace.h
> +++ b/arch/m68k/include/asm/ptrace.h
> @@@ -86,14 -84,15 +86,18 @@@ struct switch_stack
> extern void show_regs(struct pt_regs *);
>
> /*
> - * These are defined as per linux/ptrace.h.
> + * These are defined as per linux/ptrace.h, which see.
> */
> + struct task_struct;
> +
> -#ifndef CONFIG_MMU
> -#define arch_has_single_step() (1)
> +#define arch_has_single_step() (1)
> extern void user_enable_single_step(struct task_struct *);
> extern void user_disable_single_step(struct task_struct *);
> +
> ++#ifdef CONFIG_MMU
> +#define arch_has_block_step() (1)
> +extern void user_enable_block_step(struct task_struct *);
> + #endif
>
> #endif /* __KERNEL__ */
> #endif /* __ASSEMBLY__ */

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert [at] linux-m68k

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

gerg at snapgear

Nov 26, 2009, 8:43 PM

Post #3 of 11 (270 views)
Permalink

Re: linux-next: manual merge of the m68knommu tree with the m68k tree [In reply to]

Hi Stephen, Geert,

Geert Uytterhoeven wrote:
> On Thu, Nov 26, 2009 at 01:58, Stephen Rothwell <sfr [at] canb> wrote:
>> Today's linux-next merge of the m68knommu tree got a conflict in
>> arch/m68k/include/asm/ptrace.h between commit
>> 63c361b65f6540043c4baabf1a044a45c7465858 ("m68k: use generic code for
>> ptrace requests") from the m68k tree and commit
>> 03a03164e8084b810e9f92906a51232d63bac72c ("m68knommu: define
>> arch_has_single_step() and friends") from the m68knommu tree.
>>
>> These mostly add the same stuff but not quite :-(
>
> Ah sorry, my bad. I'm not yet used to the uClinux guys touching "my"
> includes ;-)
> So we need better coordination between us.
>
> IIRC, Greg's changes were inspired by Andreas' patch.

Yes, largely they are.

>> I have done a fixup (see below) and can carry it as necessary. Please
>> check the result.
>
> At first sight, it looks OK. Thanks for fixing it up!

Yep, looks ok from what I can see.

Geert, how do you want to handle for the real linus merge?
Do you want me to drop the changes to ptrace.h from that patch?

Regards
Greg

>> --
>> Cheers,
>> Stephen Rothwell sfr [at] canb
>>
>> diff --cc arch/m68k/include/asm/ptrace.h
>> index eef9309,beb2091..0000000
>> --- a/arch/m68k/include/asm/ptrace.h
>> +++ b/arch/m68k/include/asm/ptrace.h
>> @@@ -86,14 -84,15 +86,18 @@@ struct switch_stack
>> extern void show_regs(struct pt_regs *);
>>
>> /*
>> - * These are defined as per linux/ptrace.h.
>> + * These are defined as per linux/ptrace.h, which see.
>> */
>> + struct task_struct;
>> +
>> -#ifndef CONFIG_MMU
>> -#define arch_has_single_step() (1)
>> +#define arch_has_single_step() (1)
>> extern void user_enable_single_step(struct task_struct *);
>> extern void user_disable_single_step(struct task_struct *);
>> +
>> ++#ifdef CONFIG_MMU
>> +#define arch_has_block_step() (1)
>> +extern void user_enable_block_step(struct task_struct *);
>> + #endif
>>
>> #endif /* __KERNEL__ */
>> #endif /* __ASSEMBLY__ */
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert [at] linux-m68k
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
>

--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg [at] snapgear
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

geert at linux-m68k

Nov 27, 2009, 12:43 AM

Post #4 of 11 (269 views)
Permalink

Re: linux-next: manual merge of the m68knommu tree with the m68k tree [In reply to]

On Fri, Nov 27, 2009 at 05:43, Greg Ungerer <gerg [at] snapgear> wrote:
> Geert Uytterhoeven wrote:
>>
>> On Thu, Nov 26, 2009 at 01:58, Stephen Rothwell <sfr [at] canb>
>> wrote:
>>>
>>> Today's linux-next merge of the m68knommu tree got a conflict in
>>> arch/m68k/include/asm/ptrace.h between commit
>>> 63c361b65f6540043c4baabf1a044a45c7465858 ("m68k: use generic code for
>>> ptrace requests") from the m68k tree and commit
>>> 03a03164e8084b810e9f92906a51232d63bac72c ("m68knommu: define
>>> arch_has_single_step() and friends") from the m68knommu tree.
>>>
>>> These mostly add the same stuff but not quite :-(
>>
>> Ah sorry, my bad. I'm not yet used to the uClinux guys touching "my"
>> includes ;-)
>> So we need better coordination between us.
>>
>> IIRC, Greg's changes were inspired by Andreas' patch.
>
> Yes, largely they are.
>
>
>>> I have done a fixup (see below) and can carry it as necessary. Please
>>> check the result.
>>
>> At first sight, it looks OK. Thanks for fixing it up!
>
> Yep, looks ok from what I can see.
>
> Geert, how do you want to handle for the real linus merge?
> Do you want me to drop the changes to ptrace.h from that patch?

I can apply your patch (modified to apply on top of Andreas') to the
m68k for-linus branch.
Does that sound OK for you?

>>> --
>>> Cheers,
>>> Stephen Rothwell sfr [at] canb
>>>
>>> diff --cc arch/m68k/include/asm/ptrace.h
>>> index eef9309,beb2091..0000000
>>> --- a/arch/m68k/include/asm/ptrace.h
>>> +++ b/arch/m68k/include/asm/ptrace.h
>>> @@@ -86,14 -84,15 +86,18 @@@ struct switch_stack
>>> extern void show_regs(struct pt_regs *);
>>>
>>> /*
>>> - * These are defined as per linux/ptrace.h.
>>> + * These are defined as per linux/ptrace.h, which see.
>>> */
>>> + struct task_struct;
>>> +
>>> -#ifndef CONFIG_MMU
>>> -#define arch_has_single_step() (1)
>>> +#define arch_has_single_step() (1)
>>> extern void user_enable_single_step(struct task_struct *);
>>> extern void user_disable_single_step(struct task_struct *);
>>> +
>>> ++#ifdef CONFIG_MMU
>>> +#define arch_has_block_step() (1)
>>> +extern void user_enable_block_step(struct task_struct *);
>>> + #endif
>>>
>>> #endif /* __KERNEL__ */
>>> #endif /* __ASSEMBLY__ */

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert [at] linux-m68k

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

gerg at snapgear

Nov 27, 2009, 3:23 AM

Post #5 of 11 (270 views)
Permalink

Re: linux-next: manual merge of the m68knommu tree with the m68k tree [In reply to]

Hi Geert,

On 11/27/2009 06:43 PM, Geert Uytterhoeven wrote:
> On Fri, Nov 27, 2009 at 05:43, Greg Ungerer<gerg [at] snapgear> wrote:
>> Geert Uytterhoeven wrote:
>>>
>>> On Thu, Nov 26, 2009 at 01:58, Stephen Rothwell<sfr [at] canb>
>>> wrote:
>>>>
>>>> Today's linux-next merge of the m68knommu tree got a conflict in
>>>> arch/m68k/include/asm/ptrace.h between commit
>>>> 63c361b65f6540043c4baabf1a044a45c7465858 ("m68k: use generic code for
>>>> ptrace requests") from the m68k tree and commit
>>>> 03a03164e8084b810e9f92906a51232d63bac72c ("m68knommu: define
>>>> arch_has_single_step() and friends") from the m68knommu tree.
>>>>
>>>> These mostly add the same stuff but not quite :-(
>>>
>>> Ah sorry, my bad. I'm not yet used to the uClinux guys touching "my"
>>> includes ;-)
>>> So we need better coordination between us.
>>>
>>> IIRC, Greg's changes were inspired by Andreas' patch.
>>
>> Yes, largely they are.
>>
>>
>>>> I have done a fixup (see below) and can carry it as necessary. Please
>>>> check the result.
>>>
>>> At first sight, it looks OK. Thanks for fixing it up!
>>
>> Yep, looks ok from what I can see.
>>
>> Geert, how do you want to handle for the real linus merge?
>> Do you want me to drop the changes to ptrace.h from that patch?
>
> I can apply your patch (modified to apply on top of Andreas') to the
> m68k for-linus branch.
> Does that sound OK for you?

Yep, thats fine by me.

Regards
Greg

>>>> --
>>>> Cheers,
>>>> Stephen Rothwell sfr [at] canb
>>>>
>>>> diff --cc arch/m68k/include/asm/ptrace.h
>>>> index eef9309,beb2091..0000000
>>>> --- a/arch/m68k/include/asm/ptrace.h
>>>> +++ b/arch/m68k/include/asm/ptrace.h
>>>> @@@ -86,14 -84,15 +86,18 @@@ struct switch_stack
>>>> extern void show_regs(struct pt_regs *);
>>>>
>>>> /*
>>>> - * These are defined as per linux/ptrace.h.
>>>> + * These are defined as per linux/ptrace.h, which see.
>>>> */
>>>> + struct task_struct;
>>>> +
>>>> -#ifndef CONFIG_MMU
>>>> -#define arch_has_single_step() (1)
>>>> +#define arch_has_single_step() (1)
>>>> extern void user_enable_single_step(struct task_struct *);
>>>> extern void user_disable_single_step(struct task_struct *);
>>>> +
>>>> ++#ifdef CONFIG_MMU
>>>> +#define arch_has_block_step() (1)
>>>> +extern void user_enable_block_step(struct task_struct *);
>>>> + #endif
>>>>
>>>> #endif /* __KERNEL__ */
>>>> #endif /* __ASSEMBLY__ */
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert [at] linux-m68k
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
>

--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg [at] snapgear
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close, FAX: +61 7 3891 3630
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

geert at linux-m68k

Nov 27, 2009, 1:21 PM

Post #6 of 11 (267 views)
Permalink

Re: linux-next: manual merge of the m68knommu tree with the m68k tree [In reply to]

On Fri, Nov 27, 2009 at 12:23, Greg Ungerer <gerg [at] snapgear> wrote:
> On 11/27/2009 06:43 PM, Geert Uytterhoeven wrote:
>> On Fri, Nov 27, 2009 at 05:43, Greg Ungerer<gerg [at] snapgear> wrote:
>>> Geert Uytterhoeven wrote:
>>>> On Thu, Nov 26, 2009 at 01:58, Stephen Rothwell<sfr [at] canb>
>>>> wrote:
>>>>>
>>>>> Today's linux-next merge of the m68knommu tree got a conflict in
>>>>> arch/m68k/include/asm/ptrace.h between commit
>>>>> 63c361b65f6540043c4baabf1a044a45c7465858 ("m68k: use generic code for
>>>>> ptrace requests") from the m68k tree and commit
>>>>> 03a03164e8084b810e9f92906a51232d63bac72c ("m68knommu: define
>>>>> arch_has_single_step() and friends") from the m68knommu tree.
>>>>>
>>>>> These mostly add the same stuff but not quite :-(
>>>>
>>>> Ah sorry, my bad. I'm not yet used to the uClinux guys touching "my"
>>>> includes ;-)
>>>> So we need better coordination between us.
>>>>
>>>> IIRC, Greg's changes were inspired by Andreas' patch.
>>>
>>> Yes, largely they are.
>>>
>>>
>>>>> I have done a fixup (see below) and can carry it as necessary. Please
>>>>> check the result.
>>>>
>>>> At first sight, it looks OK. Thanks for fixing it up!
>>>
>>> Yep, looks ok from what I can see.
>>>
>>> Geert, how do you want to handle for the real linus merge?
>>> Do you want me to drop the changes to ptrace.h from that patch?
>>
>> I can apply your patch (modified to apply on top of Andreas') to the
>> m68k for-linus branch.
>> Does that sound OK for you?
>
> Yep, thats fine by me.

Done.

I also added the #ifdef CONFIG_MMU to Andreas' commit, so it will stay
bisectable on m68knommu.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert [at] linux-m68k

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

gerg at snapgear

Nov 8, 2011, 11:08 PM

Post #7 of 11 (43 views)
Permalink

Re: linux-next: manual merge of the m68knommu tree with the m68k tree [In reply to]

Hi Stephen,

On 11/09/2011 10:15 AM, Stephen Rothwell wrote:
> Today's linux-next merge of the m68knommu tree got a conflict in
> arch/m68k/Kconfig between commit d890d7399525 ("m68k/irq: Remove obsolete
> m68k irq framework") from the m68k tree and commit 4e8a9e70dfe8 ("m68k:
> selection of GENERIC_ATOMIC64 is not MMU specific") from the m68knommu
> tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

Thanks. Both this and the previous m68k merge conflict patch look good.

Geert: would you prefer I hold off on these 2 patches until after
you merge your IRQ changes?

Regards
Greg

------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg [at] snapgear
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close, FAX: +61 7 3891 3630
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

geert at linux-m68k

Nov 8, 2011, 11:13 PM

Post #8 of 11 (43 views)
Permalink

Re: linux-next: manual merge of the m68knommu tree with the m68k tree [In reply to]

Hi Greg,

On Wed, Nov 9, 2011 at 08:08, Greg Ungerer <gerg [at] snapgear> wrote:
> On 11/09/2011 10:15 AM, Stephen Rothwell wrote:
>> Today's linux-next merge of the m68knommu tree got a conflict in
>> arch/m68k/Kconfig between commit d890d7399525 ("m68k/irq: Remove obsolete
>> m68k irq framework") from the m68k tree and commit 4e8a9e70dfe8 ("m68k:
>> selection of GENERIC_ATOMIC64 is not MMU specific") from the m68knommu
>> tree.
>>
>> Just context changes. I fixed it up (see below) and can carry the fix as
>> necessary.
>
> Thanks. Both this and the previous m68k merge conflict patch look good.
>
> Geert: would you prefer I hold off on these 2 patches until after
> you merge your IRQ changes?

I'll ask Linus to pull them today or tomorrow. After that (and he has
pulled), you can
rebase your tree. Is that OK for you?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert [at] linux-m68k

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

gerg at snapgear

Nov 8, 2011, 11:37 PM

Post #9 of 11 (43 views)
Permalink

Re: linux-next: manual merge of the m68knommu tree with the m68k tree [In reply to]

Hi Geert,

On 11/09/2011 05:13 PM, Geert Uytterhoeven wrote:
> Hi Greg,
>
> On Wed, Nov 9, 2011 at 08:08, Greg Ungerer<gerg [at] snapgear> wrote:
>> On 11/09/2011 10:15 AM, Stephen Rothwell wrote:
>>> Today's linux-next merge of the m68knommu tree got a conflict in
>>> arch/m68k/Kconfig between commit d890d7399525 ("m68k/irq: Remove obsolete
>>> m68k irq framework") from the m68k tree and commit 4e8a9e70dfe8 ("m68k:
>>> selection of GENERIC_ATOMIC64 is not MMU specific") from the m68knommu
>>> tree.
>>>
>>> Just context changes. áI fixed it up (see below) and can carry the fix as
>>> necessary.
>>
>> Thanks. Both this and the previous m68k merge conflict patch look good.
>>
>> Geert: would you prefer I hold off on these 2 patches until after
>> you merge your IRQ changes?
>
> I'll ask Linus to pull them today or tomorrow. After that (and he has
> pulled), you can
> rebase your tree. Is that OK for you?

Yep, that is good. I wasn't sure if you where looking to push them
in rc1 or in the next merge window.

Thanks
Greg

------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg [at] snapgear
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close, FAX: +61 7 3891 3630
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

geert at linux-m68k

Nov 9, 2011, 12:19 AM

Post #10 of 11 (43 views)
Permalink

Re: linux-next: manual merge of the m68knommu tree with the m68k tree [In reply to]

Hi Greg,

On Wed, Nov 9, 2011 at 08:37, Greg Ungerer <gerg [at] snapgear> wrote:
> On 11/09/2011 05:13 PM, Geert Uytterhoeven wrote:
>> On Wed, Nov 9, 2011 at 08:08, Greg Ungerer<gerg [at] snapgear> wrote:
>>>
>>> On 11/09/2011 10:15 AM, Stephen Rothwell wrote:
>>>>
>>>> Today's linux-next merge of the m68knommu tree got a conflict in
>>>> arch/m68k/Kconfig between commit d890d7399525 ("m68k/irq: Remove
>>>> obsolete
>>>> m68k irq framework") from the m68k tree and commit 4e8a9e70dfe8 ("m68k:
>>>> selection of GENERIC_ATOMIC64 is not MMU specific") from the m68knommu
>>>> tree.
>>>>
>>>> Just context changes. Ã¡I fixed it up (see below) and can carry the fix
>>>> as
>>>> necessary.
>>>
>>> Thanks. Both this and the previous m68k merge conflict patch look good.
>>>
>>> Geert: would you prefer I hold off on these 2 patches until after
>>> you merge your IRQ changes?
>>
>> I'll ask Linus to pull them today or tomorrow. After that (and he has
>> pulled), you can
>> rebase your tree. Is that OK for you?
>
> Yep, that is good. I wasn't sure if you where looking to push them
> in rc1 or in the next merge window.

rc2. I didn't want to rebase them to a random point between 3.1 and rc1.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert [at] linux-m68k

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

gerg at snapgear

Nov 13, 2011, 4:29 PM

Post #11 of 11 (38 views)
Permalink

Re: linux-next: manual merge of the m68knommu tree with the m68k tree [In reply to]

Hi Stephen,

On 14/11/11 10:03, Stephen Rothwell wrote:
> Today's linux-next merge of the m68knommu tree got a conflict in
> arch/m68k/Kconfig.debug between commit 049755db2c3f ("m68k/mvme16x: Add
> support for EARLY_PRINTK") from the m68k tree and commit d0106cf0aa29
> ("m68k: support configure time command line for MMU m68k") from the
> m68knommu tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

Thanks for the heads up. Geert's irq changes have been pushed in now,
so I will rebase my patches and fix up the few bits of breakage you
have seen.

Thanks
Greg

--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg [at] snapgear
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Index | Next | Previous | View Threaded

Interested in having your list archived? Contact Gossamer Threads