linux-kernel - Re: linux-next: manual merge of the mmc tree with Linus' 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:	Fri, 9 May 2014 09:41:39 +0200
From:	Ulf Hansson <ulf.hansson@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Lee Jones <lee.jones@...aro.org>, Chris Ball <chris@...ntf.net>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Micky Ching <micky_ching@...lsil.com.cn>,
	linux-mmc <linux-mmc@...r.kernel.org>
Subject: Re: linux-next: manual merge of the mmc tree with Linus' tree

On 9 May 2014 09:14, Lee Jones <lee.jones@...aro.org> wrote:
>> Today's linux-next merge of the mmc tree got a conflict in
>> drivers/mmc/host/rtsx_pci_sdmmc.c between commit 98fcc5762dce ("mmc:
>> rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"") from
>> the  tree and commit 1f7b581b3ffc ("mmc: rtsx: modify error handle and
>> remove smatch warnings") from the mmc tree.
>>
>> I fixed it up (maybe - see below and in the final tree) and can carry
>> the fix as necessary (no action is required).
>
> FYI: From what Ulf (co-maintainer of MMC) says, this was expected and
> will continue to happen until a pending revert is merged.
>

Hi Stehpen,

Within this context; while Chris is being busy, I would be able to
help out better as co-maintainer - if we would add my published mmc
git tree, into your linux-next merge. Could you do that?

My intent at this point, is to get patches tested in linux-next, but
still get them merged via Chris' mmc tree. Does that make sense?

Here is my git tree:
git://git.linaro.org/people/ulf.hansson/mmc.git

I have added a next branch, currently it points to the commit for
"Linux 3.15-rc4", so it holds no patches yet.

Kind regards
Ulf Hansson
--
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/