public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Thierry Reding <thierry.reding@gmail.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Arnd Bergmann <arnd@arndb.de>,
	"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Thierry Reding <treding@nvidia.com>
Subject: Re: linux-next: manual merge of the pci tree with the asm-generic tree
Date: Fri, 26 Sep 2014 19:26:32 +1000	[thread overview]
Message-ID: <20140926192632.31fb96fd@canb.auug.org.au> (raw)
In-Reply-To: <20140926091357.GL841@e106497-lin.cambridge.arm.com>

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

Hi Liviu,

On Fri, 26 Sep 2014 10:13:57 +0100 Liviu Dudau <Liviu.Dudau@arm.com> wrote:
>
> I agree with Thierry's solution.
> 
> I don't know how these cases are handled. Should I send Bjorn a patch for his tree?

They need to be fixed in one or other of the trees, so yes.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

  reply	other threads:[~2014-09-26  9:26 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-26  3:29 linux-next: manual merge of the pci tree with the asm-generic tree Stephen Rothwell
2014-09-26  7:00 ` Thierry Reding
2014-09-26  9:13   ` Liviu Dudau
2014-09-26  9:26     ` Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-04-03  2:14 Stephen Rothwell
2018-04-04 18:38 ` Bjorn Helgaas

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=20140926192632.31fb96fd@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=Liviu.Dudau@arm.com \
    --cc=arnd@arndb.de \
    --cc=bhelgaas@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=thierry.reding@gmail.com \
    --cc=treding@nvidia.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