linux-kernel - Re: linux-next: manual merge of the mmc-uh tree with the sunxi 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:	Wed, 21 Jan 2015 12:27:09 +0100
From:	Ulf Hansson <ulf.hansson@...aro.org>
To:	Maxime Ripard <maxime.ripard@...e-electrons.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	David Lanzendörfer <david.lanzendoerfer@....ch>
Subject: Re: linux-next: manual merge of the mmc-uh tree with the sunxi tree

On 20 January 2015 at 04:17, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Ulf,
>
> Today's linux-next merge of the mmc-uh tree got a conflict in
> drivers/mmc/host/sunxi-mmc.c between commit 6c09bb851e57 ("mmc: sunxi:
> Convert MMC driver to the standard clock phase API") from the sunxi
> tree and commit 776e24c502da ("mmc: sunxi: Removing unused code") from
> the mmc-uh tree.
>
> I fixed it up (the former includes the latter change) and can carry the
> fix as necessary (no action is required).

Maxime,

I can't find the sunxi tree, is it listed in MAINTAINERS?

I know I have acked below patch, but that was quite a I while ago. Is
there any reason to why I can't take it through my mmc tree at this
point?
"mmc: sunxi: Convert MMC driver to the standard clock phase API".

Kind regards
Uffe

>
> --
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
--
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/