linux-next: manual merge of the xilinx tree

linux-next: manual merge of the xilinx tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: manual merge of the xilinx tree

[Michal Simek]

[-- 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 --]

Re: linux-next: manual merge of the xilinx tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: manual merge of the xilinx tree

[Michal Simek]

[-- 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 --]

Re: linux-next: manual merge of the xilinx tree

[Stephen Rothwell]

[-- 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 --]