diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-25 09:31:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-25 09:31:06 -0700 |
commit | e33c4963bf536900f917fb65a687724d5539bc21 (patch) | |
tree | 780bd1e53465a86824aae855a8d8762478677dbd /include/net/macsec.h | |
parent | Merge tag 'for-linus-2024042501' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | Revert "NFSD: Convert the callback workqueue to use delayed_work" (diff) | |
download | linux-e33c4963bf536900f917fb65a687724d5539bc21.tar.gz linux-e33c4963bf536900f917fb65a687724d5539bc21.tar.bz2 linux-e33c4963bf536900f917fb65a687724d5539bc21.zip |
Merge tag 'nfsd-6.9-5' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fixes from Chuck Lever:
- Revert some backchannel fixes that went into v6.9-rc
* tag 'nfsd-6.9-5' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
Revert "NFSD: Convert the callback workqueue to use delayed_work"
Revert "NFSD: Reschedule CB operations when backchannel rpc_clnt is shut down"
Diffstat (limited to 'include/net/macsec.h')
0 files changed, 0 insertions, 0 deletions