* linux-next: manual merge of the xilinx tree
@ 2013-07-03 1:10 Stephen Rothwell
2013-07-03 5:53 ` Michal Simek
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2013-07-03 1:10 UTC (permalink / raw)
To: Michal Simek; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
Hi Michal,
Today's linux-next merge of the xilinx tree got conflicts in several files.
These conflicts are caused by a set of old patches in the xilinx tree
other copies of which have been merged upstream a while ago. I fact the
xilinx tree currently adds no changes to linux-next at all. Could you
please clean up this tree?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the xilinx tree
2013-07-03 1:10 linux-next: manual merge of the xilinx tree Stephen Rothwell
@ 2013-07-03 5:53 ` Michal Simek
2013-07-03 6:02 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Michal Simek @ 2013-07-03 5:53 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Michal Simek, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 972 bytes --]
Hi Stephen,
On 07/03/2013 03:10 AM, Stephen Rothwell wrote:
> Hi Michal,
>
> Today's linux-next merge of the xilinx tree got conflicts in several files.
>
> These conflicts are caused by a set of old patches in the xilinx tree
> other copies of which have been merged upstream a while ago. I fact the
> xilinx tree currently adds no changes to linux-next at all. Could you
> please clean up this tree?
I have fixed it - it should be fixed there soon.
But I am thinking about removing this tree from linux-next
because we are pushing arm changes through arm-soc tree
and they require to have specific feature branches.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the xilinx tree
2013-07-03 5:53 ` Michal Simek
@ 2013-07-03 6:02 ` Stephen Rothwell
2013-08-20 10:58 ` Michal Simek
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2013-07-03 6:02 UTC (permalink / raw)
To: monstr; +Cc: Michal Simek, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
Hi Michal,
On Wed, 03 Jul 2013 07:53:32 +0200 Michal Simek <monstr@monstr.eu> wrote:
>
> I have fixed it - it should be fixed there soon.
Thanks.
> But I am thinking about removing this tree from linux-next
> because we are pushing arm changes through arm-soc tree
> and they require to have specific feature branches.
Just let me know when you decide.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the xilinx tree
2013-07-03 6:02 ` Stephen Rothwell
@ 2013-08-20 10:58 ` Michal Simek
2013-08-21 0:01 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Michal Simek @ 2013-08-20 10:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Michal Simek, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 918 bytes --]
Hi Stephen,
On 07/03/2013 08:02 AM, Stephen Rothwell wrote:
> Hi Michal,
>
> On Wed, 03 Jul 2013 07:53:32 +0200 Michal Simek <monstr@monstr.eu> wrote:
>>
>> I have fixed it - it should be fixed there soon.
>
> Thanks.
>
>> But I am thinking about removing this tree from linux-next
>> because we are pushing arm changes through arm-soc tree
>> and they require to have specific feature branches.
>
> Just let me know when you decide.
>
Please remove this tree from the linux-next testing.
xilinx git git://git.xilinx.com/linux-xlnx.git#arm-next
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the xilinx tree
2013-08-20 10:58 ` Michal Simek
@ 2013-08-21 0:01 ` Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2013-08-21 0:01 UTC (permalink / raw)
To: monstr; +Cc: Michal Simek, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
Hi Michal,
On Tue, 20 Aug 2013 12:58:32 +0200 Michal Simek <monstr@monstr.eu> wrote:
>
> Please remove this tree from the linux-next testing.
>
> xilinx git git://git.xilinx.com/linux-xlnx.git#arm-next
Done.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-08-21 0:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-03 1:10 linux-next: manual merge of the xilinx tree Stephen Rothwell
2013-07-03 5:53 ` Michal Simek
2013-07-03 6:02 ` Stephen Rothwell
2013-08-20 10:58 ` Michal Simek
2013-08-21 0:01 ` Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.