From: Thierry Reding <thierry.reding@gmail.com>
To: Eric Dumazet <edumazet@google.com>, Helge Deller <deller@gmx.de>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org,
Parisc List <linux-parisc@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the net-next tree
Date: Tue, 22 Oct 2013 17:10:45 +0200 [thread overview]
Message-ID: <1382454649-16442-1-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1382369814-7582-1-git-send-email-treding@nvidia.com>
Today's linux-next merge of the net-next tree got a conflict in
arch/parisc/include/uapi/asm/socket.h
caused by commits 62748f3 (net: introduce SO_MAX_PACING_RATE) and 1a0e62d
(parisc: break out SOCK_NONBLOCK define to own asm header file).
I fixed it up (see below). Please verify that the resolution looks good.
Thanks,
Thierry
---
diff --cc arch/parisc/include/uapi/asm/socket.h
index 9f2174f,7c614d0..f33113a
--- a/arch/parisc/include/uapi/asm/socket.h
+++ b/arch/parisc/include/uapi/asm/socket.h
@@@ -75,4 -75,11 +75,6 @@@
#define SO_BUSY_POLL 0x4027
+ #define SO_MAX_PACING_RATE 0x4048
+
-/* 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 */
next prev parent reply other threads:[~2013-10-22 15:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-21 15:36 linux-next: Tree for Oct 21 Thierry Reding
2013-10-21 23:20 ` linux-next: Tree for Oct 21 (panel-simple.c) Randy Dunlap
2013-10-22 8:10 ` Thierry Reding
2013-10-22 0:58 ` linux-next: Tree for Oct 21 (sound/pci/hda/patch_hdmi.c) Randy Dunlap
2013-10-22 7:42 ` Takashi Iwai
2013-10-22 15:10 ` Thierry Reding [this message]
2013-10-22 15:10 ` linux-next: manual merge of the wireless-next tree Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the drm tree Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the arm-soc tree Thierry Reding
2013-10-23 12:19 ` Tony Lindgren
2013-10-22 15:10 ` linux-next: manual merge of the mvebu tree Thierry Reding
2013-10-23 8:59 ` Jason Cooper
-- strict thread matches above, loose matches on Subject: below --
2013-10-18 13:05 linux-next: manual merge of the net-next tree Mark Brown
2013-10-18 12:58 Mark Brown
2013-10-18 13:08 ` Neil Horman
2013-10-18 14:39 ` Vlad Yasevich
2013-10-08 13:44 linux-next: Tree for Oct 8 Thierry Reding
2013-10-08 13:44 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
2013-09-30 11:26 ` linux-next: manual merge of the net-next tree Thierry Reding
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=1382454649-16442-1-git-send-email-treding@nvidia.com \
--to=thierry.reding@gmail.com \
--cc=davem@davemloft.net \
--cc=deller@gmx.de \
--cc=edumazet@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=netdev@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).