From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Grant Likely <grant.likely@secretlab.ca>,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: Re: linux-next: manual merge of the tty tree with the devicetree tree
Date: Mon, 12 Aug 2013 23:14:06 -0700 [thread overview]
Message-ID: <20130813061406.GB9854@kroah.com> (raw)
In-Reply-To: <20130813154106.f89661732443289013035481@canb.auug.org.au>
On Tue, Aug 13, 2013 at 03:41:06PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in include/linux/of.h between commit 2adfffa22350 ("OF: make of_property_for_each_{u32|string}() use parameters if OF is not enabled") from the devicetree tree and commit 5c19e95216b9 ("OF: Add helper for matching against linux,stdout-path") from the tty tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
> Out of interest, why does of_device_is_stdout_path() not return bool?
Good question, Sascha, any ideas?
greg k-h
next prev parent reply other threads:[~2013-08-13 6:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-13 5:41 linux-next: manual merge of the tty tree with the devicetree tree Stephen Rothwell
2013-08-13 6:14 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-11-28 6:17 Stephen Rothwell
2020-06-02 5:48 Stephen Rothwell
2020-06-08 16:46 ` Greg KH
2025-04-17 4:46 Stephen Rothwell
2025-04-17 5:33 ` Greg KH
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=20130813061406.GB9854@kroah.com \
--to=greg@kroah.com \
--cc=bigeasy@linutronix.de \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--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