From: Jonathan Corbet <corbet@lwn.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Stephen Kitt <steve@sk2.org>, Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the jc_docs tree with the vfs and net-next trees
Date: Mon, 18 May 2020 06:22:53 -0600 [thread overview]
Message-ID: <20200518062253.24709cec@lwn.net> (raw)
In-Reply-To: <20200518123013.6e4cb3cc@canb.auug.org.au>
On Mon, 18 May 2020 12:30:13 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> kernel/sysctl.c
>
> between commit:
>
> f461d2dcd511 ("sysctl: avoid forward declarations")
>
> from the vfs tree and commit:
>
> 2f4c33063ad7 ("docs: sysctl/kernel: document ngroups_max")
>
> from the jc_docs tree.
Hmm...that's somewhat messy. I somehow managed to miss the change to
kernel/sysctl.c that doesn't have much to do with documentation. Stephen
(Kitt): I've reverted that change for now. Could I ask you to resubmit it
as two different patches? I'll happily take the actual docs change; the
sysctl change can be sent to the VFS tree on top of the changes there.
In general we really don't want to mix unrelated changes like this.
Thanks,
jon
next prev parent reply other threads:[~2020-05-18 12:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-18 2:30 linux-next: manual merge of the jc_docs tree with the vfs and net-next trees Stephen Rothwell
2020-05-18 12:22 ` Jonathan Corbet [this message]
2020-05-18 15:00 ` Stephen Kitt
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=20200518062253.24709cec@lwn.net \
--to=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=steve@sk2.org \
--cc=viro@ZenIV.linux.org.uk \
/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).