From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kuninori Morimoto Date: Thu, 30 Jan 2014 07:08:00 +0000 Subject: Re: mmc: sh_mobile_sdhi: DT update for R-Car Message-Id: <87vbx2gd6a.wl%kuninori.morimoto.gx@gmail.com> List-Id: References: <87lhy090m0.wl%kuninori.morimoto.gx@gmail.com> <87y51yghc9.wl%kuninori.morimoto.gx@gmail.com> <20140130064350.GA1449@verge.net.au> In-Reply-To: <20140130064350.GA1449@verge.net.au> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Simon Horman Cc: Chris Ball , Magnus , Linux-SH , linux-mmc@vger.kernel.org Hi Simon, Chris > Previously I was somewhat ambivalent to this but experience has shown me > that taking shmobile patches through my tree is best. The reason is that it > reduces (eliminates?) merge conflicts. Conflicts that have to be resolved by > third parties, such as Linus. And we want to make the lives of those people > as easy as possible. > > So please make sure that the patches are split up such that there are > patches for the driver and patches for shmobile. Ideally post them in > separate series but if you prefer they can go in a single series. But > regardless please note that the driver patches are for the driver > maintainer to pick up and the shmobile patches are for me. Thank you ! OK, I will do my best I would like to get Chris's review before sending v2 patch if possible. Best regards --- Kuninori Morimoto