sync with OpenBSD -current

etc/skel/dot.version

@@ -1 +1 @@
-# SecBSD 1.5-d2504b0: Mon Jul  1 00:00:00 UTC 2024 (Yatagarasu)
+# SecBSD 1.5-55f1360: Sat Jul  6 00:00:00 UTC 2024 (Yatagarasu)

sys/arch/arm64/dev/ampintc.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: ampintc.c,v 1.31 2023/09/22 01:10:43 jsg Exp $ */
+/* $OpenBSD: ampintc.c,v 1.32 2024/07/06 10:39:50 jsg Exp $ */
 /*
  * Copyright (c) 2007,2009,2011 Dale Rahn <drahn@openbsd.org>
  *
@@ -185,7 +185,6 @@ void		*ampintc_intr_establish_fdt(void *, int *, int,
 		    struct cpu_info *, int (*)(void *), void *, char *);
 void		 ampintc_intr_disestablish(void *);
 void		 ampintc_irq_handler(void *);
-const char	*ampintc_intr_string(void *);
 uint32_t	 ampintc_iack(void);
 void		 ampintc_eoi(uint32_t);
 void		 ampintc_set_priority(int, int);
@@ -897,16 +896,6 @@ ampintc_intr_disestablish(void *cookie)
 	free(ih, M_DEVBUF, sizeof(*ih));
 }
 
-const char *
-ampintc_intr_string(void *cookie)
-{
-	struct intrhand *ih = (struct intrhand *)cookie;
-	static char irqstr[1 + sizeof("ampintc irq ") + 4];
-
-	snprintf(irqstr, sizeof irqstr, "ampintc irq %d", ih->ih_irq);
-	return irqstr;
-}
-
 /*
  * GICv2m frame controller for MSI interrupts.
  */

sys/arch/arm64/stand/efiboot/efiboot.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: efiboot.c,v 1.55 2024/07/03 22:29:37 kettenis Exp $	*/
+/*	$OpenBSD: efiboot.c,v 1.56 2024/07/07 09:38:44 patrick Exp $	*/
 
 /*
  * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net>
@@ -1120,6 +1120,8 @@ struct smbios_dtb {
 	  "qcom/sc8280xp-lenovo-thinkpad-x13s.dtb" },
 	{ "LENOVO", "21BY",
 	  "qcom/sc8280xp-lenovo-thinkpad-x13s.dtb" },
+	{ "LENOVO", "83ED",
+	  "qcom/x1e80100-lenovo-yoga-slim7x.dtb" },
 };
 
 void *

sys/arch/i386/i386/ipifuncs.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipifuncs.c,v 1.36 2024/05/22 05:51:49 jsg Exp $	*/
+/*	$OpenBSD: ipifuncs.c,v 1.37 2024/07/07 03:03:09 jsg Exp $	*/
 /* $NetBSD: ipifuncs.c,v 1.1.2.3 2000/06/26 02:04:06 sommerfeld Exp $ */
 
 /*-
@@ -137,12 +137,6 @@ i386_ipi_wbinvd(struct cpu_info *ci)
 	wbinvd();
 }
 
-void
-i386_spurious(void)
-{
-	printf("spurious intr\n");
-}
-
 void
 i386_send_ipi(struct cpu_info *ci, int ipimask)
 {

sys/arch/i386/include/i82489var.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82489var.h,v 1.15 2021/03/11 11:16:57 jsg Exp $	*/
+/*	$OpenBSD: i82489var.h,v 1.16 2024/07/07 03:03:09 jsg Exp $	*/
 /*	$NetBSD: i82489var.h,v 1.1.2.2 2000/02/21 18:46:14 sommerfeld Exp $	*/
 
 /*-
@@ -68,7 +68,6 @@ i82489_writereg(int reg, u_int32_t val)
  * was delivered.. "Oh, sorry, i caught you at a bad time".
  * Low-order 4 bits must be all ones.
  */
-extern void i386_spurious(void);
 extern void Xintrspurious(void);
 #define LAPIC_SPURIOUS_VECTOR		0xef
 

sys/dev/pci/if_qwx_pci.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_qwx_pci.c,v 1.21 2024/07/05 21:24:13 patrick Exp $	*/
+/*	$OpenBSD: if_qwx_pci.c,v 1.22 2024/07/06 05:34:35 patrick Exp $	*/
 
 /*
  * Copyright 2023 Stefan Sperling <stsp@openbsd.org>
@@ -4130,7 +4130,7 @@ qwx_pci_intr(void *arg)
 				ret = 1;
 		}
 
-		if (test_bit(QWX_FLAG_EXT_IRQ_ENABLED, sc->sc_flags)) {
+		if (test_bit(ATH11K_FLAG_EXT_IRQ_ENABLED, sc->sc_flags)) {
 			for (i = 0; i < nitems(sc->ext_irq_grp); i++) {
 				if (qwx_dp_service_srng(sc, i))
 					ret = 1;

sys/nfs/nfs_vnops.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_vnops.c,v 1.200 2024/05/14 06:26:05 jsg Exp $	*/
+/*	$OpenBSD: nfs_vnops.c,v 1.201 2024/07/06 09:53:25 jsg Exp $	*/
 /*	$NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $	*/
 
 /*
@@ -88,7 +88,6 @@ int nfs_mkdir(void *);
 int nfs_mknod(void *);
 int nfs_mknodrpc(struct vnode *, struct vnode **, struct componentname *,
 	struct vattr *);
-int nfs_null(struct vnode *, struct ucred *, struct proc *);
 int nfs_open(void *);
 int nfs_pathconf(void *);
 int nfs_print(void *);
@@ -270,22 +269,6 @@ nfs_cache_enter(struct vnode *dvp, struct vnode *vp, struct componentname *cnp)
 	cache_enter(dvp, vp, cnp);
 }
 
-/*
- * nfs null call from vfs.
- */
-int
-nfs_null(struct vnode *vp, struct ucred *cred, struct proc *procp)
-{
-	struct nfsm_info	 info;
-	int			 error = 0;
-
-	info.nmi_mb = info.nmi_mreq = nfsm_reqhead(0);
-	info.nmi_errorp = &error;
-	error = nfs_request(vp, NFSPROC_NULL, &info);
-	m_freem(info.nmi_mrep);
-	return (error);
-}
-
 /*
  * nfs access vnode op.
  * For nfs version 2, just return ok. File accesses may fail later.

sys/ufs/ufs/ufs_extern.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_extern.h,v 1.40 2024/05/13 01:15:53 jsg Exp $	*/
+/*	$OpenBSD: ufs_extern.h,v 1.41 2024/07/07 01:39:06 jsg Exp $	*/
 /*	$NetBSD: ufs_extern.h,v 1.5 1996/02/09 22:36:03 christos Exp $	*/
 
 /*-
@@ -97,7 +97,6 @@ int ufs_getlbns(struct vnode *, daddr_t, struct indir *, int *);
 
 /* ufs_ihash.c */
 void ufs_ihashinit(void);
