From: Andrew Morton <akpm@linux-foundation.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
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,
Borislav Petkov <bp@alien8.de>
Subject: Re: linux-next: manual merge of the akpm tree with the tip tree
Date: Wed, 8 Apr 2015 13:46:26 -0700 [thread overview]
Message-ID: <20150408134626.0de0d209e49d3911d46228d5@linux-foundation.org> (raw)
In-Reply-To: <20150408151350.GA8490@gmail.com>
On Wed, 8 Apr 2015 17:13:51 +0200 Ingo Molnar <mingo@kernel.org> wrote:
>
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm tree got a conflict in
> > arch/x86/kernel/cpu/common.c between commit 6b51311c9765
> > ("x86/asm/entry/64: Use a define for an invalid segment selector") from
> > the tip tree and commit f28c11e4b695 ("arch/x86/kernel/cpu/common.c:
> > fix warning") from the akpm tree.
>
> So f28c11e4b695 doesn't appear to be in linux-next as fetched a minute
> ago:
>
> triton:~/linux.trees.git> git log f28c11e4b695 --
> fatal: bad revision 'f28c11e4b695'
> triton:~/linux.trees.git> git describe
> next-20150408
>
> How am I supposed to fetch and interpret such sha1's?
Stephen didn't include the -mm patch so I guess that ID never was
included in -next.
For -mm patches the place to bookmark is
http://ozlabs.org/~akpm/mmotm/broken-out/.
This:
http://ozlabs.org/~akpm/mmotm/broken-out/arch-x86-kernel-cpu-commonc-fix-warning.patch
It sounds like the warning has now been fixed.
next prev parent reply other threads:[~2015-04-08 20:46 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-08 8:49 linux-next: manual merge of the akpm tree with the tip tree Stephen Rothwell
2015-04-08 15:13 ` Ingo Molnar
2015-04-08 20:46 ` Andrew Morton [this message]
2015-04-08 21:57 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-05-29 10:57 Stephen Rothwell
2020-05-29 10:49 Stephen Rothwell
2020-01-22 6:37 Stephen Rothwell
2019-02-13 6:49 Stephen Rothwell
2019-02-13 19:59 ` Andrew Morton
2018-01-09 5:02 Stephen Rothwell
2018-01-09 10:36 ` Andy Shevchenko
2017-10-16 18:48 Mark Brown
2017-10-16 20:01 ` Mark Brown
2017-04-12 7:08 Stephen Rothwell
2017-03-31 5:44 Stephen Rothwell
2017-03-31 6:42 ` Peter Zijlstra
2017-03-31 13:54 ` Andi Kleen
2017-03-31 14:45 ` Peter Zijlstra
2017-03-31 16:02 ` Andi Kleen
2017-03-31 17:48 ` Peter Zijlstra
2017-03-24 5:40 Stephen Rothwell
2017-03-24 8:05 ` Peter Zijlstra
2016-03-10 5:28 Stephen Rothwell
2016-03-10 8:00 ` Ingo Molnar
2016-03-10 20:38 ` Andrew Morton
2016-02-09 4:50 Stephen Rothwell
2016-02-09 14:04 ` Matt Fleming
2016-02-09 14:07 ` Ingo Molnar
2015-06-09 14:12 Stephen Rothwell
2014-03-21 6:45 Stephen Rothwell
2014-01-13 6:17 Stephen Rothwell
2013-04-23 7:17 Stephen Rothwell
2013-02-14 4:33 Stephen Rothwell
2013-02-14 4:25 Stephen Rothwell
2013-02-14 4:34 ` H. Peter Anvin
2013-02-04 7:00 Stephen Rothwell
2013-01-28 12:29 Stephen Rothwell
2012-12-10 8:29 Stephen Rothwell
2012-12-10 10:46 ` Ingo Molnar
2012-12-10 8:25 Stephen Rothwell
2012-12-10 8:20 Stephen Rothwell
2012-12-10 8:11 Stephen Rothwell
2012-12-10 8:01 Stephen Rothwell
2012-12-10 11:13 ` Will Deacon
2012-12-10 7:47 Stephen Rothwell
2012-11-15 6:32 Stephen Rothwell
2012-10-01 14:22 Stephen Rothwell
2012-09-27 7:15 Stephen Rothwell
2012-09-27 7:10 Stephen Rothwell
2012-09-27 7:04 Stephen Rothwell
2012-09-27 6:57 Stephen Rothwell
2012-09-27 6:49 Stephen Rothwell
2012-07-27 3:50 Stephen Rothwell
2012-07-25 4:08 Stephen Rothwell
2012-07-25 7:10 ` Ingo Molnar
2012-07-25 7:35 ` Johannes Weiner
2012-07-25 18:57 ` Andrew Morton
2012-07-25 19:03 ` Ingo Molnar
2012-07-25 19:26 ` Andrew Morton
2012-07-26 7:51 ` Ingo Molnar
2012-07-26 18:05 ` Andrew Morton
2012-07-25 19:20 ` Johannes Weiner
2012-07-26 7:03 ` Stephen Rothwell
2012-05-21 8:29 Stephen Rothwell
2012-05-21 8:04 Stephen Rothwell
2012-05-21 7:59 Stephen Rothwell
2012-03-27 4:57 Stephen Rothwell
2012-03-26 4:01 Stephen Rothwell
2012-03-26 5:20 ` Alex Shi
2012-03-08 6:32 Stephen Rothwell
2012-03-08 6:28 Stephen Rothwell
2012-02-29 6:27 Stephen Rothwell
2012-02-28 4:52 Stephen Rothwell
2012-02-27 5:53 Stephen Rothwell
2012-02-27 5:57 ` Cyrill Gorcunov
2012-02-27 6:02 ` H. Peter Anvin
2012-02-27 6:05 ` Cyrill Gorcunov
2012-02-27 6:01 ` H. Peter Anvin
2012-02-27 6:19 ` Stephen Rothwell
2012-02-27 5:44 Stephen Rothwell
2012-02-27 5:33 Stephen Rothwell
2012-02-27 5:23 Stephen Rothwell
2012-02-27 5:16 Stephen Rothwell
2011-12-06 4:04 Stephen Rothwell
2011-09-27 7:13 Stephen Rothwell
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=20150408134626.0de0d209e49d3911d46228d5@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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).