| commit | 1612e111e4e565422242727efb59499cce8738e4 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 7 Jun 2013 01:09:05 +0000 (6 18:09 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 7 Jun 2013 01:09:05 +0000 (6 18:09 -0700) | ||
| tree | 83c9db56186ab66fdb17c946944cba870665cfc5 | treesnapshot (tar.gz zip) |
| parent | e2b02e25c5e9c2b5c8da22d8ca7efadc1b4e5468 | commitdiff |
| parent | a7526eb5d06b0084ef12d7b168d008fcf516caab | commitdiff |
Merge git://git./linux/kernel/git/davem/net
Pull networking fix from David Miller:
"This is a quick one commit pull request to cure the regression
introduced by the MSG_CMSG_COMPAT change."
(Background: commit 1be374a0518a completely broke 32-bit COMPAT handling
by not only disallowing MSG_CMSG_COMPAT from user APIs, but clearing it
in our own internal use too!)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
net: Unbreak compat_sys_{send,recv}msg
Pull networking fix from David Miller:
"This is a quick one commit pull request to cure the regression
introduced by the MSG_CMSG_COMPAT change."
(Background: commit 1be374a0518a completely broke 32-bit COMPAT handling
by not only disallowing MSG_CMSG_COMPAT from user APIs, but clearing it
in our own internal use too!)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
net: Unbreak compat_sys_{send,recv}msg