| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20200213114222.220060b3@lwn.net> Date: Thu, 13 Feb 2020 11:42:22 -0700 From: Jonathan Corbet <corbet@....net> To: Alexandre Belloni <alexandre.belloni@...tlin.com> Cc: linux-doc@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: [PATCH] docs: userspace: ioctl-number: remove mc146818rtc conflict On Sun, 9 Feb 2020 21:33:04 +0100 Alexandre Belloni <alexandre.belloni@...tlin.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@...tlin.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@...erelk.net> Applied, thanks. jon
Powered by blists - more mailing lists