diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-19 02:01:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-19 02:01:01 +0200 |
| commit | b3ee4edd8a18a5ff7c077b6b112692f1d6e9dd16 (patch) | |
| tree | 0b63e604976eb32a999b81a39fb55bd00c7e83fc /drivers/i2c/busses/i2c-rcar.c | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | MIPS: .its targets depend on vmlinux (diff) | |
| download | linux-b3ee4edd8a18a5ff7c077b6b112692f1d6e9dd16.tar.xz linux-b3ee4edd8a18a5ff7c077b6b112692f1d6e9dd16.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
- Three highmem fixes:
+ Fixed mapping initialization
+ Adjust the pkmap location
+ Ensure we use at most one page for PTEs
- Fix makefile dependencies for .its targets to depend on vmlinux
- Fix reversed condition in BNEZC and JIALC software branch emulation
- Only flush initialized flush_insn_slot to avoid NULL pointer
dereference
- perf: Remove incorrect odd/even counter handling for I6400
- ftrace: Fix init functions tracing
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: .its targets depend on vmlinux
MIPS: Fix bnezc/jialc return address calculation
MIPS: kprobes: flush_insn_slot should flush only if probe initialised
MIPS: ftrace: fix init functions tracing
MIPS: mm: adjust PKMAP location
MIPS: highmem: ensure that we don't use more than one page for PTEs
MIPS: mm: fixed mappings: correct initialisation
MIPS: perf: Remove incorrect odd/even counter handling for I6400
Diffstat (limited to 'drivers/i2c/busses/i2c-rcar.c')
0 files changed, 0 insertions, 0 deletions