From: Andrea Parri <andrea.parri@amarulasolutions.com>
To: Jonathan Corbet <corbet@lwn.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Andrew Morton <akpm@linux-foundation.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Laurent Dufour <ldufour@linux.vnet.ibm.com>,
mingo@kernel.org
Subject: Re: linux-next: manual merge of the akpm-current tree with the jc_docs tree
Date: Wed, 9 May 2018 19:35:17 +0200 [thread overview]
Message-ID: <20180509173517.GA17579@andrea> (raw)
In-Reply-To: <20180509111136.127756a8@lwn.net>
On Wed, May 09, 2018 at 11:11:36AM -0600, Jonathan Corbet wrote:
> On Wed, 9 May 2018 18:53:28 +0200
> Andrea Parri <andrea.parri@amarulasolutions.com> wrote:
>
> > > Now that I look a little closer, I think the real issue is that the
> > > "features" documentation assumes that there's a Kconfig option for each,
> > > but there isn't in this case. The lack of a Kconfig option does not,
> > > this time around, imply that the feature has gone away.
> > >
> > > I think that I should probably revert this patch in the short term.
> > > Longer-term, it would be good to have an alternative syntax for "variable
> > > set in the arch headers" to describe situations like this.
> >
> > Both matters were discussed during v1:
> >
> > http://lkml.kernel.org/r/1522774551-9503-1-git-send-email-andrea.parri@amarulasolutions.com
> >
> > ... (and the glory details are documented in features-refresh.sh ;-) ).
>
> So I'll admit to being confused, since I don't see discussion of the
> actual topic at hand.
A couple of clicks on "next in thread" :-)
https://marc.info/?l=linux-kernel&m=152284705204400&w=2
https://marc.info/?l=linux-kernel&m=152294150600751&w=2
>
> > As I suggested above, simply reverting this patch will leave this file,
> > (and only this file!) out-of-date (and won't resolve the conflict with
> > Laurent's patch ...).
>
> Reverting this patch retains the updates from earlier in the series, and
> does indeed make the conflict go away, so I'm still confused. What am I
> missing?
The updates from earlier added "TODO" rows for nds32 and riscv, but missed
the "TODO -> ok" update for riscv.
Andrea
>
> Thanks,
>
> jon
next prev parent reply other threads:[~2018-05-09 17:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-09 10:25 linux-next: manual merge of the akpm-current tree with the jc_docs tree Stephen Rothwell
2018-05-09 13:28 ` Andrea Parri
2018-05-09 13:30 ` Andrea Parri
2018-05-09 14:59 ` Jonathan Corbet
2018-05-09 16:53 ` Andrea Parri
2018-05-09 17:11 ` Jonathan Corbet
2018-05-09 17:35 ` Andrea Parri [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-14 8:19 Stephen Rothwell
2020-04-22 6:01 Stephen Rothwell
2020-03-11 7:11 Stephen Rothwell
2019-10-02 3:18 Stephen Rothwell
2016-12-14 3:42 Stephen Rothwell
2015-12-31 10:58 Stephen Rothwell
2015-12-31 10:43 Stephen Rothwell
2015-12-31 17:47 ` Elliott, Robert (Persistent Memory)
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=20180509173517.GA17579@andrea \
--to=andrea.parri@amarulasolutions.com \
--cc=akpm@linux-foundation.org \
--cc=corbet@lwn.net \
--cc=ldufour@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@kernel.org \
--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).