-struct vnode *ufs_ihashlookup(dev_t, ufsino_t);
 struct vnode *ufs_ihashget(dev_t, ufsino_t);
 int ufs_ihashins(struct inode *);
 void ufs_ihashrem(struct inode *);

sys/ufs/ufs/ufs_ihash.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_ihash.c,v 1.26 2021/10/19 06:11:45 semarie Exp $	*/
+/*	$OpenBSD: ufs_ihash.c,v 1.27 2024/07/07 01:39:06 jsg Exp $	*/
 /*	$NetBSD: ufs_ihash.c,v 1.3 1996/02/09 22:36:04 christos Exp $	*/
 
 /*
@@ -75,30 +75,6 @@ ufs_ihashinit(void)
 	arc4random_buf(&ihashkey, sizeof(ihashkey));
 }
 
-/*
- * Use the device/inum pair to find the incore inode, and return a pointer
- * to it. If it is in core, return it, even if it is locked.
- */
-struct vnode *
-ufs_ihashlookup(dev_t dev, ufsino_t inum)
-{
-        struct inode *ip;
-	struct ihashhead *ipp;
-
-	/* XXXLOCKING lock hash list */
-	ipp = INOHASH(dev, inum);
-	LIST_FOREACH(ip, ipp, i_hash) {
-		if (inum == ip->i_number && dev == ip->i_dev)
-			break;
-	}
-	/* XXXLOCKING unlock hash list? */
-
-	if (ip)
-		return (ITOV(ip));
-
-	return (NULLVP);
-}
-
 /*
  * Use the device/inum pair to find the incore inode, and return a pointer
  * to it. If it is in core, but locked, wait for it.

usr.sbin/cron/crontab.5

@@ -17,9 +17,9 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $OpenBSD: crontab.5,v 1.42 2023/05/06 23:06:27 millert Exp $
+.\" $OpenBSD: crontab.5,v 1.43 2024/07/06 15:33:17 jmc Exp $
 .\"
-.Dd $Mdocdate: May 6 2023 $
+.Dd $Mdocdate: July 6 2024 $
 .Dt CRONTAB 5
 .Os
 .Sh NAME
@@ -122,11 +122,11 @@ The command may be one or more fields long.
 The allowed values for the fields are:
 .Bl -column "day-of-month" "allowed values" -offset indent
 .It Sy field Ta Sy allowed values
-.It Ar minute Ta * or 0\(en59
+.It Ar minute Ta *, ~, or 0\(en59
-.It Ar hour Ta * or 0\(en23
+.It Ar hour Ta *, ~, or 0\(en23
-.It Ar day-of-month Ta * or 1\(en31
+.It Ar day-of-month Ta *, ~, or 1\(en31
-.It Ar month Ta * or 1\(en12 or a name (see below)
+.It Ar month Ta *, ~, 1\(en12, or a name (see below)
-.It Ar day-of-week Ta * or 0\(en7 or a name (0 or 7 is Sunday)
+.It Ar day-of-week Ta *, ~, 0\(en7, or a name (0 or 7 is Sunday)
 .It Ar user Ta a valid username
 .It Op Ar flags Ta runtime flags, denoted with '-'
 .It Ar command Ta text
@@ -147,15 +147,22 @@ For example,
 .Ar hour
 entry specifies execution at hours 8, 9, 10 and 11.
 .Pp
-A random value (within the legal range) may be obtained by using the
+A random value for a field may be obtained using the
 .Ql ~
-character in a field.
+character.
-The interval of the random value may be specified explicitly, for example
+A value is generated every time the tab is loaded.
+On its own,
+it denotes a random value appropriate for the field.
+It can also be used in a range to make the interval more specific.
+If either of the numbers in a range are omitted,
+the appropriate limit (low or high) for that field will be used.
+For example, both
 .Dq 0~30
-will result in a random value between 0 and 30 inclusive.
+and
-If either (or both) of the numbers on either side of the
+.Dq ~30
-.Ql ~
+in the
-are omitted, the appropriate limit (low or high) for the field will be used.
+.Ar minute
+field would result in a random value between 0 and 30.
 .Pp
 Step values can be used in conjunction with ranges.
 Following a range with