diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-03 09:50:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-03 09:50:26 -0700 |
| commit | 5e3b19d8165c2af2afee313c9b40eee55cf27a55 (patch) | |
| tree | 2e0f109adc9297e0a9e84ebdffa82e401f3ee996 /net/ipv6/addrconf.c | |
| parent | d0fa6ea10e438cfd4471ac196655fbb2c2b1329a (diff) | |
| parent | 2c0e8382386f618c85d20cb05e7cf7df8cdd382c (diff) | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"The two indirect syscall fixes have sat in linux-next for a few days.
I did check back with a hardware designer to ensure a SYNC is really
what's required for the GIC fix and so the GIC fix didn't make it into
to linux-next in time for this final pull request.
It builds in local build tests and passes Imagination's test system"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
irqchip: mips-gic: SYNC after enabling GIC region
MIPS: Remove pt_regs adjustments in indirect syscall handler
MIPS: seccomp: Fix indirect syscall args
Diffstat (limited to 'net/ipv6/addrconf.c')
0 files changed, 0 insertions, 0 deletions