linux-kernel - Re: linux-next: manual merge of the arm-soc tree with the net-next 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] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 18 Jun 2013 10:33:27 +0200
From:	Bastian Hecht <hechtb@...il.com>
To:	Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>, linux-next@...r.kernel.org,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
	Simon Horman <horms+renesas@...ge.net.au>
Subject: Re: linux-next: manual merge of the arm-soc tree with the net-next tree

Hello Sergei, hello Stephen,

Sergei is completely right I think. He was sceptic about the commit in
a mail some days ago already. Unfortunately I recently haven't had
access to my development environment to check what's up with this
patch. I'm sorry that it ended up to you both to deal with it. I have
written some simple bindings for the sh-eth and wanted to use it for
our DT reference version for the Armadillo board but discarded it as I
saw Nobuhiro Iwamatsu, the author of the sh-eth driver, cooked up some
more mature version. I don't see them in the next branch of Simon, so
until they appear there we can delete commit 9e0b428f079d ("ARM:
shmobile: r8a7740: Add interim sh-eth device name to clocks list")
that is only needed for sh-eth DT usage.

Thanks,

 Bastian


2013/6/17 Sergei Shtylyov <sergei.shtylyov@...entembedded.com>:
> Hello.
>
>
> On 17-06-2013 10:39, Stephen Rothwell wrote:
>
>> Today's linux-next merge of the arm-soc tree got a conflict in
>> arch/arm/mach-shmobile/clock-r8a7740.c between commit e5c9b4cd6651
>> ("sh_eth: get R8A7740 support out of #ifdef") from the net-next tree and
>> commit 9e0b428f079d ("ARM: shmobile: r8a7740: Add interim sh-eth device
>> name to clocks list") from the arm-soc tree.
>
>
>    To me that latter commit looked utterly pointless, as there's no device
> tree support for the 'sh-eth' driver yet (and at this stage it isn't even
> going to happen due to procedural platform data). I'm instead going to use
> OF_DEV_AUXDATA() in the platform code which again would render that commit
> pointless.
>
>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
>
>    Thanks.
>
> WBR, Sergei
>
--
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/