linux-kernel - Re: linux-next: manual merge of the tty tree with the devicetree tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20130813061406.GB9854@kroah.com>
Date:	Mon, 12 Aug 2013 23:14:06 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
	Grant Likely <grant.likely@...retlab.ca>,
	Sascha Hauer <s.hauer@...gutronix.de>
Subject: Re: linux-next: manual merge of the tty tree with the devicetree tree

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/