linux-kernel - Re: linux-next: manual merge of the trivial tree with the ux500-core 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 for Android: free password hash cracker in your pocket

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

Date:	Fri, 29 Apr 2011 09:25:13 +0200
From:	Linus Walleij <linus.walleij@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Joe Perches <joe@...ches.com>
Subject: Re: linux-next: manual merge of the trivial tree with the ux500-core tree

2011/4/29 Stephen Rothwell <sfr@...b.auug.org.au>:

> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/mach-u300/gpio.c between commit 4a5a6e2804a3 ("mach-u300:
> rewrite gpio driver, move to drivers/gpio") from the ux500-core tree and
> commit b0c3af5ef0d7 ("arm: mach-u300/gpio: Fix mem_region resource size
> miscalculations") from the trivial tree.
>
> The former removed the file updated by the latter.  These updates should
> be applied to drivers/gpio/u300-gpio.c, now.  Joe, maybe you could update
> your patch and send it to Linus Walleij.

I rewrote the driver completely so likely it will rather be dropped, but
please check! I'll be happy to carry any patches.

Yours,
Linus Walleij
--
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/