From: Michal Simek <monstr@monstr.eu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Michal Simek <michal.simek@xilinx.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the xilinx tree
Date: Wed, 03 Jul 2013 07:53:32 +0200 [thread overview]
Message-ID: <51D3BC5C.1080505@monstr.eu> (raw)
In-Reply-To: <20130703111030.c0df2a231fc3e4ba6cb566cd@canb.auug.org.au>
[-- 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 --]
next prev parent reply other threads:[~2013-07-03 5:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-03 1:10 linux-next: manual merge of the xilinx tree Stephen Rothwell
2013-07-03 5:53 ` Michal Simek [this message]
2013-07-03 6:02 ` Stephen Rothwell
2013-08-20 10:58 ` Michal Simek
2013-08-21 0:01 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51D3BC5C.1080505@monstr.eu \
--to=monstr@monstr.eu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).