Linux-Doc Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] docs: userspace: ioctl-number: remove mc146818rtc conflict
@ 2020-02-09 20:33 Alexandre Belloni
  2020-02-13 18:42 ` Jonathan Corbet
  0 siblings, 1 reply; 2+ messages in thread
From: Alexandre Belloni @ 2020-02-09 20:33 UTC (permalink / raw)
  To: Jonathan Corbet; +Cc: linux-doc, linux-kernel, Alexandre Belloni

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>
-- 
2.24.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] docs: userspace: ioctl-number: remove mc146818rtc conflict
  2020-02-09 20:33 [PATCH] docs: userspace: ioctl-number: remove mc146818rtc conflict Alexandre Belloni
@ 2020-02-13 18:42 ` Jonathan Corbet
  0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Corbet @ 2020-02-13 18:42 UTC (permalink / raw)
  To: Alexandre Belloni; +Cc: linux-doc, linux-kernel

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-09 20:33 [PATCH] docs: userspace: ioctl-number: remove mc146818rtc conflict Alexandre Belloni
2020-02-13 18:42 ` Jonathan Corbet

Linux-Doc Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-doc/0 linux-doc/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-doc linux-doc/ https://lore.kernel.org/linux-doc \
		linux-doc@vger.kernel.org
	public-inbox-index linux-doc

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-doc


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git