From: Michael Ellerman <mpe@ellerman.id.au>
To: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Anshuman Khandual <khandual@linux.vnet.ibm.com>,
Stewart Smith <stewart@linux.vnet.ibm.com>
Subject: Re: linux-next: build failure after merge of the powerpc tree
Date: Sat, 22 Aug 2015 21:16:59 +1000 [thread overview]
Message-ID: <1440242219.28532.2.camel@ellerman.id.au> (raw)
In-Reply-To: <55D7F616.1060308@linux.vnet.ibm.com>
On Sat, 2015-08-22 at 09:39 +0530, Vasant Hegde wrote:
> On 08/22/2015 05:10 AM, Michael Ellerman wrote:
> > On Fri, 2015-08-21 at 14:29 +0530, Vasant Hegde wrote:
> >> On 08/21/2015 01:55 PM, Stephen Rothwell wrote:
> >>> Hi all,
> >>>
> >>> After merging the nvdimm tree, today's linux-next build (powerpc
> >>> allyesconfig) failed like this:
> >>
> >> Stephen,
> >>
> >> Thanks for reporting! I checked powerpc tree.. This is because of commit
> >> 8a8d9181 in powerpc tree.. Basically Michael missed one hunk (below hunk in
> >> opal-api.h)
> >
> > Hmm, looks like it.
> >
> > I do remember the patch didn't apply to my tree, so I guess I accidentally
> > dropped a hunk when I was forcing it to apply.
>
> Hmmm yeah..My patchset was based on upstream tree (4.2-rc7) instead of powerpc
> next tree.
That's OK. Usually that works fine, and usually when there is a conflict I can
just fix it up. I'm not sure how I managed to drop that chunk, I'll have to go
back and look at what I did. I suspect I hand-edited the patch, and if you do
that wrong it can lead to patch just ignoring the rest of the patch.
I probably should have just asked you to rebase on my next, but given it was
already version 10 I didn't really feel like doing another revision :)
> > Also we're obviously not building this in any of our defconfigs. Can you please
> > send a patch to enable it for pseries_defconfig and ppc64_defconfig.
>
> Sure.. Will send separate patch.
Thanks.
cheers
next prev parent reply other threads:[~2015-08-22 11:17 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-21 8:25 linux-next: build failure after merge of the powerpc tree Stephen Rothwell
2015-08-21 8:59 ` Vasant Hegde
2015-08-21 23:40 ` Michael Ellerman
2015-08-22 4:09 ` Vasant Hegde
2015-08-22 11:16 ` Michael Ellerman [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-10 3:38 Stephen Rothwell
2023-02-12 23:22 ` Michael Ellerman
2021-04-19 9:14 Stephen Rothwell
2021-04-19 9:59 ` Xiongwei Song
2021-04-19 12:24 ` Michael Ellerman
2021-02-09 10:19 Stephen Rothwell
2021-02-10 8:20 ` Nicholas Piggin
2021-02-10 11:18 ` Stephen Rothwell
2020-04-22 5:41 Stephen Rothwell
2020-04-22 6:35 ` Haren Myneni
2020-04-25 23:52 ` Michael Ellerman
2019-09-30 0:13 Stephen Rothwell
2019-10-03 23:05 ` Michael Ellerman
2019-10-11 8:22 ` Michael Ellerman
2019-09-02 11:40 Stephen Rothwell
2019-09-02 11:52 ` Christoph Hellwig
2019-02-22 7:14 Stephen Rothwell
2019-02-22 7:37 ` Christophe Leroy
2019-02-22 11:28 ` Michael Ellerman
2018-03-29 7:43 Stephen Rothwell
2018-01-19 5:53 Stephen Rothwell
2018-01-18 22:26 Stephen Rothwell
2017-11-02 6:49 Stephen Rothwell
2017-11-14 11:12 ` Michael Ellerman
2016-11-22 8:58 Stephen Rothwell
2016-11-22 10:21 ` Stephen Rothwell
2016-11-23 2:02 ` Nicholas Piggin
2016-07-22 6:31 Stephen Rothwell
2016-07-01 5:27 Stephen Rothwell
2016-07-01 8:59 ` Colin Ian King
2016-01-07 8:16 Stephen Rothwell
2016-01-07 10:30 ` Michael Ellerman
2016-01-13 5:46 ` Aneesh Kumar K.V
2016-01-13 7:44 ` Michael Ellerman
2016-01-12 12:32 ` Michael Ellerman
2014-08-06 6:31 Stephen Rothwell
2013-07-02 0:54 Stephen Rothwell
2013-07-02 2:00 ` Benjamin Herrenschmidt
2012-11-28 3:03 Stephen Rothwell
2012-11-28 4:28 ` Benjamin Herrenschmidt
2011-07-01 1:39 Stephen Rothwell
2011-07-01 3:00 ` Benjamin Herrenschmidt
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=1440242219.28532.2.camel@ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=benh@kernel.crashing.org \
--cc=hegdevasant@linux.vnet.ibm.com \
--cc=khandual@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=sfr@canb.auug.org.au \
--cc=stewart@linux.vnet.ibm.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;
as well as URLs for NNTP newsgroup(s).