From: Xiaoming Ni <nixiaoming@huawei.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Al Viro <viro@ZenIV.linux.org.uk>, Helge Deller <deller@gmx.de>,
Parisc List <linux-parisc@vger.kernel.org>, <mcgrof@kernel.org>,
<keescook@chromium.org>, <yzaikin@google.com>,
<linux-fsdevel@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the vfs tree with the parisc-hd tree
Date: Mon, 11 May 2020 09:55:16 +0800 [thread overview]
Message-ID: <99095805-8cbe-d140-e2f1-0c5a3e84d7e7@huawei.com> (raw)
In-Reply-To: <20200511111123.68ccbaa3@canb.auug.org.au>
On 2020/5/11 9:11, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
> kernel/sysctl.c
>
> between commit:
>
> b6522fa409cf ("parisc: add sysctl file interface panic_on_stackoverflow")
>
> from the parisc-hd tree and commit:
>
> f461d2dcd511 ("sysctl: avoid forward declarations")
>
> from the vfs tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
Kernel/sysctl.c contains more than 190 interface files, and there are a
large number of config macro controls. When modifying the sysctl
interface directly in kernel/sysctl.c , conflicts are very easy to occur.
At the same time, the register_sysctl_table() provided by the system can
easily add the sysctl interface, and there is no conflict of
kernel/sysctl.c .
Should we add instructions in the patch guide (coding-style.rst
submitting-patches.rst):
Preferentially use register_sysctl_table() to add a new sysctl
interface, centralize feature codes, and avoid directly modifying
kernel/sysctl.c ?
In addition, is it necessary to transfer the architecture-related sysctl
interface to arch/xxx/kernel/sysctl.c ?
Thanks
Xiaoming Ni
next prev parent reply other threads:[~2020-05-11 1:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 1:11 linux-next: manual merge of the vfs tree with the parisc-hd tree Stephen Rothwell
2020-05-11 1:55 ` Xiaoming Ni [this message]
2020-05-12 0:33 ` Luis Chamberlain
2020-05-12 5:22 ` Kees Cook
2020-05-12 5:44 ` Luis Chamberlain
2020-05-12 11:52 ` Eric W. Biederman
2020-05-12 17:24 ` Luis Chamberlain
2020-05-12 17:40 ` Eric W. Biederman
2020-05-12 22:03 ` Luis Chamberlain
2020-05-13 4:04 ` Xiaoming Ni
2020-05-13 12:50 ` Luis Chamberlain
2020-05-14 6:05 ` Xiaoming Ni
2020-05-14 16:17 ` Xiaoming Ni
2020-05-15 16:08 ` Luis Chamberlain
2020-05-13 13:42 ` Eric W. Biederman
2020-05-13 14:14 ` Luis Chamberlain
2020-05-13 14:44 ` Eric W. Biederman
2020-05-13 15:02 ` Luis Chamberlain
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=99095805-8cbe-d140-e2f1-0c5a3e84d7e7@huawei.com \
--to=nixiaoming@huawei.com \
--cc=deller@gmx.de \
--cc=hch@lst.de \
--cc=keescook@chromium.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@ZenIV.linux.org.uk \
--cc=yzaikin@google.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).