From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Shuah Khan <skhan@linuxfoundation•org>,
Brendan Higgins <brendanhiggins@google•com>,
Jonathan Corbet <corbet@lwn•net>
Cc: Daniel Latypov <dlatypov@google•com>,
Harinder Singh <sharinder@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the kunit-next tree with the jc_docs tree
Date: Fri, 24 Dec 2021 16:32:56 +1100 [thread overview]
Message-ID: <20211224163256.2a0f01af@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 795 bytes --]
Hi all,
Today's linux-next merge of the kunit-next tree got a conflict in:
Documentation/dev-tools/kunit/index.rst
between commit:
6c6213f4a29b ("Documentation: KUnit: Rewrite main page")
from the jc_docs tree and commit:
58b391d74630 ("Documentation: kunit: remove claims that kunit is a mocking framework")
from the kunit-next tree.
I fixed it up (I just used the former version) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-12-24 5:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-24 5:32 Stephen Rothwell [this message]
2022-01-04 19:05 ` linux-next: manual merge of the kunit-next tree with the jc_docs tree Daniel Latypov
2022-01-04 20:26 ` Brendan Higgins
2022-01-10 23:16 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-12-24 5:37 Stephen Rothwell
2022-01-10 23:15 ` Stephen Rothwell
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=20211224163256.2a0f01af@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brendanhiggins@google$(echo .)com \
--cc=corbet@lwn$(echo .)net \
--cc=dlatypov@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sharinder@google$(echo .)com \
--cc=skhan@linuxfoundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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