Re: linux-next: manual merge of the mmc-uh tree with the sunxi tree

2015-01-21 Thread Ulf Hansson
On 21 January 2015 at 13:12, Maxime Ripard wrote: > Hi, > > On Wed, Jan 21, 2015 at 12:27:09PM +0100, Ulf Hansson wrote: >> On 20 January 2015 at 04:17, Stephen Rothwell wrote: >> > Hi Ulf, >> > >> > Today's linux-next merge of the mmc-uh tree got a conflict in >> > drivers/mmc/host/sunxi-mmc.c

Re: linux-next: manual merge of the mmc-uh tree with the sunxi tree

2015-01-21 Thread Maxime Ripard
Hi, On Wed, Jan 21, 2015 at 12:27:09PM +0100, Ulf Hansson wrote: > On 20 January 2015 at 04:17, Stephen Rothwell 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

Re: linux-next: manual merge of the mmc-uh tree with the sunxi tree

2015-01-21 Thread Geert Uytterhoeven
On Wed, Jan 21, 2015 at 12:27 PM, Ulf Hansson wrote: > I can't find the sunxi tree, is it listed in MAINTAINERS? git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next from https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/Next/Trees#n51

Re: linux-next: manual merge of the mmc-uh tree with the sunxi tree

2015-01-21 Thread Ulf Hansson
On 20 January 2015 at 04:17, Stephen Rothwell 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

Re: linux-next: manual merge of the mmc-uh tree with the sunxi tree

2015-01-21 Thread Ulf Hansson
On 20 January 2015 at 04:17, Stephen Rothwell s...@canb.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

Re: linux-next: manual merge of the mmc-uh tree with the sunxi tree

2015-01-21 Thread Geert Uytterhoeven
On Wed, Jan 21, 2015 at 12:27 PM, Ulf Hansson ulf.hans...@linaro.org wrote: I can't find the sunxi tree, is it listed in MAINTAINERS? git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next from

Re: linux-next: manual merge of the mmc-uh tree with the sunxi tree

2015-01-21 Thread Maxime Ripard
Hi, On Wed, Jan 21, 2015 at 12:27:09PM +0100, Ulf Hansson wrote: On 20 January 2015 at 04:17, Stephen Rothwell s...@canb.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:

Re: linux-next: manual merge of the mmc-uh tree with the sunxi tree

2015-01-21 Thread Ulf Hansson
On 21 January 2015 at 13:12, Maxime Ripard maxime.rip...@free-electrons.com wrote: Hi, On Wed, Jan 21, 2015 at 12:27:09PM +0100, Ulf Hansson wrote: On 20 January 2015 at 04:17, Stephen Rothwell s...@canb.auug.org.au wrote: Hi Ulf, Today's linux-next merge of the mmc-uh tree got a

linux-next: manual merge of the mmc-uh tree with the sunxi tree

2015-01-19 Thread Stephen Rothwell
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.

linux-next: manual merge of the mmc-uh tree with the sunxi tree

2015-01-19 Thread Stephen Rothwell
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