diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-22 06:37:50 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-22 06:37:50 -1000 |
| commit | 7e6d8f83585b64603419c8b846f4961f9dbfa279 (patch) | |
| tree | 083cac809b9f18fe7c390e7577cd7c39fb1dc3bf /net/unix/sysctl_net_unix.c | |
| parent | c8107ed99ad02d519d4fc1c3017ac7cede47e788 (diff) | |
| parent | 8eba3651f1dad49c83bb7f8d672301dac4c6add6 (diff) | |
Merge branch '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
- Fix a build error on MSP71xx which used to rely on somehow magically
<asm/setup.h> being pulled in which no longer happens.
- Fix the __write_64bit_c0_split inline assembler where there was the
theoretical possibility of GCC interpret the constraints such that
bad code could result.
- A __init was causing section mismatch errors on Alchemy. Just to be
on the safe side, Manuel's patch does away with all of them.
- Fix perf event init.
* '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: PCI: fix pcibios_map_irq section mismatch
MIPS: Fix input modify in __write_64bit_c0_split()
MIPS: MSP71xx: Include asm/setup.h
MIPS: Fix perf event init
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions