diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-27 16:44:58 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-27 16:44:58 -1000 |
| commit | d1b0949f23a343d3153d5c681fb1866538534227 (patch) | |
| tree | 5bd6d0eb56ede3c80d5b525722f115a7765590c6 /arch | |
| parent | 56567a20b22bdbf85c3e55eee3bf2bd23fa2f108 (diff) | |
| parent | dc32464a5fe4946fe1a4d8f8e29961dc411933c5 (diff) | |
Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc filesystem fixes from Al Viro:
"Assorted fixes all over the place: literally nothing in common, could
have been three separate pull requests.
All are simple regression fixes, but not for anything from this cycle"
* tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
ceph_wait_on_conflict_unlink(): grab reference before dropping ->d_lock
io_uring: kiocb_done() should *not* trust ->ki_pos if ->{read,write}_iter() failed
sparc32: fix a braino in fault handling in csum_and_copy_..._user()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/lib/checksum_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/lib/checksum_32.S b/arch/sparc/lib/checksum_32.S index 84ad709cbecb..66eda40fce36 100644 --- a/arch/sparc/lib/checksum_32.S +++ b/arch/sparc/lib/checksum_32.S @@ -453,5 +453,5 @@ ccslow: cmp %g1, 0 * we only bother with faults on loads... */ cc_fault: - ret + retl clr %o0 |