From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mukesh Rathor <mukesh.rathor@oracle.com>
Subject: Re: linux-next: manual merge of the tmem tree with the xen-two tree
Date: Thu, 1 Nov 2012 17:52:27 -0400 [thread overview]
Message-ID: <20121101215227.GA18854@localhost.localdomain> (raw)
In-Reply-To: <20121102001732.1c02f6a72c9cd2b894d9c6c4@canb.auug.org.au>
On Fri, Nov 02, 2012 at 12:17:32AM +1100, Stephen Rothwell wrote:
> Hi Konrad,
>
> On Thu, 1 Nov 2012 09:03:10 -0400 Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> wrote:
> >
> > I am not really sure how this happen - the 'tmem' tree should not have
> > had 7282a68f5aea, and more interestingly, I cannot find it in the
> > tmem tree! Either way, let me just reset the #linux-next to v3.7-rc3
> > in tmem tree and see if this shows up.
>
> The version of the tmem tree I have has commit a728d5ea1c20 as its head
> and has the shortlog below. I has not changed since Sept 24.
Oh, my. That is a mistake. I've reseted the #linux-next to be 3.7-rc3
in the tmem tree. It was not suppose to have that patch and I think
I just did 'git am' on the wrong tree. Thanks for catching this!
>
> $ git shortlog origin/master..tmem/linux-next
> Konrad Rzeszutek Wilk (3):
> Merge commit 'v3.6-rc5' into linux-next
> Merge branch 'stable/for-linus-3.7' into linux-next
> Merge commit 'v3.6-rc6' into linux-next
>
> Mukesh Rathor (1):
> PVH: Basic and preparatory changes
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
next prev parent reply other threads:[~2012-11-01 21:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-01 3:40 linux-next: manual merge of the tmem tree with the xen-two tree Stephen Rothwell
2012-11-01 13:03 ` Konrad Rzeszutek Wilk
2012-11-01 13:17 ` Stephen Rothwell
2012-11-01 13:19 ` Stephen Rothwell
2012-11-01 21:52 ` Konrad Rzeszutek Wilk [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-01 3:41 Stephen Rothwell
2012-11-01 3:41 Stephen Rothwell
2011-06-22 4:46 Stephen Rothwell
2011-06-22 14:06 ` Konrad Rzeszutek Wilk
2011-06-23 16:58 ` Dan Magenheimer
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=20121101215227.GA18854@localhost.localdomain \
--to=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mukesh.rathor@oracle.com \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).