LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the irqchip tree with the tegra tree
@ 2015-03-16  3:55 Stephen Rothwell
  2015-03-16  8:47 ` Marc Zyngier
  2015-03-16 10:04 ` Thierry Reding
  0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2015-03-16  3:55 UTC (permalink / raw)
  To: Jason Cooper, Stephen Warren, Colin Cross, Olof Johansson,
	Thierry Reding
  Cc: linux-next, linux-kernel, Marc Zyngier, Bob Mottram

[-- Attachment #1: Type: text/plain, Size: 535 bytes --]

Hi Jason,

Today's linux-next merge of the irqchip tree got a conflict in
arch/arm/mach-tegra/irq.c between commit 0a63e1e0617f ("ARM: tegra: Fix
big-endian issue with IRQ code") from the tegra tree and commit
1a703bffd82e ("ARM: tegra: remove old LIC support") from the irqchip
tree.

I fixed it up (the latter removed the code changed by the former) and
can carry the fix as necessary (no action is required).



-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the irqchip tree with the tegra tree
  2015-03-16  3:55 linux-next: manual merge of the irqchip tree with the tegra tree Stephen Rothwell
@ 2015-03-16  8:47 ` Marc Zyngier
  2015-03-16 10:04 ` Thierry Reding
  1 sibling, 0 replies; 4+ messages in thread
From: Marc Zyngier @ 2015-03-16  8:47 UTC (permalink / raw)
  To: Stephen Rothwell, Jason Cooper, Stephen Warren, Colin Cross,
	Olof Johansson, Thierry Reding
  Cc: linux-next, linux-kernel, Bob Mottram

On 16/03/15 03:55, Stephen Rothwell wrote:
> Hi Jason,
> 
> Today's linux-next merge of the irqchip tree got a conflict in
> arch/arm/mach-tegra/irq.c between commit 0a63e1e0617f ("ARM: tegra: Fix
> big-endian issue with IRQ code") from the tegra tree and commit
> 1a703bffd82e ("ARM: tegra: remove old LIC support") from the irqchip
> tree.
> 
> I fixed it up (the latter removed the code changed by the former) and
> can carry the fix as necessary (no action is required).

That looks good.

Thanks Stephen.

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the irqchip tree with the tegra tree
  2015-03-16  3:55 linux-next: manual merge of the irqchip tree with the tegra tree Stephen Rothwell
  2015-03-16  8:47 ` Marc Zyngier
@ 2015-03-16 10:04 ` Thierry Reding
  2015-03-17 13:21   ` Jason Cooper
  1 sibling, 1 reply; 4+ messages in thread
From: Thierry Reding @ 2015-03-16 10:04 UTC (permalink / raw)
  To: Jason Cooper
  Cc: Stephen Rothwell, Stephen Warren, Colin Cross, Olof Johansson,
	linux-next, linux-kernel, Marc Zyngier, Bob Mottram

[-- Attachment #1: Type: text/plain, Size: 983 bytes --]

On Mon, Mar 16, 2015 at 02:55:08PM +1100, Stephen Rothwell wrote:
> * PGP Signed by an unknown key
> 
> Hi Jason,
> 
> Today's linux-next merge of the irqchip tree got a conflict in
> arch/arm/mach-tegra/irq.c between commit 0a63e1e0617f ("ARM: tegra: Fix
> big-endian issue with IRQ code") from the tegra tree and commit
> 1a703bffd82e ("ARM: tegra: remove old LIC support") from the irqchip
> tree.
> 
> I fixed it up (the latter removed the code changed by the former) and
> can carry the fix as necessary (no action is required).

Hi Jason,

There's a chance that we might get a couple of other patches for Tegra
that conflict with this series. Would you be able to provide a stable
branch that I can pull into the Tegra tree to resolve those. Another
alternative, if you're okay with it, would be for you to ack the series
and back it out of your tree and I'll take it through the Tegra tree (I
could also provide a stable branch if necessary).

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the irqchip tree with the tegra tree
  2015-03-16 10:04 ` Thierry Reding
@ 2015-03-17 13:21   ` Jason Cooper
  0 siblings, 0 replies; 4+ messages in thread
From: Jason Cooper @ 2015-03-17 13:21 UTC (permalink / raw)
  To: Thierry Reding
  Cc: Stephen Rothwell, Stephen Warren, Colin Cross, Olof Johansson,
	linux-next, linux-kernel, Marc Zyngier, Bob Mottram

On Mon, Mar 16, 2015 at 11:04:58AM +0100, Thierry Reding wrote:
> On Mon, Mar 16, 2015 at 02:55:08PM +1100, Stephen Rothwell wrote:
> > * PGP Signed by an unknown key
> > 
> > Hi Jason,
> > 
> > Today's linux-next merge of the irqchip tree got a conflict in
> > arch/arm/mach-tegra/irq.c between commit 0a63e1e0617f ("ARM: tegra: Fix
> > big-endian issue with IRQ code") from the tegra tree and commit
> > 1a703bffd82e ("ARM: tegra: remove old LIC support") from the irqchip
> > tree.
> > 
> > I fixed it up (the latter removed the code changed by the former) and
> > can carry the fix as necessary (no action is required).
> 
> Hi Jason,
> 
> There's a chance that we might get a couple of other patches for Tegra
> that conflict with this series. Would you be able to provide a stable
> branch that I can pull into the Tegra tree to resolve those.

  git://git.infradead.org/users/jcooper/linux.git irqchip/stacked-tegra

is now stable.  It's based on v4.0-rc1 and only contains this series.

thx,

Jason.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-03-18 18:47 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-16  3:55 linux-next: manual merge of the irqchip tree with the tegra tree Stephen Rothwell
2015-03-16  8:47 ` Marc Zyngier
2015-03-16 10:04 ` Thierry Reding
2015-03-17 13:21   ` Jason Cooper

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).