linux-doc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Corbet <corbet@lwn.net>
To: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] docs: userspace: ioctl-number: remove mc146818rtc conflict
Date: Thu, 13 Feb 2020 11:42:22 -0700	[thread overview]
Message-ID: <20200213114222.220060b3@lwn.net> (raw)
In-Reply-To: <20200209203304.66004-1-alexandre.belloni@bootlin.com>

On Sun,  9 Feb 2020 21:33:04 +0100
Alexandre Belloni <alexandre.belloni@bootlin.com> wrote:

> In 2.3.43pre2, the RTC ioctls definitions were actually moved from
> linux/mc146818rtc.h to linux/rtc.h
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
>  Documentation/userspace-api/ioctl/ioctl-number.rst | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst
> index 2e91370dc159..f759edafd938 100644
> --- a/Documentation/userspace-api/ioctl/ioctl-number.rst
> +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
> @@ -266,7 +266,6 @@ Code  Seq#    Include File                                           Comments
>  'o'   01-A1  `linux/dvb/*.h`                                         DVB
>  'p'   00-0F  linux/phantom.h                                         conflict! (OpenHaptics needs this)
>  'p'   00-1F  linux/rtc.h                                             conflict!
> -'p'   00-3F  linux/mc146818rtc.h                                     conflict!
>  'p'   40-7F  linux/nvram.h
>  'p'   80-9F  linux/ppdev.h                                           user-space parport
>                                                                       <mailto:tim@cyberelk.net>

Applied, thanks.

jon

      reply	other threads:[~2020-02-13 18:42 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-09 20:33 [PATCH] docs: userspace: ioctl-number: remove mc146818rtc conflict Alexandre Belloni
2020-02-13 18:42 ` Jonathan Corbet [this message]

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=20200213114222.220060b3@lwn.net \
    --to=corbet@lwn.net \
    --cc=alexandre.belloni@bootlin.com \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /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).