From: Luis Henriques <luis.henriques@canonical.com>
To: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org, linux-parisc@vger.kernel.org
Subject: Re: [PATCH] parisc: break out SOCK_NONBLOCK define to own asm header file
Date: Tue, 3 Dec 2013 19:28:05 +0000 [thread overview]
Message-ID: <20131203192805.GA15906@hercules> (raw)
In-Reply-To: <20131130224227.GA23795@p100.box>
On Sat, Nov 30, 2013 at 11:42:27PM +0100, Helge Deller wrote:
> Dear stable kernel maintainers,
>
> Can you please schedule this patch for inclusion starting from kernel 3.7+ ?
>
> Upstream commit:
> 38c7937 parisc: break out SOCK_NONBLOCK define to own asm header file
>
> Cherry-picking will probably not work easily because of this patch which went
> in before: 62748f3 net: introduce SO_MAX_PACING_RATE
>
> Thanks,
> Helge
Thank you, I am queuing this patch for the 3.11 kernel.
Cheers,
--
Luis
>
> ---------------- parisc: break out SOCK_NONBLOCK define to own asm
> header file
>
> Break SOCK_NONBLOCK out to its own asm-file as other arches do. This
> fixes build errors with auditd and probably other packages.
>
> Signed-off-by: Helge Deller <deller@gmx.de>
>
> diff --git a/arch/parisc/include/asm/socket.h b/arch/parisc/include/asm/socket.h
> new file mode 100644
> index 0000000..748016c
> --- /dev/null
> +++ b/arch/parisc/include/asm/socket.h
> @@ -0,0 +1,11 @@
> +#ifndef _ASM_SOCKET_H
> +#define _ASM_SOCKET_H
> +
> +#include <uapi/asm/socket.h>
> +
> +/* O_NONBLOCK clashes with the bits used for socket types. Therefore we
> + * have to define SOCK_NONBLOCK to a different value here.
> + */
> +#define SOCK_NONBLOCK 0x40000000
> +
> +#endif /* _ASM_SOCKET_H */
> diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h
> index 71700e6..9f2174f 100644
> --- a/arch/parisc/include/uapi/asm/socket.h
> +++ b/arch/parisc/include/uapi/asm/socket.h
> @@ -1,5 +1,5 @@
> -#ifndef _ASM_SOCKET_H
> -#define _ASM_SOCKET_H
> +#ifndef _UAPI_ASM_SOCKET_H
> +#define _UAPI_ASM_SOCKET_H
>
> #include <asm/sockios.h>
>
> @@ -75,9 +75,4 @@
>
> #define SO_BUSY_POLL 0x4027
>
> -/* O_NONBLOCK clashes with the bits used for socket types. Therefore we
> - * have to define SOCK_NONBLOCK to a different value here.
> - */
> -#define SOCK_NONBLOCK 0x40000000
> -
> -#endif /* _ASM_SOCKET_H */
> +#endif /* _UAPI_ASM_SOCKET_H */
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2013-12-03 19:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-30 22:42 [PATCH] parisc: break out SOCK_NONBLOCK define to own asm header file Helge Deller
2013-12-03 19:28 ` Luis Henriques [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-10-14 19:04 Helge Deller
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=20131203192805.GA15906@hercules \
--to=luis.henriques@canonical.com \
--cc=deller@gmx.de \
--cc=linux-parisc@vger.kernel.org \
--cc=stable@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).