All of lore.kernel.org
 help / color / mirror / Atom feed
From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PULL] GIC changes for Linux 4.4
Date: Fri, 9 Oct 2015 22:19:27 +0100	[thread overview]
Message-ID: <20151009221927.597a0f82@arm.com> (raw)
In-Reply-To: <alpine.DEB.2.11.1510092251420.6097@nanos>

On Fri, 9 Oct 2015 22:52:48 +0200
Thomas Gleixner <tglx@linutronix.de> wrote:

> On Fri, 9 Oct 2015, Marc Zyngier wrote:
> > The following changes since commit 049e6dde7e57f0054fdc49102e7ef4830c698b46:
> > 
> >   Linux 4.3-rc4 (2015-10-04 16:57:17 +0100)
> 
> That's not the best base. tip irq/core already has gic modifications
> which conflict. Can you please rebase to tip irq/core?

Damn, completely forgot about the Cavium stuff. Sorry. I'll rebase and
resend.

Thanks,

	M.
-- 
Jazz is not dead. It just smells funny.

WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <marc.zyngier@arm.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Duc Dang <dhdang@apm.com>,
	Jean-Philippe Brucker <jean-philippe.brucker@arm.com>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>
Subject: Re: [PULL] GIC changes for Linux 4.4
Date: Fri, 9 Oct 2015 22:19:27 +0100	[thread overview]
Message-ID: <20151009221927.597a0f82@arm.com> (raw)
In-Reply-To: <alpine.DEB.2.11.1510092251420.6097@nanos>

On Fri, 9 Oct 2015 22:52:48 +0200
Thomas Gleixner <tglx@linutronix.de> wrote:

> On Fri, 9 Oct 2015, Marc Zyngier wrote:
> > The following changes since commit 049e6dde7e57f0054fdc49102e7ef4830c698b46:
> > 
> >   Linux 4.3-rc4 (2015-10-04 16:57:17 +0100)
> 
> That's not the best base. tip irq/core already has gic modifications
> which conflict. Can you please rebase to tip irq/core?

Damn, completely forgot about the Cavium stuff. Sorry. I'll rebase and
resend.

Thanks,

	M.
-- 
Jazz is not dead. It just smells funny.

  reply	other threads:[~2015-10-09 21:19 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-09 15:27 [PULL] GIC changes for Linux 4.4 Marc Zyngier
2015-10-09 15:27 ` Marc Zyngier
2015-10-09 20:52 ` Thomas Gleixner
2015-10-09 20:52   ` Thomas Gleixner
2015-10-09 21:19   ` Marc Zyngier [this message]
2015-10-09 21:19     ` Marc Zyngier

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=20151009221927.597a0f82@arm.com \
    --to=marc.zyngier@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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 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.