All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg Ungerer <gerg@snapgear.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Geert Uytterhoeven <geert@linux-m68k.org>
Subject: Re: linux-next: manual merge of the m68knommu tree with the m68k tree
Date: Wed, 9 Nov 2011 17:08:09 +1000	[thread overview]
Message-ID: <4EBA26D9.3050108@snapgear.com> (raw)
In-Reply-To: <20111109111519.7d8969103ab32e7e8193c018@canb.auug.org.au>

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@snapgear.com
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

WARNING: multiple messages have this Message-ID (diff)
From: Greg Ungerer <gerg@snapgear.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	Geert Uytterhoeven <geert@linux-m68k.org>
Subject: Re: linux-next: manual merge of the m68knommu tree with the m68k tree
Date: Wed, 9 Nov 2011 17:08:09 +1000	[thread overview]
Message-ID: <4EBA26D9.3050108@snapgear.com> (raw)
In-Reply-To: <20111109111519.7d8969103ab32e7e8193c018@canb.auug.org.au>

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@snapgear.com
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

  reply	other threads:[~2011-11-09  7:08 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-09  0:15 linux-next: manual merge of the m68knommu tree with the m68k tree Stephen Rothwell
2011-11-09  7:08 ` Greg Ungerer [this message]
2011-11-09  7:08   ` Greg Ungerer
2011-11-09  7:13   ` Geert Uytterhoeven
2011-11-09  7:37     ` Greg Ungerer
2011-11-09  7:37       ` Greg Ungerer
2011-11-09  8:19       ` Geert Uytterhoeven
  -- strict thread matches above, loose matches on Subject: below --
2022-05-09 23:44 Stephen Rothwell
2022-05-10  3:37 ` Michael Schmitz
2022-05-10  4:15   ` Greg Ungerer
2020-09-09 23:34 Stephen Rothwell
2020-10-13  7:24 ` Stephen Rothwell
2019-07-01 23:09 Stephen Rothwell
2019-07-09  0:25 ` Stephen Rothwell
2011-11-14  0:03 Stephen Rothwell
2011-11-14  0:29 ` Greg Ungerer
2011-11-14  0:29   ` Greg Ungerer
2011-11-09  0:15 Stephen Rothwell
2011-06-22  1:12 Stephen Rothwell
2011-06-22  6:34 ` Greg Ungerer
2011-06-22  6:34   ` Greg Ungerer
2011-06-22  8:29   ` Geert Uytterhoeven
2011-06-23  6:12     ` Greg Ungerer
2011-06-23  6:12       ` Greg Ungerer
2010-09-14  0:51 Stephen Rothwell
2010-09-14  1:21 ` Greg Ungerer
2010-09-14  8:47   ` Geert Uytterhoeven
2009-11-26  0:58 Stephen Rothwell
2009-11-26 21:29 ` Geert Uytterhoeven
2009-11-27  4:43   ` Greg Ungerer
2009-11-27  8:43     ` Geert Uytterhoeven
2009-11-27 11:23       ` Greg Ungerer
2009-11-27 21:21         ` Geert Uytterhoeven

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4EBA26D9.3050108@snapgear.com \
    --to=gerg@snapgear.com \
    --cc=geert@linux-m68k.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.