Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/pm.c between commit 7310d99ffcd1 ("ARM: EXYNOS:
Fix build breakge with PM_SLEEP=n") from the arm-soc tree and commit
66df3ce29804 ("ARM: EXYNOS: Refactored code for using PMU address via
DT") from the
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/pm.c between commit 7310d99ffcd1 (ARM: EXYNOS:
Fix build breakge with PM_SLEEP=n) from the arm-soc tree and commit
66df3ce29804 (ARM: EXYNOS: Refactored code for using PMU address via
DT) from the
Hi Kukjin,
Today's linux-next merge of the samsung tree got conflicts in
arch/arm/mach-s5pv210/dev-audio.c,
arch/arm/mach-s5pv210/include/mach/gpio-samsung.h,
arch/arm/mach-s5pv210/mach-aquila.c, arch/arm/mach-s5pv210/mach-goni.c,
arch/arm/mach-s5pv210/mach-smdkv210.c,
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/plat-samsung/Kconfig between commit ab275b132a79 ("ARM: s5p:
cut the custom ARCH_NR_GPIOS definition") from the arm-soc tree and
commit 2722091e711f ("ARM: SAMSUNG: Remove remaining legacy code") from
the samsung
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/Kconfig between commit 2fd48f94426d ("ARM: mach-s5p: get rid
of all headers") from the arm-soc tree and commit
72dc5e8f84b0 ("ARM: S5PV210: Enable multi-platform build support") from
the samsung tree.
I fixed it
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/Kconfig between commit 2fd48f94426d (ARM: mach-s5p: get rid
of all mach/gpio.h headers) from the arm-soc tree and commit
72dc5e8f84b0 (ARM: S5PV210: Enable multi-platform build support) from
the samsung tree.
I
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/plat-samsung/Kconfig between commit ab275b132a79 (ARM: s5p:
cut the custom ARCH_NR_GPIOS definition) from the arm-soc tree and
commit 2722091e711f (ARM: SAMSUNG: Remove remaining legacy code) from
the samsung tree.
Hi Kukjin,
Today's linux-next merge of the samsung tree got conflicts in
arch/arm/mach-s5pv210/dev-audio.c,
arch/arm/mach-s5pv210/include/mach/gpio-samsung.h,
arch/arm/mach-s5pv210/mach-aquila.c, arch/arm/mach-s5pv210/mach-goni.c,
arch/arm/mach-s5pv210/mach-smdkv210.c,
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 Kukjin,
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 1899de289497 ("ARM: S3C24XX: use generic
DEBUG_UART_PHY/_VIRT in
Hi Kukjin,
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 1899de289497 (ARM: S3C24XX: use generic
DEBUG_UART_PHY/_VIRT in debug
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
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/Kconfig.debug between commit 886545ea7d0b ("ARM: efm32: allow
uncompress debug output") from the arm-soc tree and commit 90266754801c
("ARM: SAMSUNG: use generic uncompress.h") from the samsung tree.
I fixed it up
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/Kconfig.debug between commit 886545ea7d0b (ARM: efm32: allow
uncompress debug output) from the arm-soc tree and commit 90266754801c
(ARM: SAMSUNG: use generic uncompress.h) from the samsung tree.
I fixed it up
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)
Hi Kukjin,
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) and commit f0774d41da0e
("irqchip:
Hi Kukjin,
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) and commit f0774d41da0e
(irqchip:
Hi Kukjin,
Today's linux-next merge of the samsung tree got conflicts in quite a few
files between commits from the arm-soc tree and commits from the samsung
tree.
I took Olof's advice and just dropped the samsung tree for today.
--
Cheers,
Stephen Rothwell
Hi Kukjin,
Today's linux-next merge of the samsung tree got conflicts in quite a few
files between commits from the arm-soc tree and commits from the samsung
tree.
I took Olof's advice and just dropped the samsung tree for today.
--
Cheers,
Stephen Rothwell
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,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/common.c between commit b533c8685b16 ("ARM: dts: fix
compatible value for exynos pinctrl") from the arm-soc tree and commit
d28a60d89c83 ("ARM: EXYNOS: skip wakeup interrupt registration for
exynos5250
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: dts: fix compatible value for exynos pinctrl") from the arm-soc
tree and
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: dts: fix compatible value for exynos pinctrl) from the arm-soc
tree and commit
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/common.c between commit b533c8685b16 (ARM: dts: fix
compatible value for exynos pinctrl) from the arm-soc tree and commit
d28a60d89c83 (ARM: EXYNOS: skip wakeup interrupt registration for
exynos5250 if
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/platsmp.c between commit b1cffebf1029 ("ARM: GIC:
remove direct use of gic_raise_softirq") from the arm-soc tree and commit
3c49d3583839 ("ARM: EXYNOS: Add secure firmware support to secondary CPU
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/mach-exynos4-dt.c between commit 1d5cc604f42f ("ARM:
remove mach .handle_irq for GIC users") from the arm-soc tree and commit
d99de316e599 ("ARM: EXYNOS: Add support for Exynos secure firmware") from
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/common/Makefile between commit 81243e444c6e ("irqchip: Move ARM
GIC to drivers/irqchip") from the arm-soc tree and commit cbafeaaa418e
("ARM: Add interface for registering and calling firmware-specific
operations")
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/common/Makefile between commit 81243e444c6e (irqchip: Move ARM
GIC to drivers/irqchip) from the arm-soc tree and commit cbafeaaa418e
(ARM: Add interface for registering and calling firmware-specific
operations)
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/mach-exynos4-dt.c between commit 1d5cc604f42f (ARM:
remove mach .handle_irq for GIC users) from the arm-soc tree and commit
d99de316e599 (ARM: EXYNOS: Add support for Exynos secure firmware) from
the
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/platsmp.c between commit b1cffebf1029 (ARM: GIC:
remove direct use of gic_raise_softirq) from the arm-soc tree and commit
3c49d3583839 (ARM: EXYNOS: Add secure firmware support to secondary CPU
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
Hi Kukjin,
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.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/plat-samsung/time.c between various commits from the arm-soc
tree and commit 0e4a0a6e970e ("ARM: SAMSUNG: Remove unused
plat-samsung/time.c") from the samsung tree.
The latter removes the file, so I did that.
--
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/plat-samsung/time.c between various commits from the arm-soc
tree and commit 0e4a0a6e970e (ARM: SAMSUNG: Remove unused
plat-samsung/time.c) from the samsung tree.
The latter removes the file, so I did that.
--
Hi Kukjin,
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.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/boot/dts/exynos5250.dtsi between commit 24025f6f5821 ("Merge
branch 'next/dt-samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into
next/dt") from the arm-soc tree and commit
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/boot/dts/exynos5250-smdk5250.dts between commit 24025f6f5821
("Merge branch 'next/dt-samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into
next/dt") from the arm-soc tree and commit
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/boot/dts/exynos5250-smdk5250.dts between commit 24025f6f5821
(Merge branch 'next/dt-samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into
next/dt) from the arm-soc tree and commit
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/boot/dts/exynos5250.dtsi between commit 24025f6f5821 (Merge
branch 'next/dt-samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into
next/dt) from the arm-soc tree and commit 5d706af5ab0b
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/Makefile.boot between commit 360a0cab5041 ("ARM:
move all dtb targets out of Makefile.boot") from the arm-soc tree and
commit d105f0b1215d ("ARM: dts: Add basic dts file for Samsung Trats
board") from
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/Makefile.boot between commit 360a0cab5041 (ARM:
move all dtb targets out of Makefile.boot) from the arm-soc tree and
commit d105f0b1215d (ARM: dts: Add basic dts file for Samsung Trats
board) from the
54 matches
Mail list logo
