From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Jonathan Corbet <corbet@lwn•net>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Mauro Carvalho Chehab <mchehab@s-opensource•com>
Subject: Re: linux-next: manual merge of the tip tree with the jc_docs tree
Date: Mon, 3 Jul 2017 11:33:10 +1000 [thread overview]
Message-ID: <20170703113310.33a6348f@canb.auug.org.au> (raw)
In-Reply-To: <20170621141809.11103aab@canb.auug.org.au>
Hi all,
With the merge window opening, just a reminder that this conflict still
exists.
On Wed, 21 Jun 2017 14:18:09 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> Documentation/DocBook/kernel-hacking.tmpl
>
> between commit:
>
> c4fcd7cabb83 ("docs-rst: convert kernel-hacking to ReST")
>
> from the jc_docs tree and commit:
>
> ac6424b981bc ("sched/wait: Rename wait_queue_t => wait_queue_entry_t")
>
> from the tip tree.
>
> I deleted the file and added the following fixup patch.
>
> 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.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Wed, 21 Jun 2017 14:14:45 +1000
> Subject: [PATCH] sched/wait: fix up for "docs-rst: convert kernel-hacking to
> ReST"
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> Documentation/kernel-hacking/hacking.rst | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/kernel-hacking/hacking.rst b/Documentation/kernel-hacking/hacking.rst
> index 1a456b60a7cf..daf3883b2694 100644
> --- a/Documentation/kernel-hacking/hacking.rst
> +++ b/Documentation/kernel-hacking/hacking.rst
> @@ -498,7 +498,7 @@ Wait Queues ``include/linux/wait.h``
> A wait queue is used to wait for someone to wake you up when a certain
> condition is true. They must be used carefully to ensure there is no
> race condition. You declare a :c:type:`wait_queue_head_t`, and then processes
> -which want to wait for that condition declare a :c:type:`wait_queue_t`
> +which want to wait for that condition declare a :c:type:`wait_queue_entry_t`
> referring to themselves, and place that in the queue.
>
> Declaring
> --
> 2.11.0
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-07-03 1:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-21 4:18 linux-next: manual merge of the tip tree with the jc_docs tree Stephen Rothwell
2017-07-03 1:33 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-03-14 2:58 Stephen Rothwell
2020-12-04 4:38 Stephen Rothwell
2021-06-03 4:04 Stephen Rothwell
2022-04-19 1:55 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=20170703113310.33a6348f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@s-opensource$(echo .)com \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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