summaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/objectid.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-12-14 05:13:05 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2017-12-14 05:13:05 +0100
commit4e746cf4f721d6397bace501f5feadb46eec1314 (patch)
treecdae0fd17a74cae07c5fb55c7112d8aa038b7837 /fs/reiserfs/objectid.c
parentMerge tag 'platform-drivers-x86-v4.15-3' of git://git.infradead.org/linux-pla... (diff)
parentRISC-V: Remove unused CONFIG_HVC_RISCV_SBI code (diff)
downloadlinux-4e746cf4f721d6397bace501f5feadb46eec1314.tar.xz
linux-4e746cf4f721d6397bace501f5feadb46eec1314.zip
Merge tag 'riscv-for-linus-4.15-rc4-riscv_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux
Pull RISC-V fixes from Palmer Dabbelt: "This contains three small fixes: - A fix to a typo in sys_riscv_flush_icache. This only effects error handling, but I think it's a small and obvious enough change that it's sane outside the merge window. - The addition of smp_mb__after_spinlock(), which was recently removed due to an incorrect comment. This is largly a comment change (as there's a big one now), and while it's necessary for complience with the RISC-V memory model the lack of this fence shouldn't manifest as a bug on current implementations. Nonetheless, it still seems saner to have the fence in 4.15. - The removal of some of the HVC_RISCV_SBI driver that snuck into the arch port. This is compile-time dead code in 4.15 (as the driver isn't in yet), and during the review process we found a better way to implement early printk on RISC-V. While this change doesn't do anything, it will make staging our HVC driver easier: without this change the HVC driver we hope to upstream won't build on 4.15 (because the 4.15 arch code would reference a function that no longer exists). I don't think this is the last patch set we'll want for 4.15: I think I'll want to remove some of the first-level irqchip driver that snuck in as well, which will look a lot like the HVC patch here. This is pending some asm-generic cleanup I'm doing that I haven't quite gotten clean enough to send out yet, though, but hopefully it'll be ready by next week (and still OK for that late)" * tag 'riscv-for-linus-4.15-rc4-riscv_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux: RISC-V: Remove unused CONFIG_HVC_RISCV_SBI code RISC-V: Resurrect smp_mb__after_spinlock() RISC-V: Logical vs Bitwise typo
Diffstat (limited to 'fs/reiserfs/objectid.c')
0 files changed, 0 insertions, 0 deletions