5 files changed, 19 insertions, 5 deletions
diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c
index 59783592a370..4e51167b401a 100644
--- a/lib/libpfctl/libpfctl.c
+++ b/lib/libpfctl/libpfctl.c
@@ -1929,6 +1929,8 @@ static const struct snl_attr_parser nla_p_skey[] = {
 SNL_DECLARE_ATTR_PARSER(skey_parser, nla_p_skey);
 #undef _OUT
 
+SNL_DECLARE_ATTR_PARSER(rule_parser, ap_getrule);
+
 #define	_IN(_field)	offsetof(struct genlmsghdr, _field)
 #define	_OUT(_field)	offsetof(struct pfctl_state, _field)
 static struct snl_attr_parser ap_state[] = {
@@ -1963,6 +1965,7 @@ static struct snl_attr_parser ap_state[] = {
 	{ .type = PF_ST_RT_IFNAME, .off = _OUT(rt_ifname), .cb = snl_attr_store_ifname },
 	{ .type = PF_ST_SRC_NODE_FLAGS, .off = _OUT(src_node_flags), .cb = snl_attr_get_uint8 },
 	{ .type = PF_ST_RT_AF, .off = _OUT(rt_af), .cb = snl_attr_get_uint8 },
+	{ .type = PF_ST_CREATED_BY_RULE, .off = _OUT(created_by_rule), .arg = &rule_parser, .cb = snl_attr_get_nested },
 };
 #undef _IN
 #undef _OUT
@@ -1988,6 +1991,7 @@ pfctl_get_states_h(struct pfctl_handle *h, struct pfctl_state_filter *filter, pf
 	snl_add_msg_attr_u8(&nw, PF_ST_AF, filter->af);
 	snl_add_msg_attr_ip6(&nw, PF_ST_FILTER_ADDR, &filter->addr.v6);
 	snl_add_msg_attr_ip6(&nw, PF_ST_FILTER_MASK, &filter->mask.v6);
+	snl_add_msg_attr_bool(&nw, PF_ST_INCLUDE_RULE, filter->include_rule);
 
 	hdr = snl_finalize_msg(&nw);
 	if (hdr == NULL)
@@ -2009,7 +2013,7 @@ pfctl_get_states_h(struct pfctl_handle *h, struct pfctl_state_filter *filter, pf
 			return (ret);
 	}
 
-	return (0);
+	return (e.error);
 }
 
 int
diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h
index 1012be53db65..3080209ec7a0 100644
--- a/lib/libpfctl/libpfctl.h
+++ b/lib/libpfctl/libpfctl.h
@@ -406,6 +406,7 @@ struct pfctl_state {
 	char			 rt_ifname[IFNAMSIZ];
 	sa_family_t		 rt_af;
 	uint8_t			 src_node_flags;
+	struct pfctl_rule	 created_by_rule;
 };
 
 TAILQ_HEAD(pfctl_statelist, pfctl_state);
@@ -504,6 +505,7 @@ struct pfctl_state_filter {
 	sa_family_t		af;
 	struct pf_addr		addr;
 	struct pf_addr		mask;
+	bool			include_rule;
 };
 typedef int (*pfctl_get_state_fn)(struct pfctl_state *, void *);
 int pfctl_get_states_iter(pfctl_get_state_fn f, void *arg);
diff --git a/lib/libsys/intro.2 b/lib/libsys/intro.2
index 008936b278ae..33dfecf648c5 100644
--- a/lib/libsys/intro.2
+++ b/lib/libsys/intro.2
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 19, 2024
+.Dd May 7, 2026
 .Dt INTRO 2
 .Os
 .Sh NAME
@@ -756,7 +756,8 @@ during a system boot.
 .El
 .Sh SEE ALSO
 .Xr intro 3 ,
-.Xr perror 3
+.Xr perror 3 ,
+.Xr dtrace_syscall 4
 .Sh HISTORY
 The
 .Nm Ns Pq 2
diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h
index 623b56fb273b..46a2ed5eb8a6 100644
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
@@ -119,6 +119,13 @@ enum libusb_endpoint_direction {
 
 #define	LIBUSB_TRANSFER_TYPE_MASK	0x03
 
+enum libusb_endpoint_transfer_type {
+	LIBUSB_ENDPOINT_TRANSFER_TYPE_CONTROL = 0,
+	LIBUSB_ENDPOINT_TRANSFER_TYPE_ISOCHRONOUS = 1,
+	LIBUSB_ENDPOINT_TRANSFER_TYPE_BULK = 2,
+	LIBUSB_ENDPOINT_TRANSFER_TYPE_INTERRUPT = 3,
+};
+
 enum libusb_transfer_type {
 	LIBUSB_TRANSFER_TYPE_CONTROL = 0,
 	LIBUSB_TRANSFER_TYPE_ISOCHRONOUS = 1,
diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c
index b3af017ab980..56c9caedab16 100644
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
@@ -1769,14 +1769,14 @@ libusb10_cancel_all_transfer_locked(struct libusb20_device *pdev, struct libusb_
 		if (sxfer == NULL)
 			continue;
 		/* complete pending transfer */
-		libusb10_complete_transfer(xfer, sxfer, LIBUSB_TRANSFER_ERROR);
+		libusb10_complete_transfer(xfer, sxfer, LIBUSB_TRANSFER_CANCELLED);
 	}
 
 	while ((sxfer = TAILQ_FIRST(&dev->tr_head))) {
 		TAILQ_REMOVE(&dev->tr_head, sxfer, entry);
 
 		/* complete pending transfer */
-		libusb10_complete_transfer(NULL, sxfer, LIBUSB_TRANSFER_ERROR);
+		libusb10_complete_transfer(NULL, sxfer, LIBUSB_TRANSFER_CANCELLED);
 	}
 }