public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
	"H. Peter Anvin" <hpa@zytor•com>,
	Peter Zijlstra <peterz@infradead•org>,
	Bjorn Helgaas <bhelgaas@google•com>,
	"Yan, Zheng" <zheng.z.yan@intel•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Benoit Taine <benoit.taine@lip6•fr>
Subject: Re: linux-next: manual merge of the tip tree with the pci-current tree
Date: Thu, 14 Aug 2014 13:22:16 +1000	[thread overview]
Message-ID: <20140814132216.0e797236@canb.auug.org.au> (raw)
In-Reply-To: <20140814131031.4ecce959@canb.auug.org.au>

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

Hi all,

On Thu, 14 Aug 2014 13:10:31 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> I fixed it up (I used the latter version of this file and applied the
> following merge fix patch) and can carry the fix as necessary (no
> action is required).

Apart from making sure Linus is informed when these things hit his tree ...

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

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

      reply	other threads:[~2014-08-14  3:22 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-14  3:10 linux-next: manual merge of the tip tree with the pci-current tree Stephen Rothwell
2014-08-14  3:22 ` Stephen Rothwell [this message]

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=20140814132216.0e797236@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=benoit.taine@lip6$(echo .)fr \
    --cc=bhelgaas@google$(echo .)com \
    --cc=hpa@zytor$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=mingo@elte$(echo .)hu \
    --cc=peterz@infradead$(echo .)org \
    --cc=tglx@linutronix$(echo .)de \
    --cc=zheng.z.yan@intel$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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