| Message ID | 20170526183229.193ef0eb@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 308d263d3f28e816b0d7425ef8b35d69643b7ee0 |
| Headers | show |
On Fri, May 26, 2017 at 10:32 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi all, > > The arch version is identical except for comments and white space. > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Arnd Bergmann <arnd@arndb.de>
Hi Arnd, On Fri, 26 May 2017 11:59:23 +0200 Arnd Bergmann <arnd@arndb.de> wrote: > > On Fri, May 26, 2017 at 10:32 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi all, > > > > The arch version is identical except for comments and white space. > > > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > > Acked-by: Arnd Bergmann <arnd@arndb.de> Thanks.
On Fri, 2017-05-26 at 08:32:29 UTC, Stephen Rothwell wrote: > Hi all, > > The arch version is identical except for comments and white space. > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > Acked-by: Arnd Bergmann <arnd@arndb.de> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/308d263d3f28e816b0d7425ef8b35d cheers
diff --git a/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index 9aba4af4122e..0d960ef78a9a 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -4,4 +4,5 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += param.h generic-y += poll.h generic-y += resource.h +generic-y += sockios.h generic-y += statfs.h diff --git a/arch/powerpc/include/uapi/asm/sockios.h b/arch/powerpc/include/uapi/asm/sockios.h deleted file mode 100644 index 55cef7675a31..000000000000 --- a/arch/powerpc/include/uapi/asm/sockios.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _ASM_POWERPC_SOCKIOS_H -#define _ASM_POWERPC_SOCKIOS_H - -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ - -/* Socket-level I/O control calls. */ -#define FIOSETOWN 0x8901 -#define SIOCSPGRP 0x8902 -#define FIOGETOWN 0x8903 -#define SIOCGPGRP 0x8904 -#define SIOCATMARK 0x8905 -#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ -#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ - -#endif /* _ASM_POWERPC_SOCKIOS_H */
Hi all, The arch version is identical except for comments and white space. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/powerpc/include/uapi/asm/Kbuild | 1 + arch/powerpc/include/uapi/asm/sockios.h | 20 -------------------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 arch/powerpc/include/uapi/asm/sockios.h This follows on from my previous "powerpc: use the asm-genric versions of some uapi includes".