From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jonathan Corbet <corbet@lwn.net>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Thorsten Leemhuis <linux@leemhuis.info>,
Vegard Nossum <vegard.nossum@oracle.com>
Subject: Re: linux-next: manual merge of the jc_docs tree with the driver-core.current tree
Date: Fri, 24 Mar 2023 07:38:21 +0100 [thread overview]
Message-ID: <ZB1FXXvBfzl0S1n6@kroah.com> (raw)
In-Reply-To: <20230324114609.018ad2a7@canb.auug.org.au>
On Fri, Mar 24, 2023 at 11:46:09AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> Documentation/admin-guide/index.rst
>
> between commit:
>
> 44ac5abac86b ("Documentation/security-bugs: move from admin-guide/ to process/")
>
> from the driver-core.current tree and commit:
>
> efe920466f51 ("docs: describe how to quickly build a trimmed kernel")
>
> from the jc_docs 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc Documentation/admin-guide/index.rst
> index 09a563bbe3e7,7840fdbab585..000000000000
> --- a/Documentation/admin-guide/index.rst
> +++ b/Documentation/admin-guide/index.rst
> @@@ -36,6 -36,8 +36,7 @@@ problems and bugs in particular
>
> reporting-issues
> reporting-regressions
> - security-bugs
> + quickly-build-trimmed-linux
> bug-hunting
> bug-bisect
> tainted-kernels
Looks good to me, thanks!
next prev parent reply other threads:[~2023-03-24 6:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-24 0:46 linux-next: manual merge of the jc_docs tree with the driver-core.current tree Stephen Rothwell
2023-03-24 6:38 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-09 1:00 Stephen Rothwell
2022-05-10 17:10 ` Greg KH
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=ZB1FXXvBfzl0S1n6@kroah.com \
--to=greg@kroah.com \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@leemhuis.info \
--cc=sfr@canb.auug.org.au \
--cc=vegard.nossum@oracle.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).