linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: Vladimir Murzin <vladimir.murzin@arm.com>
Cc: arnd@arndb.de, linux@arm.linux.org.uk,
	gregkh@linuxfoundation.org, tglx@linutronix.de,
	liviu.dudau@arm.com, sudeep.holla@arm.com,
	lorenzo.pieralisi@arm.com, mark.rutland@arm.com,
	gnomes@lxorguk.ukuu.org.uk, peter@hurleysoftware.com,
	pawel.moll@arm.com, ijc+devicetree@hellion.org.uk,
	devicetree@vger.kernel.org, linux-api@vger.kernel.org,
	linux-kernel@vger.kernel.org, andy.shevchenko@gmail.com,
	robh+dt@kernel.org, linux-serial@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v5 00/10] Support for Cortex-M Prototyping System
Date: Thu, 14 Apr 2016 11:39:45 +0200	[thread overview]
Message-ID: <20160414093945.GA15250@linaro.org> (raw)
In-Reply-To: <570F593D.6040809@arm.com>

On Thu, Apr 14, 2016 at 09:47:57AM +0100, Vladimir Murzin wrote:
> Hi,
> 
> On 01/04/16 15:02, Vladimir Murzin wrote:
> > Hi,
> > 
> > This patch series provides the basic support for running ucLinux on V2M-MPS2
> > platform.
> > 
> > With these patches applied ucLinux can be run on both HW and FVP models
> > with Cortex-M3/M4/M7 configurations.
> 
> Any objection to get it merged?
> 
> Sudeep Holla noticed that there is merge conflict against linux-next
> with PIC32 uart (Makefile and serial_core.h), so should I provide
> conflict resolution or do rebase on someone's branch?
> 
> Anyway, I'd be glad to know how it should be processed further?

This patchset should go through the arm-soc tree. Any conflicts resulting
from a merge *after* your patchset is in the arm-soc tree is no longer your
problem.

So IOW, if your patchset applies to arm-soc and Arnd is ok to pick it, then
everything is fine.

  -- Daniel

  reply	other threads:[~2016-04-14  9:39 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-01 14:02 [PATCH v5 00/10] Support for Cortex-M Prototyping System Vladimir Murzin
2016-04-01 14:02 ` [PATCH v5 01/10] dt-bindings: document the MPS2 timer bindings Vladimir Murzin
2016-04-01 14:02 ` [PATCH v5 02/10] clockevents/drivers: add MPS2 Timer driver Vladimir Murzin
2016-04-01 14:02 ` [PATCH v5 03/10] dt-bindings: document the MPS2 UART bindings Vladimir Murzin
2016-04-01 14:02 ` [PATCH v5 04/10] serial: mps2-uart: add MPS2 UART driver Vladimir Murzin
2016-04-01 14:19   ` Andy Shevchenko
2016-04-01 14:27     ` Vladimir Murzin
2016-04-07 13:03   ` Vladimir Murzin
2016-04-07 14:43     ` Greg KH
2016-04-07 14:48   ` Vladimir Murzin
2016-04-01 14:02 ` [PATCH v5 05/10] serial: mps2-uart: add support for early console Vladimir Murzin
2016-04-01 14:02 ` [PATCH v5 06/10] ARM: vexpress/mps2: introduce MPS2 platform Vladimir Murzin
2016-04-01 14:02 ` [PATCH v5 07/10] ARM: configs: add MPS2 defconfig Vladimir Murzin
2016-04-01 14:02 ` [PATCH v5 08/10] ARM: dts: introduce MPS2 AN385/AN386 Vladimir Murzin
2016-04-01 14:03 ` [PATCH v5 09/10] ARM: dts: introduce MPS2 AN399/AN400 Vladimir Murzin
2016-04-01 14:03 ` [PATCH v5 10/10] MAINTAINERS: Update ARM Versatile Express platform entry Vladimir Murzin
2016-04-14  8:47 ` [PATCH v5 00/10] Support for Cortex-M Prototyping System Vladimir Murzin
2016-04-14  9:39   ` Daniel Lezcano [this message]
2016-04-14 19:25   ` Greg KH
2016-04-15  8:52     ` Sudeep Holla
2016-04-15  9:30       ` Vladimir Murzin
2016-04-15 16:23       ` Greg KH
2016-04-23 23:43 ` Arnd Bergmann
2016-04-25  8:58   ` Vladimir Murzin

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=20160414093945.GA15250@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=andy.shevchenko@gmail.com \
    --cc=arnd@arndb.de \
    --cc=devicetree@vger.kernel.org \
    --cc=gnomes@lxorguk.ukuu.org.uk \
    --cc=gregkh@linuxfoundation.org \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=liviu.dudau@arm.com \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=mark.rutland@arm.com \
    --cc=pawel.moll@arm.com \
    --cc=peter@hurleysoftware.com \
    --cc=robh+dt@kernel.org \
    --cc=sudeep.holla@arm.com \
    --cc=tglx@linutronix.de \
    --cc=vladimir.murzin@arm.com \
    /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).