Hi all,
Today's linux-next merge of the clk tree got a conflict in:
drivers/clk/bcm/Kconfig
between commit:
ec8f24b7faaf ("treewide: Add SPDX license identifier - Makefile/Kconfig")
from Linus' tree and commit:
5d59f12a19e6 ("clk: bcm: Make BCM2835 clock drivers selectable")
from the
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
MAINTAINERS
between commit:
82abbea734d6 ("MAINTAINERS: fix alphabetical ordering")
from Linus' tree and commit:
6d7489c74a6e ("clk: axs10x: introduce AXS10X pll driver")
from the clk tree.
I fixed it up (see below)
Hi all,
Today's linux-next merge of the clk tree got a conflict in:
MAINTAINERS
between commit:
82abbea734d6 ("MAINTAINERS: fix alphabetical ordering")
from Linus' tree and commit:
6d7489c74a6e ("clk: axs10x: introduce AXS10X pll driver")
from the clk tree.
I fixed it up (see below)
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/powerpc/configs/corenet32_smp_defconfig between commit
a85cade6762b ("powerpc: Update all configs using savedefconfig") from
the tree and commit 8f0ab1e14139 ("powerpc/corenet: Enable CLK_QORIQ")
from the clk tree.
I fixed
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
arch/powerpc/configs/corenet32_smp_defconfig between commit
a85cade6762b (powerpc: Update all configs using savedefconfig) from
the tree and commit 8f0ab1e14139 (powerpc/corenet: Enable CLK_QORIQ)
from the clk tree.
I fixed it
On 29/01/2014 04:25, Stephen Rothwell :
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
> base support") from Linus' tree and commit fd3fdaf09f26 ("clk: sort
> Makefile") from the clk tree.
>
> I
On 29/01/2014 04:25, Stephen Rothwell :
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/Makefile between commit 0ad6125b1579 (clk: at91: add PMC
base support) from Linus' tree and commit fd3fdaf09f26 (clk: sort
Makefile) from the clk tree.
I fixed it up
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/Makefile between commit 0ad6125b1579 ("clk: at91: add PMC
base support") from Linus' tree and commit fd3fdaf09f26 ("clk: sort
Makefile") from the clk tree.
I fixed it up (see below) and can carry the fix as necessary
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/Makefile between commit 0ad6125b1579 (clk: at91: add PMC
base support) from Linus' tree and commit fd3fdaf09f26 (clk: sort
Makefile) from the clk tree.
I fixed it up (see below) and can carry the fix as necessary (no
On Wed, Aug 28, 2013 at 05:22:25PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Wed, 28 Aug 2013 10:04:31 +1000 Stephen Rothwell
> wrote:
> >
> > On Tue, 27 Aug 2013 09:53:19 -0700 Mike Turquette
> > wrote:
> > >
> > > Quoting Sören Brinkmann (2013-08-27 08:44:11)
> > > > On Tue, Aug 27,
Hi Stephen
On 28/08/13 08:22, Stephen Rothwell wrote:
> On Wed, 28 Aug 2013 10:04:31 +1000 Stephen Rothwell
> wrote:
>> >
>> > On Tue, 27 Aug 2013 09:53:19 -0700 Mike Turquette
>> > wrote:
>>> > >
>>> > > Quoting Sören Brinkmann (2013-08-27 08:44:11)
> > > On Tue, Aug 27, 2013 at
Hi all,
On Wed, 28 Aug 2013 10:04:31 +1000 Stephen Rothwell
wrote:
>
> On Tue, 27 Aug 2013 09:53:19 -0700 Mike Turquette
> wrote:
> >
> > Quoting Sören Brinkmann (2013-08-27 08:44:11)
> > > On Tue, Aug 27, 2013 at 11:09:52AM +0100, James Hogan wrote:
> > > > On 27/08/13 10:03, Stephen
Hi all,
On Wed, 28 Aug 2013 10:04:31 +1000 Stephen Rothwell s...@canb.auug.org.au
wrote:
On Tue, 27 Aug 2013 09:53:19 -0700 Mike Turquette mturque...@linaro.org
wrote:
Quoting Sören Brinkmann (2013-08-27 08:44:11)
On Tue, Aug 27, 2013 at 11:09:52AM +0100, James Hogan wrote:
On
Hi Stephen
On 28/08/13 08:22, Stephen Rothwell wrote:
On Wed, 28 Aug 2013 10:04:31 +1000 Stephen Rothwell s...@canb.auug.org.au
wrote:
On Tue, 27 Aug 2013 09:53:19 -0700 Mike Turquette mturque...@linaro.org
wrote:
Quoting Sören Brinkmann (2013-08-27 08:44:11)
On Tue, Aug 27,
On Wed, Aug 28, 2013 at 05:22:25PM +1000, Stephen Rothwell wrote:
Hi all,
On Wed, 28 Aug 2013 10:04:31 +1000 Stephen Rothwell s...@canb.auug.org.au
wrote:
On Tue, 27 Aug 2013 09:53:19 -0700 Mike Turquette mturque...@linaro.org
wrote:
Quoting Sören Brinkmann (2013-08-27 08:44:11)
Hi all,
On Tue, 27 Aug 2013 09:53:19 -0700 Mike Turquette wrote:
>
> Quoting Sören Brinkmann (2013-08-27 08:44:11)
> > On Tue, Aug 27, 2013 at 11:09:52AM +0100, James Hogan wrote:
> > > On 27/08/13 10:03, Stephen Rothwell wrote:
> > > > Hi Mike,
> > > >
> > > > Today's linux-next merge of the
Quoting Sören Brinkmann (2013-08-27 08:44:11)
> On Tue, Aug 27, 2013 at 11:09:52AM +0100, James Hogan wrote:
> > On 27/08/13 10:03, Stephen Rothwell wrote:
> > > Hi Mike,
> > >
> > > Today's linux-next merge of the clk tree got a conflict in
> > > drivers/clk/zynq/clkc.c between commits
On Tue, Aug 27, 2013 at 11:09:52AM +0100, James Hogan wrote:
> On 27/08/13 10:03, Stephen Rothwell wrote:
> > Hi Mike,
> >
> > Today's linux-next merge of the clk tree got a conflict in
> > drivers/clk/zynq/clkc.c between commits 252957cc3a2d ("clk/zynq/clkc: Add
> > dedicated spinlock for the
On 27/08/13 10:03, Stephen Rothwell wrote:
> Hi Mike,
>
> Today's linux-next merge of the clk tree got a conflict in
> drivers/clk/zynq/clkc.c between commits 252957cc3a2d ("clk/zynq/clkc: Add
> dedicated spinlock for the SWDT") and 765b7d4c4cb3
> ("clk/zynq/clkc: Add CLK_SET_RATE_PARENT flag to
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/zynq/clkc.c between commits 252957cc3a2d ("clk/zynq/clkc: Add
dedicated spinlock for the SWDT") and 765b7d4c4cb3
("clk/zynq/clkc: Add CLK_SET_RATE_PARENT flag to ethernet muxes") from
Linus' tree and commit
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/zynq/clkc.c between commits 252957cc3a2d (clk/zynq/clkc: Add
dedicated spinlock for the SWDT) and 765b7d4c4cb3
(clk/zynq/clkc: Add CLK_SET_RATE_PARENT flag to ethernet muxes) from
Linus' tree and commit 819c1de344c5
On 27/08/13 10:03, Stephen Rothwell wrote:
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/zynq/clkc.c between commits 252957cc3a2d (clk/zynq/clkc: Add
dedicated spinlock for the SWDT) and 765b7d4c4cb3
(clk/zynq/clkc: Add CLK_SET_RATE_PARENT flag to ethernet
On Tue, Aug 27, 2013 at 11:09:52AM +0100, James Hogan wrote:
On 27/08/13 10:03, Stephen Rothwell wrote:
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/zynq/clkc.c between commits 252957cc3a2d (clk/zynq/clkc: Add
dedicated spinlock for the SWDT) and
Quoting Sören Brinkmann (2013-08-27 08:44:11)
On Tue, Aug 27, 2013 at 11:09:52AM +0100, James Hogan wrote:
On 27/08/13 10:03, Stephen Rothwell wrote:
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/clk/zynq/clkc.c between commits 252957cc3a2d
Hi all,
On Tue, 27 Aug 2013 09:53:19 -0700 Mike Turquette mturque...@linaro.org wrote:
Quoting Sören Brinkmann (2013-08-27 08:44:11)
On Tue, Aug 27, 2013 at 11:09:52AM +0100, James Hogan wrote:
On 27/08/13 10:03, Stephen Rothwell wrote:
Hi Mike,
Today's linux-next merge of the
25 matches
Mail list logo
