From: Stephen Rothwell <sfr@canb•auug.org.au>
To: paulmck@linux•vnet.ibm.com
Cc: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Lai Jiangshan <laijs@cn•fujitsu.com>,
"David S. Miller" <davem@davemloft•net>,
"John W. Linville" <linville@tuxdriver•com>,
Johannes Berg <johannes.berg@intel•com>
Subject: Re: linux-next: manual merge of the tip tree with the wireless tree
Date: Tue, 17 May 2011 17:21:03 +1000 [thread overview]
Message-ID: <20110517172103.a196fbe1.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20110517070558.GP2573@linux.vnet.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
Hi Paul,
On Tue, 17 May 2011 00:05:58 -0700 "Paul E. McKenney" <paulmck@linux•vnet.ibm.com> wrote:
>
> One of these is mine in -tip (0744371aeb). Please let me know what
> I should be doing about it.
In this case, I would say absolutely nothing (assuming I did the
resolution correctly) :-) If I can figure it out, Linus can as well and
will do so when these trees hit his in a week or so.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2011-05-17 7:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-17 3:14 linux-next: manual merge of the tip tree with the wireless tree Stephen Rothwell
2011-05-17 7:05 ` Paul E. McKenney
2011-05-17 7:21 ` Stephen Rothwell [this message]
2011-05-17 8:09 ` Ingo Molnar
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=20110517172103.a196fbe1.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=hpa@zytor$(echo .)com \
--cc=johannes.berg@intel$(echo .)com \
--cc=laijs@cn$(echo .)fujitsu.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=mingo@elte$(echo .)hu \
--cc=paulmck@linux$(echo .)vnet.ibm.com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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