From: Grant Likely <grant.likely@secretlab.ca>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Finn Thain <fthain@telegraphics.com.au>,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: Re: linux-next: manual merge of the devicetree tree with the m68k tree
Date: Wed, 10 Feb 2010 13:17:49 -0700 [thread overview]
Message-ID: <fa686aa41002101217x135452cfud3ff750899be852d@mail.gmail.com> (raw)
In-Reply-To: <20100210160234.673f32d1.sfr@canb.auug.org.au>
On Tue, Feb 9, 2010 at 10:02 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Grant,
>
> Today's linux-next merge of the devicetree tree got a conflict in
> drivers/serial/pmac_zilog.c between commit
> f0ccf0f0269dfe53ec3f1c58fe130a47b908b907 ("pmac-zilog: cleanup") from
> the m68k tree and commit71a157e8edca55198e808f8561dd49017a54ee34 ("of: add
> 'of_' prefix to machine_is_compatible()") from the devicetree tree.
>
> The first removes a space ... I fixed it up (see below) and can carry the
> fix as necessary. (Grant, you could get rid of this by removing the
> space between the tabs on the line "baud = 57600;". Not a big issue,
> though.)
Removing the space didn't help. git still complains about a conflict
on merge if I remove the space. Probably because both branches show a
diff on the same area against the common base.
What should be done here? Should I merge Geert's 68k tree into my
next-devicetree branch? Or is there a better way to prepare for the
merge window?
> Also, there is a further patch in the m68k tree
> (89d58f83cfce675a2054975cc2598ba1979816c7 "pmac-zilog: add platform
> driver") that adds a define for machine_is_compatible. I fixed that as
> below as well. Hmmm, this file should really include linux/of_fdt.h for
> the definition of of_machine_is_compatible(), shouldn't it? And then
> maybe we could have a non OF version of the prototype/define in
> of_fdt.h? Just an idea.
That sounds reasonable.
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
prev parent reply other threads:[~2010-02-10 20:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-10 5:02 linux-next: manual merge of the devicetree tree with the m68k tree Stephen Rothwell
2010-02-10 20:17 ` Grant Likely [this message]
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=fa686aa41002101217x135452cfud3ff750899be852d@mail.gmail.com \
--to=grant.likely@secretlab.ca \
--cc=fthain@telegraphics.com.au \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).