diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-02 18:47:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-02 18:47:23 -0700 |
| commit | aea7fab8bac68860f3eb2e8127f9ea698475c0c4 (patch) | |
| tree | 3a961e8135e8dbf5316a4b3ab22b3ce3368ade96 /net/unix/af_unix.c | |
| parent | ipc: set msg back to -EAGAIN if copy wasn't performed (diff) | |
| parent | Fix breakage in MIPS siginfo handling (diff) | |
| download | wireguard-linux-aea7fab8bac68860f3eb2e8127f9ea698475c0c4.tar.xz wireguard-linux-aea7fab8bac68860f3eb2e8127f9ea698475c0c4.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"A collection of fixes pretty much across the MIPS code. Even the
change to include/linux/signal.h by David Howells' 2a1486981c13 ("Fix
breakage in MIPS siginfo handling") should be considered MIPS-specific
as it touches an ifdefed segment that is only relevant to MIPS and
which unfortunately can't be made to go away entirely."
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
Fix breakage in MIPS siginfo handling
Revert "MIPS: BCM63XX: Call board_register_device from device_initcall()"
MIPS: BCM63XX: Make nvram checksum failure non fatal
MIPS: Fix code generation for non-DSP capable CPUs
MIPS: Fix inconsistent formatting inside /proc/cpuinfo
MIPS: SEAD3: Enable LL/SC.
MIPS: Get rid of CONFIG_CPU_HAS_LLSC again
MIPS: Add dependencies for HAVE_ARCH_TRANSPARENT_HUGEPAGE
MIPS: VR4133: Fix probe for LL/SC.
MIPS: Fix logic errors in bitops.c
MIPS: Use CONFIG_CPU_MIPSR2 in csum_partial.S
MIPS: compat: Return same error ENOSYS as native for invalid operation.
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions