Re: [uClinux-dev] [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards
On Tue, Jun 26, 2012 at 7:16 AM, Greg Ungerer g...@snapgear.com wrote:
On 06/25/2012 05:59 PM, Geert Uytterhoeven wrote:
On Mon, Jun 25, 2012 at 3:29 AM,g...@snapgear.com wrote:
arch/m68k/include/asm/mcfne.h | 129 +-
mcf8390.h?
mcfne.h is queued for removal.
I was trying to save it :-)
Do you think I should just silently move the modified mcfne.h
to a mcf8390.h?
Sure. Why not?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
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
___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
Re: [uClinux-dev] [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards
On 06/26/2012 05:47 PM, Geert Uytterhoeven wrote: On Tue, Jun 26, 2012 at 7:16 AM, Greg Ungererg...@snapgear.com wrote: On 06/25/2012 05:59 PM, Geert Uytterhoeven wrote: On Mon, Jun 25, 2012 at 3:29 AM,g...@snapgear.comwrote: arch/m68k/include/asm/mcfne.h | 129 +- mcf8390.h? mcfne.h is queued for removal. I was trying to save it :-) Do you think I should just silently move the modified mcfne.h to a mcf8390.h? Sure. Why not? We lose any git history linking the original and new file. Regards Greg Greg Ungerer -- Principal EngineerEMAIL: g...@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close,FAX: +61 7 3891 3630 Milton, QLD, 4064, AustraliaWEB: http://www.SnapGear.com ___ uClinux-dev mailing list uClinux-dev@uclinux.org http://mailman.uclinux.org/mailman/listinfo/uclinux-dev This message was resent by uclinux-dev@uclinux.org To unsubscribe see: http://mailman.uclinux.org/mailman/options/uclinux-dev
Re: [uClinux-dev] [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards
On Tue, Jun 26, 2012 at 11:57 AM, Greg Ungerer g...@snapgear.com wrote:
On 06/26/2012 05:47 PM, Geert Uytterhoeven wrote:
On Tue, Jun 26, 2012 at 7:16 AM, Greg Ungererg...@snapgear.com wrote:
On 06/25/2012 05:59 PM, Geert Uytterhoeven wrote:
On Mon, Jun 25, 2012 at 3:29 AM,g...@snapgear.com wrote:
arch/m68k/include/asm/mcfne.h | 129 +-
mcf8390.h?
mcfne.h is queued for removal.
I was trying to save it :-)
Do you think I should just silently move the modified mcfne.h
to a mcf8390.h?
Sure. Why not?
We lose any git history linking the original and new file.
Your commit renaming-and-modifying it will provide the link?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
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
___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
Re: [uClinux-dev] [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards
On 06/26/2012 08:03 PM, Geert Uytterhoeven wrote: On Tue, Jun 26, 2012 at 11:57 AM, Greg Ungererg...@snapgear.com wrote: On 06/26/2012 05:47 PM, Geert Uytterhoeven wrote: On Tue, Jun 26, 2012 at 7:16 AM, Greg Ungererg...@snapgear.comwrote: On 06/25/2012 05:59 PM, Geert Uytterhoeven wrote: On Mon, Jun 25, 2012 at 3:29 AM,g...@snapgear.com wrote: arch/m68k/include/asm/mcfne.h | 129 +- mcf8390.h? mcfne.h is queued for removal. I was trying to save it :-) Do you think I should just silently move the modified mcfne.h to a mcf8390.h? Sure. Why not? We lose any git history linking the original and new file. Your commit renaming-and-modifying it will provide the link? I would normally do that with a git mv. But isn't that going to clash with your git rm? Or am I mis-understanding what you mean? Regards Greg -- Greg Ungerer -- Principal EngineerEMAIL: g...@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close,FAX: +61 7 3891 3630 Milton, QLD, 4064, AustraliaWEB: http://www.SnapGear.com ___ uClinux-dev mailing list uClinux-dev@uclinux.org http://mailman.uclinux.org/mailman/listinfo/uclinux-dev This message was resent by uclinux-dev@uclinux.org To unsubscribe see: http://mailman.uclinux.org/mailman/options/uclinux-dev
Re: [uClinux-dev] [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards
Hi Greg,
On Tue, Jun 26, 2012 at 12:14 PM, Greg Ungerer g...@snapgear.com wrote:
On 06/26/2012 08:03 PM, Geert Uytterhoeven wrote:
On Tue, Jun 26, 2012 at 11:57 AM, Greg Ungererg...@snapgear.com wrote:
On 06/26/2012 05:47 PM, Geert Uytterhoeven wrote:
On Tue, Jun 26, 2012 at 7:16 AM, Greg Ungererg...@snapgear.com
wrote:
On 06/25/2012 05:59 PM, Geert Uytterhoeven wrote:
On Mon, Jun 25, 2012 at 3:29 AM,g...@snapgear.com wrote:
arch/m68k/include/asm/mcfne.h | 129 +-
mcf8390.h?
mcfne.h is queued for removal.
I was trying to save it :-)
Do you think I should just silently move the modified mcfne.h
to a mcf8390.h?
Sure. Why not?
We lose any git history linking the original and new file.
Your commit renaming-and-modifying it will provide the link?
I would normally do that with a git mv. But isn't that going to
clash with your git rm? Or am I mis-understanding what you mean?
It may indeed give a merge conflict.
If the conflict is too complicated (we'll see in -next), I can remove its
scheduled deletion.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
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
___
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
Re: [uClinux-dev] [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards
Hi Geert, On 06/26/2012 09:03 PM, Geert Uytterhoeven wrote: On Tue, Jun 26, 2012 at 12:14 PM, Greg Ungererg...@snapgear.com wrote: On 06/26/2012 08:03 PM, Geert Uytterhoeven wrote: On Tue, Jun 26, 2012 at 11:57 AM, Greg Ungererg...@snapgear.com wrote: On 06/26/2012 05:47 PM, Geert Uytterhoeven wrote: On Tue, Jun 26, 2012 at 7:16 AM, Greg Ungererg...@snapgear.com wrote: On 06/25/2012 05:59 PM, Geert Uytterhoeven wrote: On Mon, Jun 25, 2012 at 3:29 AM,g...@snapgear.com wrote: arch/m68k/include/asm/mcfne.h 129 +- mcf8390.h? mcfne.h is queued for removal. I was trying to save it :-) Do you think I should just silently move the modified mcfne.h to a mcf8390.h? Sure. Why not? We lose any git history linking the original and new file. Your commit renaming-and-modifying it will provide the link? I would normally do that with a git mv. But isn't that going to clash with your git rm? Or am I mis-understanding what you mean? It may indeed give a merge conflict. If the conflict is too complicated (we'll see in -next), I can remove its scheduled deletion. My concern here is that I expect that patch will go through DaveM's netdev tree. And he may get a little annoyed when a merge conflict arises in Linux next. Given that at this point we have the chance to resolve it. I will just create a new mcf8390.h if you want to keep the removal that is already staged. Keep everyone happy :-) Regards Greg Greg Ungerer -- Principal EngineerEMAIL: g...@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close,FAX: +61 7 3891 3630 Milton, QLD, 4064, AustraliaWEB: http://www.SnapGear.com ___ uClinux-dev mailing list uClinux-dev@uclinux.org http://mailman.uclinux.org/mailman/listinfo/uclinux-dev This message was resent by uclinux-dev@uclinux.org To unsubscribe see: http://mailman.uclinux.org/mailman/options/uclinux-dev
