The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=403cc016c07aada3ee0a578e484297df452b8bb3
commit 403cc016c07aada3ee0a578e484297df452b8bb3 Author: Warner Losh <[email protected]> AuthorDate: 2024-07-20 04:16:59 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2024-07-20 04:16:59 +0000 cam/iosched: Fix build I was testing this in several trees, and this chunk was in the tree I tested. I didn't detect the mismerge before the commit... Fixes: 6f1dd6071a91 Sponsored by: Netflix --- sys/cam/cam_iosched.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c index 5f171e402ed2..4f4a2b2cde55 100644 --- a/sys/cam/cam_iosched.c +++ b/sys/cam/cam_iosched.c @@ -48,6 +48,8 @@ #include <ddb/ddb.h> +#include <geom/geom_disk.h> + static MALLOC_DEFINE(M_CAMSCHED, "CAM I/O Scheduler", "CAM I/O Scheduler buffers");
