linux-kernel - Re: [PATCH v7 0/3] Add modules to support realtek PCIE card reader

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]

Message-ID: <87mwyqrdrb.fsf@octavius.laptop.org>
Date:	Fri, 09 Nov 2012 10:34:48 -0500
From:	Chris Ball <cjb@...top.org>
To:	wwang <wei_wang@...lsil.com.cn>
Cc:	"sameo\@linux.intel.com" <sameo@...ux.intel.com>,
	"devel\@linuxdriverproject.org" <devel@...uxdriverproject.org>,
	"linux-kernel\@vger.kernel.org" <linux-kernel@...r.kernel.org>,
	"linux-mmc\@vger.kernel.org" <linux-mmc@...r.kernel.org>,
	"gregkh\@linuxfoundation.org" <gregkh@...uxfoundation.org>,
	"arnd\@arndb.de" <arnd@...db.de>,
	"oakad\@yahoo.com" <oakad@...oo.com>,
	"bp\@alien8.de" <bp@...en8.de>
Subject: Re: [PATCH v7 0/3] Add modules to support realtek PCIE card reader

Hi,

On Fri, Nov 09 2012, wwang wrote:
> I have noticed that the file rtsx_pci_sdmmc.c in your mmc-next branch
> is still v6 patch.  In v7 patch, this MMC part has also been modified
> to comply with my MFD portion.  So please update to this version.
>
> And one more question. Samuel have merged all of my patch set in his
> for-next branch, including the MMC part.  I don't know whether this
> will conflict with your tree in the next merge.
>
> Hi Samuel:
>
> Since the whole patch set has been merged in your for-next branch,
> does it mean that you will help to merge all of the three parts to
> linus's tree?

I've removed the patch from my tree to avoid conflicting with Samuel.
I'm happy to either have the MMC patch go through the MFD tree with:

Acked-by: Chris Ball <cjb@...top.org>

or to merge the MMC side of v7 myself, whichever Samuel prefers.

Thanks,

- Chris.
-- 
Chris Ball   <cjb@...top.org>   <http://printf.net/>
One Laptop Per Child
--
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/