From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the sparc tree
Date: Wed, 03 Sep 2008 18:17:56 -0700 (PDT) [thread overview]
Message-ID: <20080903.181756.61496204.davem@davemloft.net> (raw)
In-Reply-To: <20080904111717.8aec7545.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 4 Sep 2008 11:17:17 +1000
> Today's linux-next merge of the sparc tree got a conflict in
> arch/sparc/kernel/of_device.c between commit
> e3c71a32915fabb095de7108c22672e457631a08 ("sparc: Fix resource flags for
> PCI children in OF device tree") from Linus' tree and commit
> 5280267c1dddb8d413595b87dc406624bb497946 ("sparc: Fix handling of LANCE
> and ESP parent nodes in of_device.c") from the sparc tree.
>
> The former just changed the context of the latter. I fixed it up (see
> below).
Looks good, thanks.
I'll pull sparc-2.6 into sparc-next-2.6 at some point to resolve
this.
next prev parent reply other threads:[~2008-09-04 1:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-04 1:17 linux-next: manual merge of the sparc tree Stephen Rothwell
2008-09-04 1:17 ` David Miller [this message]
2008-09-04 4:14 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-09-16 20:27 Stephen Rothwell
2008-09-16 21:31 ` David Miller
2008-09-16 21:40 ` Stephen Rothwell
2008-07-16 7:39 Stephen Rothwell
2008-07-18 6:07 ` David Miller
2008-07-16 7:31 Stephen Rothwell
2008-07-16 7:19 Stephen Rothwell
2008-07-16 7:23 ` Stephen Rothwell
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=20080903.181756.61496204.davem@davemloft.net \
--to=davem@davemloft.net \
--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.