Hi all,
On Mon, 26 May 2014 10:17:41 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/Kconfig.debug between commit 7098cff2a3f4 ("ARM: debug: qcom:
> make UART address selection configuration option") from the arm-soc
> tree and commit
Hi all,
On Mon, 26 May 2014 10:17:41 +1000 Stephen Rothwell s...@canb.auug.org.au
wrote:
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/Kconfig.debug between commit 7098cff2a3f4 (ARM: debug: qcom:
make UART address selection configuration option) from the arm-soc
Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi,
> Today's linux-next merge of the samsung tree got a conflict in
> drivers/irqchip/irq-s3c24xx.c between commit de88cbb7b244 ("arm: Move
> chained_irq_(enter|exit) to a generic file") from the arm-soc tree (where
> it is called
Stephen Rothwell wrote:
Hi Kukjin,
Hi,
Today's linux-next merge of the samsung tree got a conflict in
drivers/irqchip/irq-s3c24xx.c between commit de88cbb7b244 (arm: Move
chained_irq_(enter|exit) to a generic file) from the arm-soc tree (where
it is called arch/arm/mach-s3c24xx/irq.c)
On Thu, 31 Jan 2013 01:48:01 +1100, Stephen Rothwell
wrote:
> Hi Kukjin,
>
> Today's linux-next merge of the samsung tree got a conflict in
> drivers/gpio/gpio-samsung.c between commits f69254328793 ("ARM: dts: Fix
> compatible value of pinctrl module on EXYNOS5440") and b533c8685b16
> ("ARM:
On Thu, 31 Jan 2013 01:48:01 +1100, Stephen Rothwell s...@canb.auug.org.au
wrote:
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
drivers/gpio/gpio-samsung.c between commits f69254328793 (ARM: dts: Fix
compatible value of pinctrl module on EXYNOS5440) and
Hi Kukjin,
On Wed, 16 Jan 2013 21:13:00 -0800 Kukjin Kim wrote:
>
> One more, following is my preferred resolution when merge conflict happens
> between Samsung tree and arm-soc tree:
Thanks, I will use this resolution tomorrow. You will still get
notification emails just to double check.
--
Kukjin Kim wrote:
[...]
> Hmm, updating timer patches in Samsung tree cause the merge conflicts with
> arm-soc, so for now I dropped them in my tree just now.
> And note that regarding topic branch which are including it will be
re-worked
> soon :-)
>
> Now to merge Samsung tree for linux-next
Kukjin Kim wrote:
>
> Stephen Rothwell wrote:
> >
> > Hi Kukjin,
> >
> Hi,
>
> > On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell
>
> > wrote:
> > >
> > > Today's linux-next merge of the samsung tree got conflicts in
> > > many files with the arm-soc tree.
> > >
> > > I just dropped the
Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi,
> On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the samsung tree got conflicts in
> > many files with the arm-soc tree.
> >
> > I just dropped the samsung tree for today. Please have a look and try
Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi,
> On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the samsung tree got conflicts in
> > many files with the arm-soc tree.
> >
> > I just dropped the samsung tree for today. Please have a look and try
Hi Kukjin,
On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the samsung tree got conflicts in
> many files with the arm-soc tree.
>
> I just dropped the samsung tree for today. Please have a look and try to
> fix this mess up, thanks.
Ping?
--
Hi Kukjin,
On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell s...@canb.auug.org.au
wrote:
Today's linux-next merge of the samsung tree got conflicts in
many files with the arm-soc tree.
I just dropped the samsung tree for today. Please have a look and try to
fix this mess up, thanks.
Stephen Rothwell wrote:
Hi Kukjin,
Hi,
On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell s...@canb.auug.org.au
wrote:
Today's linux-next merge of the samsung tree got conflicts in
many files with the arm-soc tree.
I just dropped the samsung tree for today. Please have a look
Stephen Rothwell wrote:
Hi Kukjin,
Hi,
On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell s...@canb.auug.org.au
wrote:
Today's linux-next merge of the samsung tree got conflicts in
many files with the arm-soc tree.
I just dropped the samsung tree for today. Please have a look
Kukjin Kim wrote:
Stephen Rothwell wrote:
Hi Kukjin,
Hi,
On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell
s...@canb.auug.org.au
wrote:
Today's linux-next merge of the samsung tree got conflicts in
many files with the arm-soc tree.
I just dropped the samsung tree
Kukjin Kim wrote:
[...]
Hmm, updating timer patches in Samsung tree cause the merge conflicts with
arm-soc, so for now I dropped them in my tree just now.
And note that regarding topic branch which are including it will be
re-worked
soon :-)
Now to merge Samsung tree for linux-next should
Hi Kukjin,
On Wed, 16 Jan 2013 21:13:00 -0800 Kukjin Kim kgene@samsung.com wrote:
One more, following is my preferred resolution when merge conflict happens
between Samsung tree and arm-soc tree:
Thanks, I will use this resolution tomorrow. You will still get
notification emails just to
18 matches
Mail list logo
