Re: linux-next: manual merge of the samsung tree with the arm-soc tree

2014-05-25 Thread Stephen Rothwell
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 1

RE: linux-next: manual merge of the samsung tree with the arm-soc tree

2013-04-04 Thread Kukjin Kim
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/i

Re: linux-next: manual merge of the samsung tree with the arm-soc tree

2013-02-09 Thread Grant Likely
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: dt

Re: linux-next: manual merge of the samsung tree with the arm-soc tree

2013-01-16 Thread Stephen Rothwell
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. --

RE: linux-next: manual merge of the samsung tree with the arm-soc tree

2013-01-16 Thread Kukjin Kim
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 s

RE: linux-next: manual merge of the samsung tree with the arm-soc tree

2013-01-16 Thread Kukjin Kim
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 samsu

RE: linux-next: manual merge of the samsung tree with the arm-soc tree

2013-01-16 Thread Kukjin Kim
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

RE: linux-next: manual merge of the samsung tree with the arm-soc tree

2013-01-16 Thread Kukjin Kim
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

Re: linux-next: manual merge of the samsung tree with the arm-soc tree

2013-01-16 Thread Stephen Rothwell
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? -- Cheer