diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-18 13:58:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-18 13:58:38 -0800 |
| commit | fb1d8e0e2c50f374cfc244564decfc3f0a336cb4 (patch) | |
| tree | 8903198620726b46268e802b640e854fe78ab357 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm (diff) | |
| parent | ubifs: Fix journal replay wrt. xattr nodes (diff) | |
| download | wireguard-linux-fb1d8e0e2c50f374cfc244564decfc3f0a336cb4.tar.xz wireguard-linux-fb1d8e0e2c50f374cfc244564decfc3f0a336cb4.zip | |
Merge tag 'upstream-4.10-rc5' of git://git.infradead.org/linux-ubifs
Pull UBIFS fixes from Richard Weinberger:
"This contains fixes for UBIFS:
- a long standing issue in UBIFS journal replay code
- fallout from the merge window"
* tag 'upstream-4.10-rc5' of git://git.infradead.org/linux-ubifs:
ubifs: Fix journal replay wrt. xattr nodes
ubifs: remove redundant checks for encryption key
ubifs: allow encryption ioctls in compat mode
ubifs: add CONFIG_BLOCK dependency for encryption
ubifs: fix unencrypted journal write
ubifs: ensure zero err is returned on successful return
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions