diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-09-05 20:27:09 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-09-12 17:11:24 -0700 |
| commit | 46ae4d0a489741565520195bddebc3414781e603 (patch) | |
| tree | b364bb2c6808d4d1ae4e00c46c123caf7fffe618 /fs/netfs/io.c | |
| parent | 3cfb5aa10cb78571e214e48a3a6e42c11d5288a1 (diff) | |
| parent | 5abfdfd402699ce7c1e81d1a25bc37f60f7741ff (diff) | |
| download | linux-46ae4d0a489741565520195bddebc3414781e603.tar.gz linux-46ae4d0a489741565520195bddebc3414781e603.tar.bz2 linux-46ae4d0a489741565520195bddebc3414781e603.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts (sort of) and no adjacent changes.
This merge reverts commit b3c9e65eb227 ("net: hsr: remove seqnr_lock")
from net, as it was superseded by
commit 430d67bdcb04 ("net: hsr: Use the seqnr lock for frames received via interlink port.")
in net-next.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'fs/netfs/io.c')
| -rw-r--r-- | fs/netfs/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/netfs/io.c b/fs/netfs/io.c index 943128507af5..d6ada4eba744 100644 --- a/fs/netfs/io.c +++ b/fs/netfs/io.c @@ -270,7 +270,7 @@ static void netfs_reset_subreq_iter(struct netfs_io_request *rreq, if (count == remaining) return; - _debug("R=%08x[%u] ITER RESUB-MISMATCH %zx != %zx-%zx-%llx %x\n", + _debug("R=%08x[%u] ITER RESUB-MISMATCH %zx != %zx-%zx-%llx %x", rreq->debug_id, subreq->debug_index, iov_iter_count(&subreq->io_iter), subreq->transferred, subreq->len, rreq->i_size, |