diff --git a/COPYRIGHT b/COPYRIGHT index 864fe5c654e1637da0cf8272498d9d45282cecd2..3cf4fa96155195d4456f65b181cdd56a9654fe6f 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,10 +1,9 @@ -# $FreeBSD: releng/12.2/COPYRIGHT 356232 2019-12-31 16:04:16Z gjb $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2020 The FreeBSD Project. +Copyright (c) 1992-2021 The FreeBSD Project. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/LOCKS b/LOCKS index d8541951304277e464793a5e5cc3ef96e25c1069..1e2effdfca34a2b69d805a7d7dda97ced6b55d87 100644 --- a/LOCKS +++ b/LOCKS @@ -1,4 +1,4 @@ -$FreeBSD: releng/12.2/LOCKS 334871 2018-06-09 03:08:04Z eadler $ +$FreeBSD$ This file documents formal review/approval requirements that have been approved by core. diff --git a/MAINTAINERS b/MAINTAINERS index d33179f8493d36d75952b476ea0ad9ee24b4a609..09ee157eb12897cfbbf9ea025454cb87b51a6ee7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,4 +1,4 @@ -$FreeBSD: releng/12.2/MAINTAINERS 365733 2020-09-14 22:42:17Z erj $ +$FreeBSD$ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -35,8 +35,11 @@ makes a commit to the specified subtree. subsystem login notes ----------------------------- -atf freebsd-testing,jmmv,ngie Pre-commit review requested. ath(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +contrib/atf ngie,#test Pre-commit review requested. +contrib/capsicum-test ngie,#capsicum,#test Pre-commit review requested. +contrib/googletest ngie,#test Pre-commit review requested. +contrib/ipfilter cy Pre-commit review requested. contrib/libcxxrt dim,emaste Pre-commit review preferred. contrib/llvm-project/compiler-rt dim Pre-commit review preferred. contrib/llvm-project/libcxx dim Pre-commit review preferred. @@ -44,6 +47,8 @@ contrib/llvm-project/libunwind dim,emaste,jhb Pre-commit review preferred. contrib/llvm-project/lldb dim,emaste Pre-commit review preferred. contrib/llvm-project/llvm dim Pre-commit review preferred. contrib/llvm-project/openmp dim,emaste Pre-commit review preferred. +contrib/netbsd-tests ngie,#test Pre-commit review requested. +contrib/pjdfstest asomers,ngie,pjd,#test Pre-commit review requested. *env(3) secteam Due to the problematic security history of this code, please have patches reviewed by secteam. etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. @@ -77,6 +82,8 @@ pci bus imp,jhb Pre-commit review requested. pmcstudy(8) rrs Pre-commit review requested. procfs des Pre-commit review requested, email only. pseudofs des Pre-commit review requested, email only. +random(4), +random(9) csprng Pre-commit discussion and review required, release/release.sh gjb,re Pre-commit review and regression tests requested. sctp rrs,tuexen Pre-commit review requested (changes need to be backported to github). @@ -85,11 +92,17 @@ sh(1) jilles Pre-commit review requested. This also applies to kill(1), printf(1) and test(1) which are compiled in as builtins. share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. -share/mk/*.test.mk freebsd-testing,ngie (same list as share/mk too) Pre-commit review requested. +share/mk/*.test.mk imp,bapt,bdrewery, Pre-commit review requested. + emaste,ngie,sjg,#test stand/forth dteske Pre-commit review requested. stand/lua kevans Pre-commit review requested -sys/compat/linuxkpi hselasky If in doubt, ask. +sys/compat/linuxkpi hselasky If in doubt, ask. + zeising, johalun pre-commit review requested via + #x11 phabricator group. + (to avoid drm graphics drivers + impact) sys/contrib/dev/ice erj Pre-commit phabricator review requested. +sys/contrib/ipfilter cy Pre-commit review requested. sys/dev/e1000 erj Pre-commit phabricator review requested. sys/dev/ixgbe erj Pre-commit phabricator review requested. sys/dev/ixl erj Pre-commit phabricator review requested. @@ -101,16 +114,25 @@ sys/netinet/ip_carp.c glebius Pre-commit review recommended. sys/netpfil/pf kp,glebius Pre-commit review recommended. sys/x86/xen royger Pre-commit review recommended. sys/xen royger Pre-commit review recommended. -tests freebsd-testing,ngie Pre-commit review requested. +tests ngie,#test Pre-commit review requested. +tools/build imp Pre-commit review requested, especially to fix bootstrap issues. top(1) eadler Pre-commit review requested. usr.sbin/bsdconfig dteske Pre-commit phabricator review requested. usr.sbin/dpv dteske Pre-commit review requested. Keep in sync with libdpv. usr.sbin/pkg pkg@ Please coordinate behavior or flag changes with pkg team. usr.sbin/sysrc dteske Pre-commit phabricator review requested. Keep in sync with bsdconfig(8) sysrc.subr. -vmm(4) tychon, jhb Pre-commit review requested. +vmm(4) jhb, grehan Pre-commit review requested via #bhyve + phabricator group. +libvmmapi jhb, grehan Pre-commit review requested via #bhyve + phabricator group. +usr.sbin/bhyve* jhb, grehan Pre-commit review requested via #bhyve + phabricator group. autofs(5) trasz Pre-commit review recommended. iscsi(4) trasz Pre-commit review recommended. rctl(8) trasz Pre-commit review recommended. sys/dev/ofw nwhitehorn Pre-commit review recommended. +sys/dev/drm* imp Pre-commit review requested in phabricator. Changes need to + be mirrored in github repo. +sys/dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org sys/arm/allwinner manu Pre-commit review requested sys/arm64/rockchip manu Pre-commit review requested diff --git a/README b/README index f896d13e6114a4c41ec35ad968a165900103d8b3..a7e97b027b399b18a2291037f683bb4fec134b8c 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: -$FreeBSD: releng/12.2/README 335299 2018-06-17 19:44:24Z eadler $ +$FreeBSD$ FreeBSD is an operating system used to power modern servers, desktops, and embedded platforms. A large community has @@ -35,8 +35,9 @@ crypto Cryptography stuff (see crypto/README). etc Template files for /etc. -gnu Various commands and libraries under the GNU Public License. - Please see gnu/COPYING* for more information. +gnu Commands and libraries under the GNU General Public License + (GPL) or Lesser General Public License (LGPL). Please see + gnu/COPYING* for more information. include System include files. diff --git a/README.OpenSource b/README.OpenSource index 900708f73c653512a611c1566bd2b8e694dcc883..7dfc1d61ff43560ee187124892e5faea67a96be4 100644 --- a/README.OpenSource +++ b/README.OpenSource @@ -3,7 +3,7 @@ "Name" : "FreeBSD", "License" : "BSD 2-Clause License", "License File" : "COPYRIGHT", - "Version Number" : "12.2", + "Version Number" : "13.1", "Owner" : "tonghaoyang1@huawei.com", "Upstream URL" : "http://www.freebsd.org/", "Description" : "FreeBSD is an operating system used to power modern servers, desktops, and embedded platforms." diff --git a/UPDATING b/UPDATING index 1ef73da6fa7190da639c0af9745e3a4feb884851..cf87aedb8121d08759bc73a7fc56dd29c65479f7 100644 --- a/UPDATING +++ b/UPDATING @@ -1,4 +1,4 @@ - Updating Information for FreeBSD stable/12 users. + Updating Information for FreeBSD stable/13 users. This file is maintained and copyrighted by M. Warner Losh . See end of file for further details. For commonly done items, please see the @@ -9,63 +9,314 @@ handbook: https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html Items affecting the ports and packages system can be found in -/usr/ports/UPDATING. Please read that file before running portupgrade. - -NOTE: FreeBSD has switched from gcc to clang. If you have trouble bootstrapping -from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to -the tip of head, and then rebuild without this option. The bootstrap process -from older version of current across the gcc/clang cutover is a bit fragile. - -20201027: - 12.2-RELEASE. - -20200915: p1 FreeBSD-SA-20:27.ure - FreeBSD-SA-20:28.bhyve_vmcs - FreeBSD-SA-20:29.bhyve_svm - FreeBSD-SA-20:30.ftpd - - Fix ure device driver susceptible to packet-in-packet attack. - [SA-20:27.ure] - - Fix bhyve privilege escalation via VMCS access. [SA-20:28.bhyve_vmcs] - - Fix bhyve SVM guest escape. [SA-20:29.bhyve_svm] - - Fix ftpd privilege escalation via ftpchroot. [SA-20:30.ftpd] - -20200912: - The make.conf(5) MALLOC_PRODUCTION variable, used for disabling and - enabling assertions and statistics gathering in malloc(3), has been - migrated to a src.conf(5) WITH/WITHOUT_MALLOC_PRODUCTION option. - - On stable branches, WITH_MALLOC_PRODUCTION is set by default, which - means that malloc(3) has assertions and statistics gathering disabled, - for improved performance. - - For backwards compatibility, the make.conf(5) MALLOC_PRODUCTION is still - honored, but it is now deprecated and undocumented. - -20200909: +/usr/ports/UPDATING. Please read that file before updating system packages +and/or ports. + +20220516: + 13.1-RELEASE. + +20220123: + For 64-bit architectures the base system is now built with Position + Independent Executable (PIE) support enabled by default. It may be + disabled using the WITHOUT_PIE knob. A clean build is required. + +20220114: + The macros provided for the manipulation of CPU sets (e.g. CPU_AND) + have been modified to take 2 source arguments instead of only 1. + Externally maintained sources that use these macros will have to + be adapted. The FreeBSD version has been bumped to 1300524 to + reflect this change. + +20211218: + Commit 18f5b477ee66 adds two arguments to VOP_ALLOCATE(). + Normally changes to VOP calls are not MFC'd, but a + discussion on freebsd-current@ seemed to agree that + it was acceptable in this case, to fix the NFSv4.2 server. + Any out of source tree file system with a custom + VOP_ALLOCATE() call will need to be modified. + Bump __FreeBSD_version to 1300523 since the NFS modules need + to be rebuilt from sources. + +20211124: + Commit 6e8e261f0d4e changed the internal KAPI between the NFS + modules. As such, all the modules must be rebuilt from sources. + __FreeBSD_version has been bumped to 1300522. + +20211119: + Bump __FreeBSD_version to 1300521 after merging LinuxKPI and + net80211 changes in order to support building various wireless + drivers. This is to help other external consumers of LinuxKPI + and net80211 to deal accordingly. + +20211003: + Commit a599f9f7620b deleted the variable called nfs_maxcopyrange + from nfscommon.ko, since it no longer needs to be global. As such, + the other nfs modules must be rebuilt from up to date sources. + Bump __FreeBSD_version to 1300516 for this. + +20210823: + As of commit 622809b0868f OpenSSL no longer enables kernel TLS + by default. Users can enable kernel TLS via the "KTLS" SSL + option. This can be enabled globally by using a custom + OpenSSL config file via OPENSSL_CONF or via an + application-specific configuration option for applications + which permit setting SSL options via SSL_CONF_cmd(3). + +20210803: + Commits 9fb6e613373c and 9ec7dbf46b0a both changed the internal + KAPI between the NFS modules. Bump __FreeBSD_version to 1300514. + All NFS modules must be rebuilt from sources. + +20210730: + Commit b69019c14cd8 removes pf's DIOCGETSTATESNV ioctl. + As of be70c7a50d32 it is no longer used by userspace, but it does mean + users may not be able to enumerate pf states if they update the kernel + past c021ff986e2b without first updating userspace past be70c7a50d32. + +20210718: + Bump __FreeBSD_version to 1300512 after merging LinuxKPI, OFED, + net80211, and driver changes in order to support building + Intel wireless iwlwifi drivers. This is especially needed for + drm-kmod which needs updates after this. + +20210715: + The 20210707 awk update brought in a change in behavior. This has + been corrected as of d4d252c49976. Between these dates, if you + installed a new awk binary, you may not be able to build a new + kernel because the change in behavior affected the genoffset + script used to build the kernel. If you did update, the fix is + to update your sources past the above hash and do + % cd usr.bin/awk + % make clean all + % sudo -E make install + to enable building kernels again. + +20210711: + Commit 8a04edfdcbd2 changes the default minor version + used for NFSv4 mounts to the highest minor version supported + by the NFSv4 server. This default can be overridden by using + the "minorversion" mount option. + The consensus of a discussion on freebsd-current@ indicated + that this would be acceptable to do and would not be considered + a POLA violation. + +20210710: + awk has been updated to the latest one-true-awk version 20210215. + This contains a number of minor bug fixes. + +20210630: + Commit ca179c4d74f2/632e3f2f3a66 changed the package in which + the OpenSSL libraries and utilities are packaged. + It is recommended for pkgbase user to do: + pkg install -f FreeBSD-openssl + before pkg upgrade otherwise some dependencies might not be met + and pkg will stop working as libssl will not be present anymore + on the system. + +20210626: + Commit 841006678745 changed the internal KAPI between the krpc + and nfsd modules. As such, they must both be rebuilt from + sources. + __FreeBSD_version is bumped to 1300510. + +20210510: + Commit 272f39942254 changed the internal KAPI between the + nscl.ko and nfscommon.ko modules, so they both need to be + rebuilt from sources. + +20210429: + Commit 5a45802b3c8c changed the internal KAPI between + the krpc and NFS. As such, the krpc, nfscommon and + nfscl modules must all be rebuilt from sources. + Without this patch, NFSv4.1/4.2 mounts should not + be done with the nfscbd(8) daemon running, to avoid + needing a working back channel for server->client RPCs. + +20210202: + Various LinuxKPI functionality was added which conflicts with DRM. + Please update your drm-kmod port to after the __FreeBSD_verison 1300139 + update. + +20210122: + The stable/13 branch has been created from main. + +20210108: + PC Card attachments for all devices have been removed. In the case of + wi and cmx, the entire drivers were removed because they were only + PC Card devices. FreeBSD_version 1300134 should be used for this + since it was bumped so recently. + +20210107: + Transport-independent parts of HID support have been split off the USB + code in to separate subsystem. Kernel configs which include one of + ums, ukbd, uhid, atp, wsp, wmt, uaudio, ugold or ucycom drivers should + be updated with adding of "device hid" line. + +20210105: + ncurses installation has been modified to only keep the widechar + enabled version. Incremental build is broken for that change, so it + requires a clean build. + +20201223: + The FreeBSD project has migrated from Subversion to Git. Temporary + instructions can be found at + https://github.com/bsdimp/freebsd-git-docs/blob/main/src-cvt.md + and other documents in that repo. + +20201216: + The services database has been updated to cover more of the basic + services expected in a modern system. The database is big enough + that it will cause issues in mergemaster in Releases previous to + 12.2 and 11.3, or in very old current systems from before r358154. + +20201215: + Obsolete in-tree GDB 6.1.1 has been removed. GDB (including kgdb) + may be installed from ports or packages. + +20201124: + ping6 has been merged into ping. It can now be called as "ping -6". + See ping(8) for details. + +20201108: + Default value of net.add_addr_allfibs has been changed to 0. + If you have multi-fib configuration and rely on existence of all + interface routes in every fib, you need to set the above sysctl to 1. +20201030: + The internal pre-processor in the calendar(1) program has been + extended to support more C pre-processor commands (e.g. #ifdef, #else, + and #undef) and to detect unbalanced conditional statements. + Error messages have been extended to include the filename and line + number if processing stops to help fixing malformed data files. + +20201026: + All the data files for the calendar(1) program, except calendar.freebsd, + have been moved to the deskutils/calendar-data port, much like the + jewish calendar entries were moved to deskutils/hebcal years ago. After + make delete-old-files, you need to install it to retain full + functionality. calendar(1) will issue a reminder for files it can't + find. + +20200923: + LINT files are no longer generated. We now include the relevant NOTES + files. Note: This may cause conflicts with updating in some cases. + find sys -name LINT\* -delete + is suggested across this commit to remove the generated LINT files. + + If you have tried to update with generated files there, the svn + command you want to un-auger the tree is + cd sys/amd64/conf + svn revert -R . + and then do the above find from the top level. Substitute 'amd64' + above with where the error message indicates a conflict. + +20200824: + OpenZFS support has been integrated. Do not upgrade root pools until + the loader is updated to support zstd. Furthermore, we caution against + 'zpool upgrade' for the next few weeks. The change should be transparent + unless you want to use new features. + + Not all "NO_CLEAN" build scenarios work across these changes. Many + scenarios have been tested and fixed, but rebuilding kernels without + rebuilding world may fail. + + The ZFS cache file has moved from /boot to /etc to match the OpenZFS + upstream default. A fallback to /boot has been added for mountroot. + + Pool auto import behavior at boot has been moved from the kernel module + to an explicit "zpool import -a" in one of the rc scripts enabled by + zfs_enable=YES. This means your non-root zpools won't auto import until + you upgrade your /etc/rc.d files. + +20200824: The resume code now notifies devd with the 'kernel' system rather than the old 'kern' subsystem to be consistent with other use. The old notification will be created as well, but will be removed prior to FreeBSD 14.0. -20200722: +20200821: + r362275 changed the internal API between the kernel RPC and the + NFS modules. As such, all the modules must be recompiled from + sources. + +20200817: + r364330 modified the internal API used between the NFS modules. + As such, all the NFS modules must be re-compiled from sources. + +20200816: Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have - been upgraded to 10.0.1. Please see the 20141231 entry below for + been upgraded to 11.0.0. Please see the 20141231 entry below for information about prerequisites and upgrading, if you are not already using clang 3.5.0 or higher. -20200708: +20200810: + r364092 modified the internal ABI used between the kernel NFS + modules. As such, all of these modules need to be rebuilt + from sources, so a version bump was done. + +20200807: + Makefile.inc has been updated to work around the issue documented in + 20200729. It was a case where the optimization of using symbolic links + to point to binaries created a situation where we'd run new binaries + with old libraries starting midway through the installworld process. + +20200729: + r363679 has redefined some undefined behavior in regcomp(3); notably, + extraneous escapes of most ordinary characters will no longer be + accepted. An exp-run has identified all of the problems with this in + ports, but other non-ports software may need extra escapes removed to + continue to function. + + Because of this change, installworld may encounter the following error + from rtld: Undefined symbol "regcomp@FBSD_1.6" -- It is imperative that + you do not halt installworld. Instead, let it run to completion (whether + successful or not) and run installworld once more. + +20200627: + A new implementation of bc and dc has been imported in r362681. This + implementation corrects non-conformant behavior of the previous bc + and adds GNU bc compatible options. It offers a number of extensions, + is much faster on large values, and has support for message catalogs + (a number of languages are already supported, contributions of further + languages welcome). The option WITHOUT_GH_BC can be used to build the + world with the previous versions of bc and dc. + +20200625: + r362639 changed the internal API used between the NFS kernel modules. + As such, they all need to be rebuilt from sources. + +20200613: + r362158 changed the arguments for VFS_CHECKEXP(). As such, any + out of tree file systems need to be modified and rebuilt. + Also, any file systems that are modules must be rebuilt. + +20200604: read(2) of a directory fd is now rejected by default. root may - re-enable it for the entire system with the - security.bsd.allow_read_dir sysctl(8) MIB. + re-enable it for system root only on non-ZFS filesystems with the + security.bsd.allow_read_dir sysctl(8) MIB if + security.bsd.suser_enabled=1. It may be advised to setup aliases for grep to default to `-d skip` if commonly non-recursively grepping a list that includes directories and the potential for the resulting stderr output is not tolerable. Example - aliases are now installed, commented out, in /root/.cshrc. + aliases are now installed, commented out, in /root/.cshrc and + /root/.shrc. + +20200523: + Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have + been upgraded to 10.0.1. Please see the 20141231 entry below for + information about prerequisites and upgrading, if you are not already + using clang 3.5.0 or higher. + +20200512: + Support for obsolete compilers has been removed from the build system. + Clang 6 and GCC 6.4 are the minimum supported versions. + +20200424: + closefrom(2) has been moved under COMPAT12, and replaced in libc with a + stub that calls close_range(2). If using a custom kernel configuration, + you may want to ensure that the COMPAT_FREEBSD12 option is included, as + a slightly older -CURRENT userland and older FreeBSD userlands may not + be functional without closefrom(2). 20200414: Upstream DTS from Linux 5.6 was merged and they now have the SID @@ -75,13 +326,96 @@ from older version of current across the gcc/clang cutover is a bit fragile. deal with upstream DTS. If you are using those overlays you need to remove them from loader.conf and update the DTBs on the FAT partition. -20200501: +20200310: Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have been upgraded to 10.0.0. Please see the 20141231 entry below for information about prerequisites and upgrading, if you are not already using clang 3.5.0 or higher. -20200430: +20200309: + The amd(8) automount daemon has been removed from the source tree. + As of FreeBSD 10.1 autofs(5) is the preferred tool for automounting. + amd is still available in the sysutils/am-utils port. + +20200301: + Removed brooktree driver (bktr.4) from the tree. + +20200229: + The WITH_GPL_DTC option has been removed. The BSD-licenced device tree + compiler in usr.bin/dtc is used on all architectures which use dtc, and + the GPL dtc is available (if needed) from the sysutils/dtc port. + +20200229: + The WITHOUT_LLVM_LIBUNWIND option has been removed. LLVM's libunwind + is used by all supported CPU architectures. + +20200229: + GCC 4.2.1 has been removed from the tree. The WITH_GCC, + WITH_GCC_BOOTSTRAP, and WITH_GNUCXX options are no longer available. + Users who wish to build FreeBSD with GCC must use the external toolchain + ports or packages. + +20200220: + ncurses has been updated to a newer version (6.2-20200215). Given the ABI + has changed, users will have to rebuild all the ports that are linked to + ncurses. + +20200217: + The size of struct vnet and the magic cookie have changed. + Users need to recompile libkvm and all modules using VIMAGE + together with their new kernel. + +20200212: + Defining the long deprecated NO_CTF, NO_DEBUG_FILES, NO_INSTALLLIB, + NO_MAN, NO_PROFILE, and NO_WARNS variables is now an error. Update + your Makefiles and scripts to define MK_=no instead as required. + + One exception to this is that program or library Makefiles should + define MAN to empty rather than setting MK_MAN=no. + +20200108: + Clang/LLVM is now the default compiler and LLD the default + linker for riscv64. + +20200107: + make universe no longer uses GCC 4.2.1 on any architectures. + Architectures not supported by in-tree Clang/LLVM require an + external toolchain package. + +20200104: + GCC 4.2.1 is now not built by default, as part of the GCC 4.2.1 + retirement plan. Specifically, the GCC, GCC_BOOTSTRAP, and GNUCXX + options default to off for all supported CPU architectures. As a + short-term transition aid they may be enabled via WITH_* options. + GCC 4.2.1 is expected to be removed from the tree on 2020-03-31. + +20200102: + Support for armv5 has been disconnected and is being removed. The + machine combination MACHINE=arm MACHINE_ARCH=arm is no longer valid. + You must now use a MACHINE_ARCH of armv6 or armv7. The default + MACHINE_ARCH for MACHINE=arm is now armv7. + +20191226: + Clang/LLVM is now the default compiler for all powerpc architectures. + LLD is now the default linker for powerpc64. The change for powerpc64 + also includes a change to the ELFv2 ABI, incompatible with the existing + ABI. + +20191226: + Kernel-loadable random(4) modules are no longer unloadable. + +20191222: + Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have + been upgraded to 9.0.1. Please see the 20141231 entry below for + information about prerequisites and upgrading, if you are not already + using clang 3.5.0 or higher. + +20191212: + r355677 has modified the internal interface used between the + NFS modules in the kernel. As such, they must all be upgraded + simultaneously. I will do a version bump for this. + +20191205: The root certificates of the Mozilla CA Certificate Store have been imported into the base system and can be managed with the certctl(8) utility. If you have installed the security/ca_root_nss port or package @@ -91,11 +425,10 @@ from older version of current across the gcc/clang cutover is a bit fragile. frequency. Note also that certctl(8) cannot manage certs in the format used by the security/ca_root_nss port. -20200107: - Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have - been upgraded to 9.0.1. Please see the 20141231 entry below for - information about prerequisites and upgrading, if you are not already - using clang 3.5.0 or higher. +20191120: + The amd(8) automount daemon has been disabled by default, and will be + removed in the future. As of FreeBSD 10.1 the autofs(5) is available + for automounting. 20191107: The nctgpio and wbwd drivers have been moved to the superio bus. @@ -104,13 +437,38 @@ from older version of current across the gcc/clang cutover is a bit fragile. as a module and you compile a custom set of modules, then you should add superio to the set. -20191024: - The tap(4) driver has been folded into tun(4), and the module has been - renamed to tuntap. You should update any kld_list="if_tap" or - kld_list="if_tun" entries in /etc/rc.conf, if_tap_load="YES" or - if_tun_load="YES" entries in /boot/loader.conf to load the if_tuntap - module instead, and "device tap" or "device tun" entries in kernel - config files to select the tuntap device instead. +20191021: + KPIs for network drivers to access interface addresses have changed. + Users need to recompile NIC driver modules together with kernel. + +20191021: + The net.link.tap.user_open sysctl no longer prevents user opening of + already created /dev/tapNN devices. Access is still controlled by + node permissions, just like tun devices. The net.link.tap.user_open + sysctl is now used only to allow users to perform devfs cloning of + tap devices, and the subsequent open may not succeed if the user is not + in the appropriate group. This sysctl may be deprecated/removed + completely in the future. + +20191009: + mips, powerpc, and sparc64 are no longer built as part of + universe / tinderbox unless MAKE_OBSOLETE_GCC is defined. If + not defined, mips, powerpc, and sparc64 builds will look for + the xtoolchain binaries and if installed use them for universe + builds. As llvm 9.0 becomes vetted for these architectures, they + will be removed from the list. + +20191009: + Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have + been upgraded to 9.0.0. Please see the 20141231 entry below for + information about prerequisites and upgrading, if you are not already + using clang 3.5.0 or higher. + +20191003: + The hpt27xx, hptmv, hptnr, and hptrr drivers have been removed from + GENERIC. They are available as modules and can be loaded by adding + to /boot/loader.conf hpt27xx_load="YES", hptmv_load="YES", + hptnr_load="YES", or hptrr_load="YES", respectively. 20190913: ntpd no longer by default locks its pages in memory, allowing them @@ -118,7 +476,12 @@ from older version of current across the gcc/clang cutover is a bit fragile. historic BSD behaviour. For example, add "rlimit memlock 32" to ntp.conf to lock up to 32 MB of ntpd address space in memory. -20190914: +20190823: + Several of ping6's options have been renamed for better consistency + with ping. If you use any of -ARWXaghmrtwx, you must update your + scripts. See ping6(8) for details. + +20190727: The vfs.fusefs.sync_unmount and vfs.fusefs.init_backgrounded sysctls and the "-o sync_unmount" and "-o init_backgrounded" mount options have been removed from mount_fusefs(8). You can safely remove them from @@ -130,46 +493,99 @@ from older version of current across the gcc/clang cutover is a bit fragile. sysctls have been removed. If you felt the need to set any of them to a non-default value, please tell asomers@FreeBSD.org why. -20190906: - The fuse(4) module has been renamed to fusefs(4) for consistency with - other filesystems. You should update any kld_load="fuse" entries in - /etc/rc.conf, fuse_load="YES" entries in /boot/loader.conf, and - "options FUSE" enties in kernel config files. - -20190811: - Default permissions on the /var/account/acct file (and copies of it - rotated by periodic daily scripts) are changed from 0644 to 0640 - because the file contains sensitive information that should not be - world-readable. If the /var/account directory must be created by - rc.d/accounting, the mode used is now 0750. Admins who use the - accounting feature are encouraged to change the mode of an existing - /var/account directory to 0750 or 0700. - -20190723: +20190713: + Default permissions on the /var/account/acct file (and copies of it + rotated by periodic daily scripts) are changed from 0644 to 0640 + because the file contains sensitive information that should not be + world-readable. If the /var/account directory must be created by + rc.d/accounting, the mode used is now 0750. Admins who use the + accounting feature are encouraged to change the mode of an existing + /var/account directory to 0750 or 0700. + +20190620: + Entropy collection and the /dev/random device are no longer optional + components. The "device random" option has been removed. + Implementations of distilling algorithms can still be made loadable + with "options RANDOM_LOADABLE" (e.g., random_fortuna.ko). + +20190612: Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have been upgraded to 8.0.1. Please see the 20141231 entry below for information about prerequisites and upgrading, if you are not already using clang 3.5.0 or higher. -20190413: - Now Clang 8 has been merged (see the 20190412 entry below), the ifunc - functionality needed for the RETPOLINE option should work properly - again. The RETPOLINE option has been removed from BROKEN_OPTIONS. +20190608: + A fix was applied to i386 kernel modules to avoid panics with + dpcpu or vnet. Users need to recompile i386 kernel modules + having pcpu or vnet sections or they will refuse to load. -20190412: - Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to - 8.0.0. Please see the 20141231 entry below for information about - prerequisites and upgrading, if you are not already using clang 3.5.0 - or higher. +20190513: + User-wired pages now have their own counter, + vm.stats.vm.v_user_wire_count. The vm.max_wired sysctl was renamed + to vm.max_user_wired and changed from an unsigned int to an unsigned + long. bhyve VMs wired with the -S are now subject to the user + wiring limit; the vm.max_user_wired sysctl may need to be tuned to + avoid running into the limit. + +20190507: + The IPSEC option has been removed from GENERIC. Users requiring + ipsec(4) must now load the ipsec(4) kernel module. -20190307: - The RETPOLINE option produces non-functional ifunc-using binaries - with Clang 7.0.1, and has been forced off (via BROKEN_OPTIONS). - Once Clang 8 is merged it may be enabled again. +20190507: + The tap(4) driver has been folded into tun(4), and the module has been + renamed to tuntap. You should update any kld_list="if_tap" or + kld_list="if_tun" entries in /etc/rc.conf, if_tap_load="YES" or + if_tun_load="YES" entries in /boot/loader.conf to load the if_tuntap + module instead, and "device tap" or "device tun" entries in kernel + config files to select the tuntap device instead. -20190216: +20190418: + The following knobs have been added related to tradeoffs between + safe use of the random device and availability in the absence of + entropy: + + kern.random.initial_seeding.bypass_before_seeding: tunable; set + non-zero to bypass the random device prior to seeding, or zero to + block random requests until the random device is initially seeded. + For now, set to 1 (unsafe) by default to restore pre-r346250 boot + availability properties. + + kern.random.initial_seeding.read_random_bypassed_before_seeding: + read-only diagnostic sysctl that is set when bypass is enabled and + read_random(9) is bypassed, to enable programmatic handling of this + initial condition, if desired. + + kern.random.initial_seeding.arc4random_bypassed_before_seeding: + Similar to the above, but for for arc4random(9) initial seeding. + + kern.random.initial_seeding.disable_bypass_warnings: tunable; set + non-zero to disable warnings in dmesg when the same conditions are + met as for the diagnostic sysctls above. Defaults to zero, i.e., + produce warnings in dmesg when the conditions are met. + +20190416: + The loadable random module KPI has changed; the random_infra_init() + routine now requires a 3rd function pointer for a bool (*)(void) + method that returns true if the random device is seeded (and + therefore unblocked). + +20190404: + r345895 reverts r320698. This implies that an nfsuserd(8) daemon + built from head sources between r320757 (July 6, 2017) and + r338192 (Aug. 22, 2018) will not work unless the "-use-udpsock" + is added to the command line. + nfsuserd daemons built from head sources that are post-r338192 are + not affected and should continue to work. + +20190320: + The fuse(4) module has been renamed to fusefs(4) for consistency with + other filesystems. You should update any kld_load="fuse" entries in + /etc/rc.conf, fuse_load="YES" entries in /boot/loader.conf, and + "options FUSE" entries in kernel config files. + +20190304: Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to - 7.0.1. Please see the 20141231 entry below for information about + 8.0.0. Please see the 20141231 entry below for information about prerequisites and upgrading, if you are not already using clang 3.5.0 or higher. @@ -178,37 +594,85 @@ from older version of current across the gcc/clang cutover is a bit fragile. compiled into your custom kernel, add 'device xz' statement to the kernel config. -20190214: +20190219: + drm and drm2 have been removed from the tree. Please see + https://wiki.freebsd.org/Graphics for the latest information on + migrating to the drm ports. + +20190131: Iflib is no longer unconditionally compiled into the kernel. Drivers using iflib and statically compiled into the kernel, now require the 'device iflib' config option. For the same drivers loaded as modules on kernels not having 'device iflib', the iflib.ko module is loaded automatically. -20181228: - r342561 modifies the NFSv4 server so that it obeys vfs.nfsd.nfs_privport +20190125: + The IEEE80211_AMPDU_AGE and AH_SUPPORT_AR5416 kernel configuration + options no longer exist since r343219 and r343427 respectively; + nothing uses them, so they should be just removed from custom + kernel config files. + +20181230: + r342635 changes the way efibootmgr(8) works by requiring users to add + the -b (bootnum) parameter for commands where the bootnum was previously + specified with each option. For example 'efibootmgr -B 0001' is now + 'efibootmgr -B -b 0001'. + +20181220: + r342286 modifies the NFSv4 server so that it obeys vfs.nfsd.nfs_privport in the same as it is applied to NFSv2 and 3. This implies that NFSv4 servers that have vfs.nfsd.nfs_privport set will only allow mounts from clients using a reserved port#. Since both the FreeBSD and Linux NFSv4 clients use reserved port#s by default, this should not affect most NFSv4 mounts. -20181129: +20181219: + The XLP config has been removed. We can't support 64-bit atomics in this + kernel because it is running in 32-bit mode. XLP users must transition + to running a 64-bit kernel (XLP64 or XLPN32). + + The mips GXEMUL support has been removed from FreeBSD. MALTA* + qemu is + the preferred emulator today and we don't need two different ones. + + The old sibyte / swarm / Broadcom BCM1250 support has been + removed from the mips port. + +20181211: + Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to + 7.0.1. Please see the 20141231 entry below for information about + prerequisites and upgrading, if you are not already using clang 3.5.0 + or higher. + +20181211: + Remove the timed and netdate programs from the base tree. Setting + the time with these daemons has been obsolete for over a decade. + +20181126: On amd64, arm64 and armv7 (architectures that install LLVM's ld.lld linker as /usr/bin/ld) GNU ld is no longer installed as ld.bfd, as it produces broken binaries when ifuncs are in use. Users needing GNU ld should install the binutils port or package. +20181123: + The BSD crtbegin and crtend code has been enabled by default. It has + had extensive testing on amd64, arm64, and i386. It can be disabled + by building a world with -DWITHOUT_BSD_CRTBEGIN. + 20181115: The set of CTM commands (ctm, ctm_smail, ctm_rmail, ctm_dequeue) has been converted to a port (misc/ctm) and will be removed from - FreeBSD-13. A depreciation warning will be printed to stderr by - the ctm command, but the functionality will remain in base for all - FreeBSD-12 releases. + FreeBSD-13. It is available as a package (ctm) for all supported + FreeBSD versions. + +20181110: + The default newsyslog.conf(5) file has been changed to only include + files in /etc/newsyslog.conf.d/ and /usr/local/etc/newsyslog.conf.d/ if + the filenames end in '.conf' and do not begin with a '.'. -20181019: - The stable/12 branch has been created in subversion from head - revision r339432. + You should check the configuration files in these two directories match + this naming convention. You can verify which configuration files are + being included using the command: + $ newsyslog -Nrv 20181015: Ports for the DRM modules have been simplified. Now, amd64 users should @@ -226,8 +690,8 @@ from older version of current across the gcc/clang cutover is a bit fragile. Other than KPI chasing, drm-legacy-kmod will not be updated. As outlined elsewhere, the drm and drm2 modules will be eliminated from the src base - soon (with a limited exception for arm). Please update to the package asap - and report any issues to x11@freebsd.org. + soon (with a limited exception for arm). Please update to the package + asap and report any issues to x11@freebsd.org. Generally, anybody using the drm*-kmod packages should add WITHOUT_DRM_MODULE=t and WITHOUT_DRM2_MODULE=t to avoid nasty @@ -244,7 +708,7 @@ from older version of current across the gcc/clang cutover is a bit fragile. 20181009: OpenSSL has been updated to version 1.1.1. This update included - additional various API changes througout the base system. It is + additional various API changes throughout the base system. It is important to rebuild third-party software after upgrading. The value of __FreeBSD_version has been bumped accordingly. @@ -341,13 +805,13 @@ from older version of current across the gcc/clang cutover is a bit fragile. 20180719: ARM64 now have efifb support, if you want to have serial console on your arm64 board when an screen is connected and the bootloader - setup a frambuffer for us to use, just add : + setup a frame buffer for us to use, just add : boot_serial=YES boot_multicons=YES in /boot/loader.conf For Raspberry Pi 3 (RPI) users, this is needed even if you don't have - an screen connected as the firmware will setup a framebuffer are that - u-boot will expose as an EFI framebuffer. + an screen connected as the firmware will setup a frame buffer are that + u-boot will expose as an EFI frame buffer. 20180719: New uid:gid added, ntpd:ntpd (123:123). Be sure to run mergemaster @@ -402,7 +866,8 @@ from older version of current across the gcc/clang cutover is a bit fragile. 20180628: r335753 introduced a new quoting method. However, etc/devd/devmatch.conf needed to be changed to work with it. This change was made with r335763 - and requires a mergemaster / etcupdate / etc to update the installed file. + and requires a mergemaster / etcupdate / etc to update the installed + file. 20180612: r334930 changed the interface between the NFS modules, so they all @@ -445,7 +910,7 @@ from older version of current across the gcc/clang cutover is a bit fragile. 20180508: The nxge(4) driver has been removed. This driver was for PCI-X 10g - cards made by s2io/Neterion. The company was aquired by Exar and + cards made by s2io/Neterion. The company was acquired by Exar and no longer sells or supports Ethernet products. If you have device nxge in your kernel config file it must be removed. @@ -536,15 +1001,16 @@ from older version of current across the gcc/clang cutover is a bit fragile. 20180212: FreeBSD boot loader enhanced with Lua scripting. It's purely opt-in for now by building WITH_LOADER_LUA and WITHOUT_FORTH in /etc/src.conf. - Co-existance for the transition period will come shortly. Booting is a + Co-existence for the transition period will come shortly. Booting is a complex environment and test coverage for Lua-enabled loaders has been thin, so it would be prudent to assume it might not work and make provisions for backup boot methods. 20180211: devmatch functionality has been turned on in devd. It will automatically - load drivers for unattached devices. This may cause unexpected drivers to - be loaded. Please report any problems to current@ and imp@freebsd.org. + load drivers for unattached devices. This may cause unexpected drivers + to be loaded. Please report any problems to current@ and + imp@freebsd.org. 20180114: Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to @@ -558,13 +1024,13 @@ from older version of current across the gcc/clang cutover is a bit fragile. executables, but is not yet installed as /usr/bin/ld by default. To revert to ld.bfd as the bootstrap linker, in /etc/src.conf set - WITHOUT_LLD_BOOTSTRAP=yes + WITHOUT_LLD_BOOTSTRAP=yes 20180110: On i386, pmtimer has been removed. Its functionality has been folded - into apm. It was a no-op on ACPI in current for a while now (but was still - needed on i386 in FreeBSD 11 and earlier). Users may need to remove it - from kernel config files. + into apm. It was a no-op on ACPI in current for a while now (but was + still needed on i386 in FreeBSD 11 and earlier). Users may need to + remove it from kernel config files. 20180104: The use of RSS hash from the network card aka flowid has been @@ -805,11 +1271,13 @@ from older version of current across the gcc/clang cutover is a bit fragile. system will be running the ino64 kernel with the existing world). For the safest in-place upgrade begin by removing previous build - artifacts via "rm -rf /usr/obj/*". Then, carefully follow the - full procedure documented below under the heading "To rebuild - everything and install it on the current system." Specifically, - a reboot is required after installing the new kernel before - installing world. + artifacts via "rm -rf /usr/obj/*". Then, carefully follow the full + procedure documented below under the heading "To rebuild everything and + install it on the current system." Specifically, a reboot is required + after installing the new kernel before installing world. While an + installworld normally works by accident from multiuser after rebooting + the proper kernel, there are many cases where this will fail across this + upgrade and installworld from single user is required. 20170424: The NATM framework including the en(4), fatm(4), hatm(4), and @@ -906,7 +1374,8 @@ from older version of current across the gcc/clang cutover is a bit fragile. 20170109: The igb(4), em(4) and lem(4) ethernet drivers are now implemented via IFLIB. If you have a custom kernel configuration that excludes em(4) - but you use igb(4), you need to re-add em(4) to your custom configuration. + but you use igb(4), you need to re-add em(4) to your custom + configuration. 20161217: Clang, llvm, lldb, compiler-rt and libc++ have been upgraded to 3.9.1. @@ -1849,19 +2318,14 @@ COMMON ITEMS: General Notes ------------- - Avoid using make -j when upgrading. While generally safe, there are - sometimes problems using -j to upgrade. If your upgrade fails with - -j, please try again without -j. From time to time in the past there - have been problems using -j with buildworld and/or installworld. This - is especially true when upgrading between "distant" versions (eg one - that cross a major release boundary or several minor releases, or when - several months have passed on the -current branch). - Sometimes, obscure build problems are the result of environment poisoning. This can happen because the make utility reads its environment when searching for values for global variables. To run your build attempts in an "environmental clean room", prefix all make commands with 'env -i '. See the env(1) manual page for more details. + Occasionally a build failure will occur with "make -j" due to a race + condition. If this happens try building again without -j, and please + report a bug if it happens consistently. When upgrading from one major version to another it is generally best to upgrade to the latest code in the currently installed branch first, then @@ -1873,6 +2337,12 @@ COMMON ITEMS: last couple of stable branches). See the top of this file when there's an exception. + The update process will emit an error on an attempt to perform a build + or install from a FreeBSD version below the earliest supported version. + When updating from an older version the update should be performed one + major release at a time, including running `make delete-old` at each + step. + When upgrading a live system, having a root shell around before installing anything can help undo problems. Not having a root shell around can lead to problems if pam has changed too much from your @@ -1895,9 +2365,11 @@ COMMON ITEMS: 2.) update the ZFS boot block on your boot drive - The following example updates the ZFS boot block on the first - partition (freebsd-boot) of a GPT partitioned drive ada0: - "gpart bootcode -p /boot/gptzfsboot -i 1 ada0" + The following example updates the ZFS boot block on the + freebsd-boot partition of a GPT partitioned drive ada0: + "gpart bootcode -p /boot/gptzfsboot -i $N ada0" + The value $N will typically be 1 (if booting from BIOS) or 2 (if + booting from EFI). Non-boot pools do not need these updates. @@ -1986,18 +2458,26 @@ COMMON ITEMS: messages there. If in doubt, please track -stable which has much fewer pitfalls. - [1] If you have third party modules, such as vmware, you - should disable them at this point so they don't crash your - system on reboot. + [1] If you have third party modules, such as vmware, you should disable + them at this point so they don't crash your system on + reboot. Alternatively, you should rebuild all the modules you have in + your system and install them as well. If you are running -current, you + should seriously consider placing all sources to all the modules for + your system (or symlinks to them) in /usr/local/sys/modules so this + happens automatically. If all your modules come from ports, then adding + the port origin directories to PORTS_MODULES instead is also automatic + and effective, eg: + PORTS_MODULES+=x11/nvidia-driver [3] From the bootblocks, boot -s, and then do fsck -p mount -u / mount -a - cd src + sh /etc/rc.d/zfs start # mount zfs filesystem, if needed + cd src # full path to source adjkerntz -i # if CMOS is wall time - Also, when doing a major release upgrade, it is required that - you boot into single user mode to do the installworld. + Also, when doing a major release upgrade, it is required that you boot + into single user mode to do the installworld. [4] Note: This step is non-optional. Failure to do this step can result in a significant reduction in the functionality of the @@ -2018,16 +2498,19 @@ COMMON ITEMS: can be deleted by "make delete-old-libs", but you have to make sure that no program is using those libraries anymore. - [8] The new kernel must be able to run existing binaries used by - an installworld. When upgrading across major versions, the new - kernel's configuration must include the correct COMPAT_FREEBSD - option for existing binaries (e.g. COMPAT_FREEBSD11 to run 11.x - binaries). Failure to do so may leave you with a system that is - hard to boot to recover. A GENERIC kernel will include suitable - compatibility options to run binaries from older branches. + [8] The new kernel must be able to run existing binaries used by an + installworld. When upgrading across major versions, the new kernel's + configuration must include the correct COMPAT_FREEBSD option for + existing binaries (e.g. COMPAT_FREEBSD11 to run 11.x binaries). Failure + to do so may leave you with a system that is hard to boot to recover. A + GENERIC kernel will include suitable compatibility options to run + binaries from older branches. Note that the ability to run binaries + from unsupported branches is not guaranteed. Make sure that you merge any new devices from GENERIC since the - last time you updated your kernel config file. + last time you updated your kernel config file. Options also + change over time, so you may need to adjust your custom kernels + for these as well. [9] If CPUTYPE is defined in your /etc/make.conf, make sure to use the "?=" instead of the "=" assignment operator, so that buildworld can @@ -2046,7 +2529,7 @@ to fetch an UPDATING file from an older FreeBSD release. Copyright information: -Copyright 1998-2009 M. Warner Losh. All Rights Reserved. +Copyright 1998-2009 M. Warner Losh Redistribution, publication, translation and use, with or without modification, in full or in part, in any form or format of this @@ -2067,4 +2550,4 @@ POSSIBILITY OF SUCH DAMAGE. Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: releng/12.2/UPDATING 366954 2020-10-23 00:00:52Z gjb $ +$FreeBSD$ diff --git a/include/fts.h b/include/fts.h index 827f5fa913d9ba803751c5349ece965778758f0f..12092de22501dd1b4c063771a04048c259589963 100644 --- a/include/fts.h +++ b/include/fts.h @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * @(#)fts.h 8.3 (Berkeley) 8/14/94 - * $FreeBSD: releng/12.2/include/fts.h 326024 2017-11-20 19:45:28Z pfg $ + * $FreeBSD$ */ #ifndef _FTS_H_ diff --git a/stand/kshim/bsd_busspace.c b/stand/kshim/bsd_busspace.c index 3ecc9971da6c71e30ab01bf0a20e02ee97732202..489d12f43d162af72079e964aaaa2964e708bd44 100644 --- a/stand/kshim/bsd_busspace.c +++ b/stand/kshim/bsd_busspace.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/stand/kshim/bsd_busspace.c 291400 2015-11-27 18:14:45Z zbb $ */ +/* $FreeBSD$ */ /*- * Copyright (c) 2013 Hans Petter Selasky. All rights reserved. * diff --git a/stand/kshim/bsd_kernel.c b/stand/kshim/bsd_kernel.c index 83a274167c4dc73a43c2667118466bcf4836c4dd..c3498e5b4906db8ecb47b2ad5a0ecd987f97fbce 100644 --- a/stand/kshim/bsd_kernel.c +++ b/stand/kshim/bsd_kernel.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/stand/kshim/bsd_kernel.c 314068 2017-02-22 02:35:59Z pfg $ */ +/* $FreeBSD$ */ /*- * Copyright (c) 2013 Hans Petter Selasky. All rights reserved. * diff --git a/stand/kshim/bsd_kernel.h b/stand/kshim/bsd_kernel.h index e6c7384c19abdbe4f199da081a242f0b1596c2a9..5fa24a40a43f93e55f515c539d9cab2d23f87c8f 100644 --- a/stand/kshim/bsd_kernel.h +++ b/stand/kshim/bsd_kernel.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/stand/kshim/bsd_kernel.h 328987 2018-02-07 18:50:36Z hselasky $ */ +/* $FreeBSD$ */ /*- * Copyright (c) 2011 Hans Petter Selasky. All rights reserved. * diff --git a/stand/usb/usb_busdma_loader.c b/stand/usb/usb_busdma_loader.c index 2ba1da9fcbd1fbc8476684f3b85d81b8d283be3c..1295888ff3dc59d7500a131f01beaee6fb4760b7 100644 --- a/stand/usb/usb_busdma_loader.c +++ b/stand/usb/usb_busdma_loader.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/stand/usb/usb_busdma_loader.c 291399 2015-11-27 18:13:28Z zbb $ */ +/* $FreeBSD$ */ /*- * Copyright (c) 2013 Hans Petter Selasky. All rights reserved. * diff --git a/sys/arm/arm/autoconf.c b/sys/arm/arm/autoconf.c index 19349f13d98e31566842b12a2805745a04a77ab2..00a96334aaa9306b2a266bf642e25e0570a8ed3c 100644 --- a/sys/arm/arm/autoconf.c +++ b/sys/arm/arm/autoconf.c @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/arm/arm/autoconf.c 325966 2017-11-18 14:26:50Z pfg $"); +__FBSDID("$FreeBSD$"); #include #include "linux/module.h" diff --git a/sys/arm/arm/in_cksum.c b/sys/arm/arm/in_cksum.c index dafa8b2478806eb07f0658cf2c5243e6ffc6e50d..a077d7c49d19b5d42cbb123cf22ee069350ee14f 100644 --- a/sys/arm/arm/in_cksum.c +++ b/sys/arm/arm/in_cksum.c @@ -40,7 +40,7 @@ */ #include /* RCS ID & Copyright macro defns */ -__FBSDID("$FreeBSD: releng/12.2/sys/arm/arm/in_cksum.c 325966 2017-11-18 14:26:50Z pfg $"); +__FBSDID("$FreeBSD$"); #include "los_base.h" #include "sys/types.h" diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c index 195634b2426ca1b09a1b2ddf7bdcceb2cfc77e31..a603dc5a06b5756126b8e51dca31969a750d95ee 100644 --- a/sys/arm/arm/nexus.c +++ b/sys/arm/arm/nexus.c @@ -34,13 +34,11 @@ * attachment point for both processors and buses, and to manage * resources which are common to all of them. In particular, * this code implements the core resource managers for interrupt - * requests, DMA requests (which rightfully should be a part of the - * ISA code but it's easier to do it here for now), I/O port addresses, - * and I/O memory address space. + * requests and I/O memory address space. */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/arm/arm/nexus.c 320198 2017-06-21 18:25:35Z zbb $"); +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/arm/include/_bus.h b/sys/arm/include/_bus.h index 5d89e2da7cf42cacbc5cbc3bc50aa5c3d6e3f2fe..803dda2e27638c407efa6f553e44a1a0b1d751cd 100644 --- a/sys/arm/include/_bus.h +++ b/sys/arm/include/_bus.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005 M. Warner Losh. + * Copyright (c) 2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/arm/include/_bus.h 333142 2018-05-01 16:21:01Z imp $ + * $FreeBSD$ */ #ifndef ARM_INCLUDE__BUS_H diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h index ccb9e7bc680219e74a4f75d029a053f2f40895e8..67b97222f1494e8e3927c4950f44bbca6aad6c0f 100644 --- a/sys/cam/scsi/scsi_all.h +++ b/sys/cam/scsi/scsi_all.h @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: releng/12.2/sys/cam/scsi/scsi_all.h 364184 2020-08-13 00:42:09Z mav $ + * $FreeBSD$ */ #ifndef __INCLUDE_SCSI_ALL_H diff --git a/sys/compat/linuxkpi/common/include/asm/atomic.h b/sys/compat/linuxkpi/common/include/asm/atomic.h index 6b12a70a153fc2b1035976b72eb6828fe09d656a..e8da47e2b7ecd142f1d9eaae3f687c85ba5733f4 100644 --- a/sys/compat/linuxkpi/common/include/asm/atomic.h +++ b/sys/compat/linuxkpi/common/include/asm/atomic.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/asm/atomic.h 361180 2020-05-18 09:11:41Z hselasky $ + * $FreeBSD$ */ #ifndef _ASM_ATOMIC_H_ diff --git a/sys/compat/linuxkpi/common/include/asm/io.h b/sys/compat/linuxkpi/common/include/asm/io.h index 8c8735833ec9951f0e0d18e81a98513584d3e351..24d350f4743e58b817d2247d34b32f9339e31b49 100644 --- a/sys/compat/linuxkpi/common/include/asm/io.h +++ b/sys/compat/linuxkpi/common/include/asm/io.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/asm/io.h 290135 2015-10-29 08:28:39Z hselasky $ + * $FreeBSD$ */ #ifndef _ASM_IO_H_ #define _ASM_IO_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/atomic.h b/sys/compat/linuxkpi/common/include/linux/atomic.h index f81aa11eb076b5e79445491de8c619ce78188d93..38af6ea4c5cab0ed399406dfbf343718b06fad51 100644 --- a/sys/compat/linuxkpi/common/include/linux/atomic.h +++ b/sys/compat/linuxkpi/common/include/linux/atomic.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/atomic.h 348084 2019-05-22 03:54:25Z johalun $ + * $FreeBSD$ */ #ifndef _LINUX_ATOMIC_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h index e5962db06de5b65ea0d02580d2e2bd9c7b80f0ed..cc0c1b0aee792e26b91e2c3429ebdf04e10453fc 100644 --- a/sys/compat/linuxkpi/common/include/linux/compiler.h +++ b/sys/compat/linuxkpi/common/include/linux/compiler.h @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/compiler.h 364671 2020-08-24 12:59:55Z manu $ + * $FreeBSD$ */ #ifndef _LINUX_COMPILER_H_ #define _LINUX_COMPILER_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/completion.h b/sys/compat/linuxkpi/common/include/linux/completion.h index a9deaa25eadf316c8b2a4a60b82c27baf7e2faee..179db0e4b682e7fb6663a665861df28056b21100 100644 --- a/sys/compat/linuxkpi/common/include/linux/completion.h +++ b/sys/compat/linuxkpi/common/include/linux/completion.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/completion.h 334427 2018-05-31 12:55:38Z hselasky $ + * $FreeBSD$ */ #ifndef _LINUX_COMPLETION_H_ #define _LINUX_COMPLETION_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/delay.h b/sys/compat/linuxkpi/common/include/linux/delay.h index 170a2f1adb190abf87b88b73123ada665933ee5f..01f310180a8ff587025e271022c4340460b008d3 100644 --- a/sys/compat/linuxkpi/common/include/linux/delay.h +++ b/sys/compat/linuxkpi/common/include/linux/delay.h @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/delay.h 330353 2018-03-03 19:26:40Z hselasky $ + * $FreeBSD$ */ #ifndef _LINUX_DELAY_H_ #define _LINUX_DELAY_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 3c739f2c6d7d2b8bcbff5991e4f5e8af44e043f0..a62b56d16e96fb8403e05f1e07d43d53d4a35ab1 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/dma-mapping.h 360525 2020-05-01 09:46:27Z hselasky $ + * $FreeBSD$ */ #ifndef _LINUX_DMA_MAPPING_H_ #define _LINUX_DMA_MAPPING_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/errno.h b/sys/compat/linuxkpi/common/include/linux/errno.h index ffcf0d1dae8426a2a1f2269e9e121ad10324613d..fff22c5debf0daf23c265878cb89ad86f8d57a9e 100644 --- a/sys/compat/linuxkpi/common/include/linux/errno.h +++ b/sys/compat/linuxkpi/common/include/linux/errno.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/errno.h 364654 2020-08-24 10:46:09Z manu $ + * $FreeBSD$ */ #ifndef _LINUX_ERRNO_H_ #define _LINUX_ERRNO_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/fs.h b/sys/compat/linuxkpi/common/include/linux/fs.h index 9f7a877ec06d90f4af91b1e2097817a6b893e0f6..1d5fa8cd9e3428750142037adba3297782003cf2 100644 --- a/sys/compat/linuxkpi/common/include/linux/fs.h +++ b/sys/compat/linuxkpi/common/include/linux/fs.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/fs.h 341849 2018-12-12 10:08:15Z hselasky $ + * $FreeBSD$ */ #ifndef _LINUX_FS_H_ #define _LINUX_FS_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/hrtimer.h b/sys/compat/linuxkpi/common/include/linux/hrtimer.h index 4dd029f7ec5cec8ae578d633d6076d9e25ad4202..4dc89e26d0aa8186acac64a2123ad530c2008e6a 100644 --- a/sys/compat/linuxkpi/common/include/linux/hrtimer.h +++ b/sys/compat/linuxkpi/common/include/linux/hrtimer.h @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/hrtimer.h 334482 2018-06-01 11:33:14Z hselasky $ + * $FreeBSD$ */ #ifndef _LINUX_HRTIMER_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/interrupt.h b/sys/compat/linuxkpi/common/include/linux/interrupt.h index 0cbe1423a8e2958a381959df4e68703446f568dd..3f8d539d14b617327d95335b148aa171ebc3ad76 100644 --- a/sys/compat/linuxkpi/common/include/linux/interrupt.h +++ b/sys/compat/linuxkpi/common/include/linux/interrupt.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/interrupt.h 352472 2019-09-18 07:21:08Z hselasky $ + * $FreeBSD$ */ #ifndef _LINUX_INTERRUPT_H_ #define _LINUX_INTERRUPT_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index fe3cf8b65e04bba62ef254ab10e39167ac03cbd1..72bedc47ed40191dbd23880b2bff8fdfadfff48e 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/io.h 363148 2020-07-13 15:28:06Z hselasky $ + * $FreeBSD$ */ #ifndef _LINUX_IO_H_ #define _LINUX_IO_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/ioctl.h b/sys/compat/linuxkpi/common/include/linux/ioctl.h index db80304cad38cbe1f396e84093b552bb398eaae9..7de7737d4ce1207e561ac8c32d575bfd068d360d 100644 --- a/sys/compat/linuxkpi/common/include/linux/ioctl.h +++ b/sys/compat/linuxkpi/common/include/linux/ioctl.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/ioctl.h 299664 2016-05-13 11:42:36Z hselasky $ + * $FreeBSD$ */ #ifndef _LINUX_IOCTL_H_ #define _LINUX_IOCTL_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/jiffies.h b/sys/compat/linuxkpi/common/include/linux/jiffies.h index 29ca1e136d5ff55cfb9a52b7e286b794f871ee36..3d3e0ceac3ead23aaf7feeea884fd2c23c3f4a16 100644 --- a/sys/compat/linuxkpi/common/include/linux/jiffies.h +++ b/sys/compat/linuxkpi/common/include/linux/jiffies.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/jiffies.h 364674 2020-08-24 13:19:16Z manu $ + * $FreeBSD$ */ #ifndef _LINUX_JIFFIES_H_ #define _LINUX_JIFFIES_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index 9e146217bb46e20163a32f45fc08f6b268c374d7..cc1dfe1db01d8379d498e995fc2eaccee23f28a0 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/kernel.h 364674 2020-08-24 13:19:16Z manu $ + * $FreeBSD$ */ #ifndef _LINUX_KERNEL_H_ #define _LINUX_KERNEL_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/list.h b/sys/compat/linuxkpi/common/include/linux/list.h index ddd634ed7a351c1e0c111b41ba190f06b00740ce..8bc9b850eb37e912850219f5d8cf7b577e8ccb2d 100644 --- a/sys/compat/linuxkpi/common/include/linux/list.h +++ b/sys/compat/linuxkpi/common/include/linux/list.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/list.h 364652 2020-08-24 10:28:15Z manu $ + * $FreeBSD$ */ #ifndef _LINUX_LIST_H_ #define _LINUX_LIST_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/module.h b/sys/compat/linuxkpi/common/include/linux/module.h index 3cb52e7fccff58b28babd75741dcc6d2c8ffba5d..9ba1a8cb2ce04b150480a99f117be39d7b878da6 100644 --- a/sys/compat/linuxkpi/common/include/linux/module.h +++ b/sys/compat/linuxkpi/common/include/linux/module.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/module.h 334775 2018-06-07 11:34:59Z hselasky $ + * $FreeBSD$ */ #ifndef _LINUX_MODULE_H_ #define _LINUX_MODULE_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/rbtree.h b/sys/compat/linuxkpi/common/include/linux/rbtree.h index 87b0ade2cdbf1b0d845b62b05be21257e10a179a..30c6874a4b0d4e6a4b478d080fac4459c1ada344 100644 --- a/sys/compat/linuxkpi/common/include/linux/rbtree.h +++ b/sys/compat/linuxkpi/common/include/linux/rbtree.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/rbtree.h 290135 2015-10-29 08:28:39Z hselasky $ + * $FreeBSD$ */ #ifndef _LINUX_RBTREE_H_ #define _LINUX_RBTREE_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/rwsem.h b/sys/compat/linuxkpi/common/include/linux/rwsem.h index e9f9e725dea429483fb9e50c4b9bfcc25f3405c2..85b62830c34692d8d9c4d4139f6fecf6ba0a8624 100644 --- a/sys/compat/linuxkpi/common/include/linux/rwsem.h +++ b/sys/compat/linuxkpi/common/include/linux/rwsem.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/rwsem.h 331433 2018-03-23 15:50:01Z emaste $ + * $FreeBSD$ */ #ifndef _LINUX_RWSEM_H_ #define _LINUX_RWSEM_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/scatterlist.h b/sys/compat/linuxkpi/common/include/linux/scatterlist.h index b77b0501a7f93f73947dedb3039a2a30a999de70..661095c029044201e3322ece903f0802fa5a33d9 100644 --- a/sys/compat/linuxkpi/common/include/linux/scatterlist.h +++ b/sys/compat/linuxkpi/common/include/linux/scatterlist.h @@ -4,6 +4,7 @@ * Copyright (c) 2010 Panasas, Inc. * Copyright (c) 2013-2017 Mellanox Technologies, Ltd. * Copyright (c) 2015 Matthew Dillon + * Copyright (c) 2016 Matthew Macy * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/scatterlist.h 361205 2020-05-18 09:44:26Z hselasky $ + * $FreeBSD$ */ #ifndef _LINUX_SCATTERLIST_H_ #define _LINUX_SCATTERLIST_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/sched.h b/sys/compat/linuxkpi/common/include/linux/sched.h index f0ce40bb82a43d7a1e6411e76b95fb90054cdeef..975580ddc43c693553d5fac7851fdc1a16442141 100644 --- a/sys/compat/linuxkpi/common/include/linux/sched.h +++ b/sys/compat/linuxkpi/common/include/linux/sched.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/sched.h 364390 2020-08-19 13:32:55Z hselasky $ + * $FreeBSD$ */ #ifndef _LINUX_SCHED_H_ #define _LINUX_SCHED_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/semaphore.h b/sys/compat/linuxkpi/common/include/linux/semaphore.h index 246b70c0319db8d593ab59f3cac183038eea0b32..2fd9e683fddab8bbdbe869ca478fef79aa279851 100644 --- a/sys/compat/linuxkpi/common/include/linux/semaphore.h +++ b/sys/compat/linuxkpi/common/include/linux/semaphore.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/semaphore.h 314040 2017-02-21 12:43:02Z hselasky $ + * $FreeBSD$ */ #ifndef _LINUX_SEMAPHORE_H_ #define _LINUX_SEMAPHORE_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/slab.h b/sys/compat/linuxkpi/common/include/linux/slab.h index df7c1303cb622853ba8075df8134230e946bf297..809bfe01854a6eed0459ed327d0be986da0a3b12 100644 --- a/sys/compat/linuxkpi/common/include/linux/slab.h +++ b/sys/compat/linuxkpi/common/include/linux/slab.h @@ -2,7 +2,7 @@ * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. - * Copyright (c) 2013-2017 Mellanox Technologies, Ltd. + * Copyright (c) 2013-2021 Mellanox Technologies, Ltd. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/slab.h 365383 2020-09-06 17:40:35Z wulf $ + * $FreeBSD$ */ #ifndef _LINUX_SLAB_H_ #define _LINUX_SLAB_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/spinlock.h b/sys/compat/linuxkpi/common/include/linux/spinlock.h index cab66d41d35d60a59938e27e88909d71f6c480cf..5daf384ac2d057f65256ac053ab4fb1c548ca495 100644 --- a/sys/compat/linuxkpi/common/include/linux/spinlock.h +++ b/sys/compat/linuxkpi/common/include/linux/spinlock.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/spinlock.h 331433 2018-03-23 15:50:01Z emaste $ + * $FreeBSD$ */ #ifndef _LINUX_SPINLOCK_H_ #define _LINUX_SPINLOCK_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/string.h b/sys/compat/linuxkpi/common/include/linux/string.h index e06625deb1deda8823f73c0bb48f0e62f5761f66..c298147c5f5750b597fbbd7bbbe715a757edbd6f 100644 --- a/sys/compat/linuxkpi/common/include/linux/string.h +++ b/sys/compat/linuxkpi/common/include/linux/string.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/string.h 364652 2020-08-24 10:28:15Z manu $ + * $FreeBSD$ */ #ifndef __LINUX_STRING_H__ #define __LINUX_STRING_H__ diff --git a/sys/compat/linuxkpi/common/include/linux/timer.h b/sys/compat/linuxkpi/common/include/linux/timer.h index 9c3979c1763a269363a3d56b0a9103dbd2d72f9a..3bc479b843db323b08b7ccdbf7c5538e716e19ab 100644 --- a/sys/compat/linuxkpi/common/include/linux/timer.h +++ b/sys/compat/linuxkpi/common/include/linux/timer.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/timer.h 364672 2020-08-24 13:14:38Z manu $ + * $FreeBSD$ */ #ifndef _LINUX_TIMER_H_ #define _LINUX_TIMER_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/types.h b/sys/compat/linuxkpi/common/include/linux/types.h index c539e9c4b3470d024e8c7a9b44e5eb80946b06fc..f0dee347099027b8dcd96eff6d7bed1f2b87ede8 100644 --- a/sys/compat/linuxkpi/common/include/linux/types.h +++ b/sys/compat/linuxkpi/common/include/linux/types.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/types.h 361178 2020-05-18 09:10:21Z hselasky $ + * $FreeBSD$ */ #ifndef _LINUX_TYPES_H_ #define _LINUX_TYPES_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/usb.h b/sys/compat/linuxkpi/common/include/linux/usb.h index e949a127e29297a8df38a4feef4d9caedd013c00..90cfe1ce3ebaa7f7ef42a3914f50824f78b4c628 100644 --- a/sys/compat/linuxkpi/common/include/linux/usb.h +++ b/sys/compat/linuxkpi/common/include/linux/usb.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/usb.h 331433 2018-03-23 15:50:01Z emaste $ */ +/* $FreeBSD$ */ /*- * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved. * Copyright (c) 2007 Hans Petter Selasky. All rights reserved. diff --git a/sys/compat/linuxkpi/common/include/linux/wait.h b/sys/compat/linuxkpi/common/include/linux/wait.h index 04880556ea374be1ae1fc4f26161c38163b91391..e49b67aed5b06f4f00193fdfaccfd77ee62e0b99 100644 --- a/sys/compat/linuxkpi/common/include/linux/wait.h +++ b/sys/compat/linuxkpi/common/include/linux/wait.h @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/wait.h 364674 2020-08-24 13:19:16Z manu $ + * $FreeBSD$ */ #ifndef _LINUX_WAIT_H_ diff --git a/sys/compat/linuxkpi/common/include/linux/workqueue.h b/sys/compat/linuxkpi/common/include/linux/workqueue.h index 1023e3716e1a26e0f53d3725a1f3e7a0d8ca053f..19885c47d6e5d48d64362535d2c5718ee013dcd5 100644 --- a/sys/compat/linuxkpi/common/include/linux/workqueue.h +++ b/sys/compat/linuxkpi/common/include/linux/workqueue.h @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/include/linux/workqueue.h 364671 2020-08-24 12:59:55Z manu $ + * $FreeBSD$ */ #ifndef _LINUX_WORKQUEUE_H_ #define _LINUX_WORKQUEUE_H_ diff --git a/sys/compat/linuxkpi/common/src/linux_usb.c b/sys/compat/linuxkpi/common/src/linux_usb.c index c30a3d0b253d665b50ae6c2f6dac9da96be44c10..b8f3f8101082638ef4c0dfe8df9f3faa926e886a 100644 --- a/sys/compat/linuxkpi/common/src/linux_usb.c +++ b/sys/compat/linuxkpi/common/src/linux_usb.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/compat/linuxkpi/common/src/linux_usb.c 363664 2020-07-29 14:30:42Z markj $ */ +/* $FreeBSD$ */ /*- * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved. * Copyright (c) 2007 Hans Petter Selasky. All rights reserved. diff --git a/sys/crypto/rijndael/rijndael-alg-fst.c b/sys/crypto/rijndael/rijndael-alg-fst.c index b300b40c16fc137f6e17f55a33e9852c937f68b6..5197e226a26e1eda6f1905bb40803feb98357e15 100644 --- a/sys/crypto/rijndael/rijndael-alg-fst.c +++ b/sys/crypto/rijndael/rijndael-alg-fst.c @@ -25,7 +25,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/crypto/rijndael/rijndael-alg-fst.c 149176 2005-08-17 07:59:07Z pjd $"); +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/crypto/rijndael/rijndael-api-fst.c b/sys/crypto/rijndael/rijndael-api-fst.c index 586d2850ea49b8b69d74e3696f30a682e3de4088..ec195ad74a9eda39919bc3423e4129c7a275c7b3 100644 --- a/sys/crypto/rijndael/rijndael-api-fst.c +++ b/sys/crypto/rijndael/rijndael-api-fst.c @@ -16,7 +16,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/crypto/rijndael/rijndael-api-fst.c 274380 2014-11-11 13:37:28Z des $"); +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/crypto/rijndael/rijndael-api-fst.h b/sys/crypto/rijndael/rijndael-api-fst.h index 63248f8459fd9842812defbd24642791f107a537..e5f596ac75f82d144c8a237cbd825ea683073d7a 100644 --- a/sys/crypto/rijndael/rijndael-api-fst.h +++ b/sys/crypto/rijndael/rijndael-api-fst.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/crypto/rijndael/rijndael-api-fst.h 274341 2014-11-10 09:55:35Z des $ */ +/* $FreeBSD$ */ /* $KAME: rijndael-api-fst.h,v 1.6 2001/05/27 00:23:23 itojun Exp $ */ /* diff --git a/sys/crypto/rijndael/rijndael.h b/sys/crypto/rijndael/rijndael.h index 8e87a58e9700c3369bb0b1facc7f20790dec7af0..da855284dcc54c01f528b42df64a95d2c55f368d 100644 --- a/sys/crypto/rijndael/rijndael.h +++ b/sys/crypto/rijndael/rijndael.h @@ -1,5 +1,5 @@ /* $KAME: rijndael.h,v 1.6 2003/08/28 08:36:32 itojun Exp $ */ -/* $FreeBSD: releng/12.2/sys/crypto/rijndael/rijndael.h 143431 2005-03-11 22:07:04Z ume $ */ +/* $FreeBSD$ */ /** * rijndael-alg-fst.h diff --git a/sys/crypto/rijndael/rijndael_local.h b/sys/crypto/rijndael/rijndael_local.h index 66de32b1ff6977a6a9b2b2cb3d7f7fbfa912af6e..7c765a2b11f8d75beded08f2cbb428e0de790a1e 100644 --- a/sys/crypto/rijndael/rijndael_local.h +++ b/sys/crypto/rijndael/rijndael_local.h @@ -1,5 +1,5 @@ /* $KAME: rijndael_local.h,v 1.5 2003/08/28 08:37:24 itojun Exp $ */ -/* $FreeBSD: releng/12.2/sys/crypto/rijndael/rijndael_local.h 121050 2003-10-12 21:05:05Z ume $ */ +/* $FreeBSD$ */ /* the file should not be used from outside */ typedef u_int8_t u8; diff --git a/sys/crypto/sha2/sha256.h b/sys/crypto/sha2/sha256.h index ebf45fa266a0d1c1bc2cdcc3ff789315b3a76561..bd31a6210ac6115285c81b21e03a184f6e4293d6 100644 --- a/sys/crypto/sha2/sha256.h +++ b/sys/crypto/sha2/sha256.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/crypto/sha2/sha256.h 307584 2016-10-18 23:20:49Z asomers $ + * $FreeBSD$ */ #ifndef _SHA256_H_ diff --git a/sys/crypto/sha2/sha256c.c b/sys/crypto/sha2/sha256c.c index dd0f44670b046c32fbf6cadb14e7d12e900b7ef2..d28820bb7023e09458df85bafa0bd205bedea1be 100644 --- a/sys/crypto/sha2/sha256c.c +++ b/sys/crypto/sha2/sha256c.c @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/crypto/sha2/sha256c.c 336539 2018-07-20 07:01:28Z delphij $"); +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/dev/evdev/input-event-codes.h b/sys/dev/evdev/input-event-codes.h index bfa56a284fbe7f00ff3a38b6ccf2d5eb76c4b03e..a910ad2112b8393000dd0b68dda1bea0327bf7be 100644 --- a/sys/dev/evdev/input-event-codes.h +++ b/sys/dev/evdev/input-event-codes.h @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/evdev/input-event-codes.h 362206 2020-06-15 22:32:59Z wulf $ + * $FreeBSD$ */ #ifndef _EVDEV_INPUT_EVENT_CODES_H diff --git a/sys/dev/mii/mii.h b/sys/dev/mii/mii.h index b8b020312b2abb7d40b5657c744a64fea23ea5b2..f9f39d4e8f619385586caba213df7e210922ee50 100644 --- a/sys/dev/mii/mii.h +++ b/sys/dev/mii/mii.h @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/mii/mii.h 326255 2017-11-27 14:52:40Z pfg $ + * $FreeBSD$ */ #ifndef _DEV_MII_MII_H_ diff --git a/sys/dev/random/hash.c b/sys/dev/random/hash.c index 1ad57a4f7a71fda39d9cc8d870057fbcf9e41a9b..2fb3c317c31abf8e8317dd1d32990a28a54805f1 100644 --- a/sys/dev/random/hash.c +++ b/sys/dev/random/hash.c @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/dev/random/hash.c 292782 2015-12-27 17:33:59Z allanjude $"); +__FBSDID("$FreeBSD$"); #ifdef _KERNEL #include diff --git a/sys/dev/random/hash.h b/sys/dev/random/hash.h index 87a33a98ec668e01ba94a544db596ba7d883aace..41dcf9089f0e0aa062c000a7cb394fabdfd88789 100644 --- a/sys/dev/random/hash.h +++ b/sys/dev/random/hash.h @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/random/hash.h 285422 2015-07-12 18:14:38Z markm $ + * $FreeBSD$ */ #ifndef SYS_DEV_RANDOM_HASH_H_INCLUDED diff --git a/sys/dev/random/randomdev.h b/sys/dev/random/randomdev.h index 8b29f827c669025c4826ceb2314780ea6d0e1d16..0f3b359d1f1f7dd7e1405120945ddd67ea392626 100644 --- a/sys/dev/random/randomdev.h +++ b/sys/dev/random/randomdev.h @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/random/randomdev.h 286839 2015-08-17 07:36:12Z markm $ + * $FreeBSD$ */ #ifndef SYS_DEV_RANDOM_RANDOMDEV_H_INCLUDED diff --git a/sys/dev/random/uint128.h b/sys/dev/random/uint128.h index fe60aeacdc321dc008ca24a36f1e251b93fc96da..22380b2f6a3b21fc2323af28de6940624eeff552 100644 --- a/sys/dev/random/uint128.h +++ b/sys/dev/random/uint128.h @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/random/uint128.h 284959 2015-06-30 17:00:45Z markm $ + * $FreeBSD$ */ #ifndef SYS_DEV_RANDOM_UINT128_H_INCLUDED diff --git a/sys/dev/random/unit_test.h b/sys/dev/random/unit_test.h index 455e6017f3327af8c2931d87a8d401456162aa67..6ffeabcbb82b45dc72fe1ea3ac77effa1a86c19b 100644 --- a/sys/dev/random/unit_test.h +++ b/sys/dev/random/unit_test.h @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/random/unit_test.h 338324 2018-08-26 12:51:46Z markm $ + * $FreeBSD$ */ diff --git a/sys/dev/random/yarrow.c b/sys/dev/random/yarrow.c index b92dbe072c34ee8dbfd01c7e8edba333761d33a4..fe2e0c7e6c461b095ce4f0551091250ae2f8d4c7 100644 --- a/sys/dev/random/yarrow.c +++ b/sys/dev/random/yarrow.c @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/dev/random/yarrow.c 298923 2016-05-02 14:35:57Z pfg $"); +__FBSDID("$FreeBSD$"); #include #ifdef _KERNEL diff --git a/sys/dev/random/yarrow.h b/sys/dev/random/yarrow.h index bfda334b097a04b24cd30359e7bf622de09d3dab..19e6d1549f3105d9bcd15df57797bf2db1b92389 100644 --- a/sys/dev/random/yarrow.h +++ b/sys/dev/random/yarrow.h @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/random/yarrow.h 284959 2015-06-30 17:00:45Z markm $ + * $FreeBSD$ */ #ifndef SYS_DEV_RANDOM_YARROW_H_INCLUDED diff --git a/sys/dev/usb/controller/ehci.c b/sys/dev/usb/controller/ehci.c index a88395c982a5590d62ae3c9b9084982cebb2e463..eedd7805f166ae85daa05db2cc2c9ec42f532ed5 100644 --- a/sys/dev/usb/controller/ehci.c +++ b/sys/dev/usb/controller/ehci.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/controller/ehci.c 327173 2017-12-25 04:48:39Z kan $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/controller/ehci.h b/sys/dev/usb/controller/ehci.h index bad4b043b8e6054bb4bacaddfb2b04061377da23..a5bb3610510883eb94f194a073d22b06db725278 100644 --- a/sys/dev/usb/controller/ehci.h +++ b/sys/dev/usb/controller/ehci.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/controller/ehci.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD * diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index c6bac502d625dffaf2c5d8777ff466677c04e22f..7017fc2d572e0894eb7f393b385665cd8d13f6d5 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/dev/usb/controller/ehci_pci.c 358016 2020-02-17 09:57:03Z hselasky $"); +__FBSDID("$FreeBSD$"); /* * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller. diff --git a/sys/dev/usb/controller/ehcireg.h b/sys/dev/usb/controller/ehcireg.h index 3b89cc79e5d6e97a1cd13a0742347e18d734b86c..ae06944adfe42334616b119a0ebacc50f8104e67 100644 --- a/sys/dev/usb/controller/ehcireg.h +++ b/sys/dev/usb/controller/ehcireg.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/controller/ehcireg.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD * diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c index 9047d580fa6a08710c571c7a6bf189fac70a0e1c..37e9c175c4a282b17f4dbec8c619c3966af579ea 100644 --- a/sys/dev/usb/controller/usb_controller.c +++ b/sys/dev/usb/controller/usb_controller.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/controller/usb_controller.c 336770 2018-07-27 18:28:22Z imp $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c index a166cbbdc29a9b06faac361d32fd9e51e164abcf..7d328b8b5d121f40b2587800e58126efd7a9f9bc 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -1,8 +1,8 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/controller/xhci.c 365239 2020-09-02 10:10:28Z hselasky $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2010 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2010-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/usb/controller/xhci.h b/sys/dev/usb/controller/xhci.h index a4acff389e8a03e40bbbb57ff895ae98681d276a..bfa7c4063b452b617639f5bd52cea26f20049940 100644 --- a/sys/dev/usb/controller/xhci.h +++ b/sys/dev/usb/controller/xhci.h @@ -1,9 +1,9 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/controller/xhci.h 358018 2020-02-17 09:58:55Z hselasky $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2010 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2010-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index 0a1c9eb761242b2323057295f7215d972f708e0d..29e60fb2789b8bfac29307d78a82b07e7c9e4a19 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2010 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2010-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,7 +26,7 @@ */ #include "implementation/global_implementation.h" -__FBSDID("$FreeBSD: releng/12.2/sys/dev/usb/controller/xhci_pci.c 358016 2020-02-17 09:57:03Z hselasky $"); +__FBSDID("$FreeBSD$"); #include "controller/xhci.h" #include "controller/xhcireg.h" diff --git a/sys/dev/usb/controller/xhcireg.h b/sys/dev/usb/controller/xhcireg.h index 4da7e27adc8e1aa4433baf2da76f76296c36f967..b49bc09a8e7a6a41e719126b7ebd95ca1d7907a7 100644 --- a/sys/dev/usb/controller/xhcireg.h +++ b/sys/dev/usb/controller/xhcireg.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/controller/xhcireg.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD diff --git a/sys/dev/usb/implementation/usbdevs.h b/sys/dev/usb/implementation/usbdevs.h index 6bdc17d38454a04e9793719b7825b6e7d727884b..a12cb177e649aecc062e0b99e85e73ebd2e33b1e 100644 --- a/sys/dev/usb/implementation/usbdevs.h +++ b/sys/dev/usb/implementation/usbdevs.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usbdevs 346655 2019-04-25 00:56:11Z gonzo $ */ +/* $FreeBSD$ */ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /* diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c index 08f15885538a3a378d64145fb08a84e7549b94dc..8a8937e968325f877f57f931622f4c5084ac941d 100644 --- a/sys/dev/usb/input/uhid.c +++ b/sys/dev/usb/input/uhid.c @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/dev/usb/input/uhid.c 363664 2020-07-29 14:30:42Z markj $"); +__FBSDID("$FreeBSD$"); /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD diff --git a/sys/dev/usb/input/usb_rdesc.h b/sys/dev/usb/input/usb_rdesc.h index e962fddb1cf3908f3cec8917e80a48f2a37a22ca..00eea1223f3033a31a6d5fb12d6c8d8f28b8c9d2 100644 --- a/sys/dev/usb/input/usb_rdesc.h +++ b/sys/dev/usb/input/usb_rdesc.h @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/usb/input/usb_rdesc.h 333666 2018-05-16 03:17:37Z emaste $ + * $FreeBSD$ * * This file contains replacements for broken HID report descriptors. */ diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c index 04139b318154a2f0e787d58b8e95e87468d52d41..df60d46ef886bf1005265e8613c21fbf98fe2b3a 100644 --- a/sys/dev/usb/net/if_axe.c +++ b/sys/dev/usb/net/if_axe.c @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/dev/usb/net/if_axe.c 333813 2018-05-18 20:13:34Z mmacy $"); +__FBSDID("$FreeBSD$"); /* * ASIX Electronics AX88172/AX88178/AX88778 USB 2.0 ethernet driver. @@ -63,7 +63,7 @@ __FBSDID("$FreeBSD: releng/12.2/sys/dev/usb/net/if_axe.c 333813 2018-05-18 20:13 * to send any packets. * * Note that this device appears to only support loading the station - * address via autload from the EEPROM (i.e. there's no way to manaully + * address via autload from the EEPROM (i.e. there's no way to manually * set it). * * (Adam Weinberger wanted me to name this driver if_gir.c.) diff --git a/sys/dev/usb/net/if_axereg.h b/sys/dev/usb/net/if_axereg.h index da4f21cb64d9160d1fbf5e90bbebb28acbf9b8b0..46cffcc1dbc1e506dee94e49fbe8f06aacd19f63 100644 --- a/sys/dev/usb/net/if_axereg.h +++ b/sys/dev/usb/net/if_axereg.h @@ -31,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/usb/net/if_axereg.h 325966 2017-11-18 14:26:50Z pfg $ + * $FreeBSD$ */ /* diff --git a/sys/dev/usb/net/if_axge.c b/sys/dev/usb/net/if_axge.c index 77da9267c3444984f888d7e805e996eba7fd38e3..3b0f199c7c00c95cf5e19683ba79af79a60aa7e1 100644 --- a/sys/dev/usb/net/if_axge.c +++ b/sys/dev/usb/net/if_axge.c @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/dev/usb/net/if_axge.c 333813 2018-05-18 20:13:34Z mmacy $"); +__FBSDID("$FreeBSD$"); /* * ASIX Electronics AX88178A/AX88179 USB 2.0/3.0 gigabit ethernet driver. diff --git a/sys/dev/usb/net/if_axgereg.h b/sys/dev/usb/net/if_axgereg.h index b154f64ddd42aea811d54a5b62834b753d7e1660..b2e4c4c708ae8d19ed32920cccfda10726be9a0c 100644 --- a/sys/dev/usb/net/if_axgereg.h +++ b/sys/dev/usb/net/if_axgereg.h @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/usb/net/if_axgereg.h 326255 2017-11-27 14:52:40Z pfg $ + * $FreeBSD$ */ #define AXE_FLAG_178A 0x10000 /* AX88178A */ diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c index df8062e924ab4387d62cb3cfc46d166c35805ec4..7ac7e48b529bd99b4c10da87e651e268fd7d28a4 100644 --- a/sys/dev/usb/net/if_cdce.c +++ b/sys/dev/usb/net/if_cdce.c @@ -48,7 +48,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/dev/usb/net/if_cdce.c 328162 2018-01-19 12:59:14Z hselasky $"); +__FBSDID("$FreeBSD$"); #include "los_crc32.h" diff --git a/sys/dev/usb/net/if_cdcereg.h b/sys/dev/usb/net/if_cdcereg.h index 72cca0c8993edccb8710494e47c7bbf96d23e3c7..9c20f08b77f2930bb35225697980200a33b12566 100644 --- a/sys/dev/usb/net/if_cdcereg.h +++ b/sys/dev/usb/net/if_cdcereg.h @@ -31,7 +31,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/usb/net/if_cdcereg.h 325966 2017-11-18 14:26:50Z pfg $ + * $FreeBSD$ */ #ifndef _USB_IF_CDCEREG_H_ diff --git a/sys/dev/usb/net/if_urndis.c b/sys/dev/usb/net/if_urndis.c index 7529ec7c8dff5a5ce2f300e6f0a07151dfd11782..300edbcf2b6306e6a4348e57ee1c46f343957be7 100644 --- a/sys/dev/usb/net/if_urndis.c +++ b/sys/dev/usb/net/if_urndis.c @@ -21,7 +21,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/dev/usb/net/if_urndis.c 365748 2020-09-15 12:34:01Z lwhsu $"); +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/dev/usb/net/if_urndisreg.h b/sys/dev/usb/net/if_urndisreg.h index 47551473d7d668064c87ff08e4dcd33786aac18f..942f9070cdca0eae99d054234fd2064ab47a8046 100644 --- a/sys/dev/usb/net/if_urndisreg.h +++ b/sys/dev/usb/net/if_urndisreg.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/net/if_urndisreg.h 304654 2016-08-23 02:54:06Z sephe $ */ +/* $FreeBSD$ */ /* $OpenBSD: if_urndisreg.h,v 1.19 2013/11/21 14:08:05 mpi Exp $ */ /* diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c index 5f054d5f5fb4f2c7e56c91e0d5749054adbb4234..12e80f16e355696539f318fc2aaa82791667b051 100644 --- a/sys/dev/usb/net/usb_ethernet.c +++ b/sys/dev/usb/net/usb_ethernet.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/net/usb_ethernet.c 334158 2018-05-24 15:24:42Z hselasky $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/dev/usb/net/usb_ethernet.c 334158 2018-05-24 15:24:42Z hselasky $"); +__FBSDID("$FreeBSD$"); #include diff --git a/sys/dev/usb/net/usb_ethernet.h b/sys/dev/usb/net/usb_ethernet.h index d35a69579fd1454d6738715703e3b297d92fb6b5..65f3a9e70f4e9df43991a4b83cd1aaa1dae8d4c5 100644 --- a/sys/dev/usb/net/usb_ethernet.h +++ b/sys/dev/usb/net/usb_ethernet.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/net/usb_ethernet.h 334158 2018-05-24 15:24:42Z hselasky $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/usb/net/usb_ethernet.h 334158 2018-05-24 15:24:42Z hselasky $ + * $FreeBSD$ */ #ifndef _USB_ETHERNET_H_ diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 64fc0d4a8a1b86421ffc7e408662c3130c020487..4114b2d8e0aab08ed176ffbadf6dc98474262f24 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/quirk/usb_quirk.c 345544 2019-03-26 13:52:01Z hselasky $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD * diff --git a/sys/dev/usb/quirk/usb_quirk.h b/sys/dev/usb/quirk/usb_quirk.h index 5050caea4c2780fa5d4318942cad075dfca3052f..bfbe73a4858ab02821b5ed308cc8a59858b92999 100644 --- a/sys/dev/usb/quirk/usb_quirk.h +++ b/sys/dev/usb/quirk/usb_quirk.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/quirk/usb_quirk.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c index c2f3682683d881559e102860333b6ad3a4188ddc..efce347a9d2bf75c3b7c8067f5ca7dcfa92e146a 100644 --- a/sys/dev/usb/serial/u3g.c +++ b/sys/dev/usb/serial/u3g.c @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: releng/12.2/sys/dev/usb/serial/u3g.c 359256 2020-03-23 18:31:13Z hselasky $ + * $FreeBSD$ */ /* diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index 354a3250bd13a2395ed716e1e6c11b1bb320cc2e..857e016b12594e7b08845bb0d66be07a4951aa77 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/dev/usb/serial/usb_serial.c 332996 2018-04-25 15:28:46Z trasz $"); +__FBSDID("$FreeBSD$"); /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. diff --git a/sys/dev/usb/serial/usb_serial.h b/sys/dev/usb/serial/usb_serial.h index a6bd71646c33b4c815d4e635f7f68c725a9660c9..c925fda8e44435b1d16cb9cd6fc2cc9a0b6eb24e 100644 --- a/sys/dev/usb/serial/usb_serial.h +++ b/sys/dev/usb/serial/usb_serial.h @@ -1,5 +1,5 @@ /* $NetBSD: ucomvar.h,v 1.9 2001/01/23 21:56:17 augustss Exp $ */ -/* $FreeBSD: releng/12.2/sys/dev/usb/serial/usb_serial.h 332996 2018-04-25 15:28:46Z trasz $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index 96b808c91c326c34c15dc9d6dff94eef51832653..74f5817192087f124322077674730d43d5df348f 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: releng/12.2/sys/dev/usb/storage/umass.c 327173 2017-12-25 04:48:39Z kan $"); +__FBSDID("$FreeBSD$"); /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD @@ -29,7 +29,7 @@ __FBSDID("$FreeBSD: releng/12.2/sys/dev/usb/storage/umass.c 327173 2017-12-25 04 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/usb/storage/umass.c 327173 2017-12-25 04:48:39Z kan $ + * $FreeBSD$ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h index dcf128a8cc4a3d2ded388fd85a19108e94be3b72..5d18f9313a16877f2a06b16511c38a74aad059e7 100644 --- a/sys/dev/usb/usb.h +++ b/sys/dev/usb/usb.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb.h 359316 2020-03-26 05:37:08Z hselasky $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD * diff --git a/sys/dev/usb/usb_bus.h b/sys/dev/usb/usb_bus.h index 1f2b6af5a9c771dfa09c9812550fbcba0e2bf2b8..4f821b78ad78049841b13b4533d717a3f3e27c87 100644 --- a/sys/dev/usb/usb_bus.h +++ b/sys/dev/usb/usb_bus.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_bus.h 356394 2020-01-06 09:07:57Z hselasky $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_busdma.h b/sys/dev/usb/usb_busdma.h index 04c4f6361d4e1a577b71b7c49479516ffc3d54a8..7a6f30debde1a2501096811fe3332800b891b490 100644 --- a/sys/dev/usb/usb_busdma.h +++ b/sys/dev/usb/usb_busdma.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_busdma.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_cdc.h b/sys/dev/usb/usb_cdc.h index 76d649f5fad157420a3fca1cc2ce0f6324b05417..0bc1bdc4f8cbe3436740bf777e5adc56bc4822f3 100644 --- a/sys/dev/usb/usb_cdc.h +++ b/sys/dev/usb/usb_cdc.h @@ -1,5 +1,5 @@ /* $NetBSD: usbcdc.h,v 1.9 2004/10/23 13:24:24 augustss Exp $ */ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_cdc.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD diff --git a/sys/dev/usb/usb_controller.h b/sys/dev/usb/usb_controller.h index 371229d04d5415e8920d40d757b7c1b409a3c7a6..37d1a16633bde9d2f6190219e1145305951c3dd1 100644 --- a/sys/dev/usb/usb_controller.h +++ b/sys/dev/usb/usb_controller.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_controller.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_core.c b/sys/dev/usb/usb_core.c index 77ced40566761e486e4eb0f7c6df6186bc20ed6f..0df6c306fe24aaabd46507ceeb6b7e39d1cd1c36 100644 --- a/sys/dev/usb/usb_core.c +++ b/sys/dev/usb/usb_core.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_core.c 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_core.h b/sys/dev/usb/usb_core.h index c555752f2d7bd95d45612198aa40c429a0b7ce9c..9134001fd7c761c89b07ee7f9c79137e374ba75d 100644 --- a/sys/dev/usb/usb_core.h +++ b/sys/dev/usb/usb_core.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_core.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_debug.c b/sys/dev/usb/usb_debug.c index e74850eafcc54d94459778186790d24bb6db95ed..3742c0bdcd8fbcec50d1c51c60f8d81953802b43 100644 --- a/sys/dev/usb/usb_debug.c +++ b/sys/dev/usb/usb_debug.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_debug.c 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_debug.h b/sys/dev/usb/usb_debug.h index dbf0ceee55a65c72c7a09086d56f5b4501edc4e9..bee4102c388b0d7b8c789083dda1a7c9e96909df 100644 --- a/sys/dev/usb/usb_debug.h +++ b/sys/dev/usb/usb_debug.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_debug.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_dev.c b/sys/dev/usb/usb_dev.c index 08ffa7d68c20e129a0d1cf169679ffaab41b8ed7..cd6c31da7781f53d471b19943edfb950845d910f 100644 --- a/sys/dev/usb/usb_dev.c +++ b/sys/dev/usb/usb_dev.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_dev.c 363664 2020-07-29 14:30:42Z markj $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_dev.h b/sys/dev/usb/usb_dev.h index bbc01496e5df6c46f80e9ae889f149a9cc283f38..2426b327ed1106dba85bc468652cf1ecb695cb83 100644 --- a/sys/dev/usb/usb_dev.h +++ b/sys/dev/usb/usb_dev.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_dev.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c index 2a795c0a640af1188824fb53a7f24141f15481bb..77804b29218263694d8d69b4066137639779c881 100644 --- a/sys/dev/usb/usb_device.c +++ b/sys/dev/usb/usb_device.c @@ -1,8 +1,8 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_device.c 363664 2020-07-29 14:30:42Z markj $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2008-2020 Hans Petter Selasky. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/usb/usb_device.h b/sys/dev/usb/usb_device.h index 3a4f033729cbf3d4bab73732bf67e14e144466aa..0b1dd329c9a0df2d8ba988e8ba0c71100623f3b6 100644 --- a/sys/dev/usb/usb_device.h +++ b/sys/dev/usb/usb_device.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_device.h 361207 2020-05-18 09:45:59Z hselasky $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_dynamic.c b/sys/dev/usb/usb_dynamic.c index 40ea594a6237859fae0c4a87a6a382ddc6e3d838..efbde3b406685a08b28c37157be1823d64835bff 100644 --- a/sys/dev/usb/usb_dynamic.c +++ b/sys/dev/usb/usb_dynamic.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_dynamic.c 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_dynamic.h b/sys/dev/usb/usb_dynamic.h index ca31cd785df525d231c533349f4bab64fd501fdc..9644e94e9dbc466c6d2477721bbbccedef97722f 100644 --- a/sys/dev/usb/usb_dynamic.h +++ b/sys/dev/usb/usb_dynamic.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_dynamic.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_endian.h b/sys/dev/usb/usb_endian.h index e007c73d5afb07141e79d75887ad6f7e2898a312..a35f5fca7b47f4ffb8667bea756fb96b105646fe 100644 --- a/sys/dev/usb/usb_endian.h +++ b/sys/dev/usb/usb_endian.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_endian.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /* * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_error.c b/sys/dev/usb/usb_error.c index f20f37e37b72bfe8f10bf7916ad15040db79ac15..c487fd40e6a142a2ade61ceb389b835e8cbe9ea5 100644 --- a/sys/dev/usb/usb_error.c +++ b/sys/dev/usb/usb_error.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_error.c 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_freebsd_loader.h b/sys/dev/usb/usb_freebsd_loader.h index f298c0313fb693f33e46f8e1047ecf2c9c24dee6..fddac3c023d3565a7b0470e0998ba12cb44f300b 100644 --- a/sys/dev/usb/usb_freebsd_loader.h +++ b/sys/dev/usb/usb_freebsd_loader.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_freebsd_loader.h 363664 2020-07-29 14:30:42Z markj $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_generic.c b/sys/dev/usb/usb_generic.c index 136432b6d18e5c0e3ac15ffb9807cad667d03f78..a50916ca662f9b5f3f8c0c87bb0f795ef99cb079 100644 --- a/sys/dev/usb/usb_generic.c +++ b/sys/dev/usb/usb_generic.c @@ -1,8 +1,8 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_generic.c 363664 2020-07-29 14:30:42Z markj $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2008-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/usb/usb_generic.h b/sys/dev/usb/usb_generic.h index 2e676105597e0b65d2d1b947d4e5374cb1c51f6c..d03f25cd945532f6690fdb874bbb9973397d81d8 100644 --- a/sys/dev/usb/usb_generic.h +++ b/sys/dev/usb/usb_generic.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_generic.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_handle_request.c b/sys/dev/usb/usb_handle_request.c index c541a8b3e60dda36153a557611b51db9b1edf9f8..5b174c76d0a2a2288ef68b2fc99b41e94c1cec4d 100644 --- a/sys/dev/usb/usb_handle_request.c +++ b/sys/dev/usb/usb_handle_request.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_handle_request.c 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_hid.c b/sys/dev/usb/usb_hid.c index bd75048494254e0a48e5e457a19cd7e78b14e064..bf413cef97d97c1785dbc9faae823e8b2f8d401d 100644 --- a/sys/dev/usb/usb_hid.c +++ b/sys/dev/usb/usb_hid.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_hid.c 361918 2020-06-08 09:32:57Z hselasky $ */ +/* $FreeBSD$ */ /* $NetBSD: hid.c,v 1.17 2001/11/13 06:24:53 lukem Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD diff --git a/sys/dev/usb/usb_hub.c b/sys/dev/usb/usb_hub.c index 735171660c4b3c2892edd1ee4fc4b52f1a977b9b..93a60eabe9838aac4017f9bfb2267e3f83e127e2 100644 --- a/sys/dev/usb/usb_hub.c +++ b/sys/dev/usb/usb_hub.c @@ -1,10 +1,10 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_hub.c 361207 2020-05-18 09:45:59Z hselasky $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD * * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. - * Copyright (c) 2008-2010 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2008-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/usb/usb_hub.h b/sys/dev/usb/usb_hub.h index 0cec5fd8aef0c60644dbbf324d4ced74a2e590c6..3d4e08373107f6d6d5e57fc0b65452963edb8ba6 100644 --- a/sys/dev/usb/usb_hub.h +++ b/sys/dev/usb/usb_hub.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_hub.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_ioctl.h b/sys/dev/usb/usb_ioctl.h index 798ec5917be2656370f2f7ef95d982d1fa608774..7f45c5c39475ddc8744a95ef6e90a639cfca10d6 100644 --- a/sys/dev/usb/usb_ioctl.h +++ b/sys/dev/usb/usb_ioctl.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_ioctl.h 353173 2019-10-07 08:12:28Z hselasky $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * @@ -262,7 +262,7 @@ struct usb_gen_quirk { #define USB_DEVICESTATS _IOR ('U', 5, struct usb_device_stats) #define USB_DEVICEENUMERATE _IOW ('U', 6, int) -/* Generic HID device */ +/* Generic HID device. Numbers 26 and 30-39 are occupied by hidraw. */ #define USB_GET_REPORT_DESC _IOWR('U', 21, struct usb_gen_descriptor) #define USB_SET_IMMED _IOW ('U', 22, int) #define USB_GET_REPORT _IOWR('U', 23, struct usb_gen_descriptor) diff --git a/sys/dev/usb/usb_lookup.c b/sys/dev/usb/usb_lookup.c index c8d3902dec2139c467e07d081d2e423d1b324c18..3adf92bd25e074fda26b0eb65de92f739b41f068 100644 --- a/sys/dev/usb/usb_lookup.c +++ b/sys/dev/usb/usb_lookup.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_lookup.c 329460 2018-02-17 14:44:03Z hselasky $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_mbuf.c b/sys/dev/usb/usb_mbuf.c index aa0083510e407692121a37553f08030a89ab0b9a..daa496741c1d1c0b2373a2ed4e9f982fe98010ac 100644 --- a/sys/dev/usb/usb_mbuf.c +++ b/sys/dev/usb/usb_mbuf.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_mbuf.c 363664 2020-07-29 14:30:42Z markj $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_mbuf.h b/sys/dev/usb/usb_mbuf.h index b79f6dafb6648f9a9a23240ed8f9a945e0e59644..2466e2e4c4dc9d72da7129faf23bce5114ba55c3 100644 --- a/sys/dev/usb/usb_mbuf.h +++ b/sys/dev/usb/usb_mbuf.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_mbuf.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_parse.c b/sys/dev/usb/usb_parse.c index 358261da2dcc59e75795831dbee88852f503c632..ed22c9d9e4b50a2e37ee5213e689c481228bf83c 100644 --- a/sys/dev/usb/usb_parse.c +++ b/sys/dev/usb/usb_parse.c @@ -1,8 +1,8 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_parse.c 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2008-2020 Hans Petter Selasky. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/usb/usb_process.c b/sys/dev/usb/usb_process.c index b67eee0cf48e71aabde2c03b284c533617eebb1c..51fd5925f382cf888881fc3185fafda65a692588 100644 --- a/sys/dev/usb/usb_process.c +++ b/sys/dev/usb/usb_process.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_process.c 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_process.h b/sys/dev/usb/usb_process.h index 9d701df500ef1a4b32f9c054833d88548cccc402..b245f8b08eaa61d75c083157dbd092620b66bf4b 100644 --- a/sys/dev/usb/usb_process.h +++ b/sys/dev/usb/usb_process.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_process.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_request.c b/sys/dev/usb/usb_request.c index e17870bb1a008140f40436a9aaa6db37b140109a..87f3de584d64ebc0a9670f1219bd3a05d72633ee 100644 --- a/sys/dev/usb/usb_request.c +++ b/sys/dev/usb/usb_request.c @@ -1,10 +1,10 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_request.c 366693 2020-10-14 06:25:55Z martymac $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2008-2020 Hans Petter Selasky. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/usb/usb_request.h b/sys/dev/usb/usb_request.h index cdd86759db0d0458257076c4a58537c7837c483b..7c65313265ef4bb96aa515aef01e220accbfef19 100644 --- a/sys/dev/usb/usb_request.h +++ b/sys/dev/usb/usb_request.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_request.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_transfer.c b/sys/dev/usb/usb_transfer.c index 4b10d7705aaa65e9c215aacb986a1b12c984619e..5e86d4befa59c639866730f314481f181a265d73 100644 --- a/sys/dev/usb/usb_transfer.c +++ b/sys/dev/usb/usb_transfer.c @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_transfer.c 363664 2020-07-29 14:30:42Z markj $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usb_transfer.h b/sys/dev/usb/usb_transfer.h index 1f239aed1b366cd6dc98af051efbccfaa6a46bb9..26d2988b62530e09cbf80385d9b450a7f00ed84a 100644 --- a/sys/dev/usb/usb_transfer.h +++ b/sys/dev/usb/usb_transfer.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_transfer.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * @@ -30,23 +30,14 @@ #define _USB_TRANSFER_H_ /* - * Definition of internal USB transfer states: - * =========================================== + * A few words about USB transfer states: + * ====================================== * - * The main reason there are many USB states is that we are allowed to - * cancel USB transfers, then start the USB transfer again and that - * this state transaction cannot always be done in a single atomic - * operation without blocking the calling thread. One reason for this - * is that the USB hardware sometimes needs to wait for DMA - * controllers to finish which is done asynchronously and grows the - * statemachine. - * - * When extending the following statemachine there are basically two - * things you should think about: Which states should be executed or - * modified in case of USB transfer stop and which states should be - * executed or modified in case of USB transfer start. Also respect - * the "can_cancel_immed" flag which basically tells if you can go - * directly from a wait state to the cancelling states. + * USB transfers can have multiple states, because they can be + * cancelled and started again and this cannot always be done + * atomically under a mutex. One reason for this is that the USB + * hardware sometimes needs to wait for DMA controllers to finish + * which is done asynchronously and grows the statemachine. */ enum { diff --git a/sys/dev/usb/usb_util.c b/sys/dev/usb/usb_util.c index a5763cb0d0fc408260f91f7cac222fb967669c88..7c3ebcf59c82488d7ce55cb224f5b28b6d5fc25e 100644 --- a/sys/dev/usb/usb_util.c +++ b/sys/dev/usb/usb_util.c @@ -1,8 +1,8 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_util.c 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2008-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/usb/usb_util.h b/sys/dev/usb/usb_util.h index c57cf25e9cebf82b150513bdf6e48ef52f1dea15..87e54d35150ea2f13b121240f632dbc74d8f5bf4 100644 --- a/sys/dev/usb/usb_util.h +++ b/sys/dev/usb/usb_util.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usb_util.h 326255 2017-11-27 14:52:40Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h index 7fe8ee6b6ac8849a88d02a97480db1f237d3b503..9cde064229de3f0a43fc9914472afe14d5439c21 100644 --- a/sys/dev/usb/usbdi.h +++ b/sys/dev/usb/usbdi.h @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/usb/usbdi.h 361910 2020-06-08 09:26:46Z hselasky $ + * $FreeBSD$ */ #ifndef _USB_USBDI_H_ #define _USB_USBDI_H_ @@ -169,6 +169,7 @@ struct usb_endpoint { struct usb_interface { struct usb_interface_descriptor *idesc; device_t subdev; + /* Current alternate interface index, from 0 to 255 */ uint8_t alt_index; uint8_t parent_iface_index; diff --git a/sys/dev/usb/usbdi_util.h b/sys/dev/usb/usbdi_util.h index c87a1f1c7ec00fb4f357cdab9b5df84a0463b6b0..45bbca4a46379475731ed570f905d9d27c304818 100644 --- a/sys/dev/usb/usbdi_util.h +++ b/sys/dev/usb/usbdi_util.h @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/dev/usb/usbdi_util.h 326255 2017-11-27 14:52:40Z pfg $ + * $FreeBSD$ */ #ifndef _USB_USBDI_UTIL_H_ #define _USB_USBDI_UTIL_H_ diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h index b5cde8976e86c111c67d79d5e7d5df26937788b9..3eaac41e11c2dc406bf759a9d2eefbe0089ce774 100644 --- a/sys/dev/usb/usbhid.h +++ b/sys/dev/usb/usbhid.h @@ -1,4 +1,4 @@ -/* $FreeBSD: releng/12.2/sys/dev/usb/usbhid.h 361371 2020-05-22 12:03:17Z avg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD * diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c index 958d742d4849fb613b6e09be30817337cac0bf10..6865b20d613d813decf52a73e9093bab2efe5371 100644 --- a/sys/kern/kern_condvar.c +++ b/sys/kern/kern_condvar.c @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/kern/kern_condvar.c 326271 2017-11-27 15:20:12Z pfg $"); +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index e3a6368c035e726fbc9f2abdf0cc66db97b0241e..8a925a2ed715fb4b64b06064292a37c5a031da97 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/kern/kern_timeout.c 360633 2020-05-04 16:30:36Z jhb $"); +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 59ef5975a115c4fda101428fca65b4532069d3f5..992ff2b6c7aee0862c816e2e4d281b54d1ed7c6a 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/kern/subr_bus.c 365540 2020-09-09 22:59:47Z imp $"); +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c index 465f381258b5554eab238dd63a67495a4845fe13..b1adc7d45cf7320156721d707845a3ba6c541f3e 100644 --- a/sys/kern/subr_kobj.c +++ b/sys/kern/subr_kobj.c @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/kern/subr_kobj.c 343914 2019-02-08 16:38:30Z markj $"); +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/libkern/crc32.c b/sys/libkern/crc32.c index 3aa74ddc7ef652a416a5aba8b702c48cac92744b..0b56a455d010e92a656aae080313a73f187c1c6d 100644 --- a/sys/libkern/crc32.c +++ b/sys/libkern/crc32.c @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/libkern/crc32.c 323923 2017-09-22 12:45:15Z mckusick $"); +__FBSDID("$FreeBSD$"); const unsigned int crc32_tab[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, diff --git a/sys/libkern/explicit_bzero.c b/sys/libkern/explicit_bzero.c index a04c200490fcd002cc7f673a949e8d5ad5bfa4ab..e89f0b15732b5d924cdce49c8e7114496fc263ed 100644 --- a/sys/libkern/explicit_bzero.c +++ b/sys/libkern/explicit_bzero.c @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: releng/12.2/sys/libkern/explicit_bzero.c 273189 2014-10-16 22:04:07Z delphij $"); +__FBSDID("$FreeBSD$"); #include diff --git a/sys/net/ppp_defs.h b/sys/net/ppp_defs.h index e157092deec6b4d775a7369b53afd9c969128647..49dc6ff19cb3651ee4ecf6a10d0a27a4407212c8 100644 --- a/sys/net/ppp_defs.h +++ b/sys/net/ppp_defs.h @@ -25,7 +25,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $FreeBSD: releng/12.2/sys/net/ppp_defs.h 250887 2013-05-21 21:20:10Z ed $ + * $FreeBSD$ */ #ifndef _PPP_DEFS_H_ diff --git a/sys/sys/_callout.h b/sys/sys/_callout.h index 33a1439af063f8ad27b58607e899a624d3170fd4..1a388d4958d90b65ffa562181cd24cdd94906eae 100644 --- a/sys/sys/_callout.h +++ b/sys/sys/_callout.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)callout.h 8.2 (Berkeley) 1/21/94 - * $FreeBSD: releng/12.2/sys/sys/_callout.h 360633 2020-05-04 16:30:36Z jhb $ + * $FreeBSD$ */ #ifndef _SYS__CALLOUT_H diff --git a/sys/sys/bus.h b/sys/sys/bus.h index 4ecfbf60cce384cb99d9ba2eef7a5455b84b73eb..3f7a520ba3a495f8c97e867d1c0392af31a89f6d 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/sys/bus.h 360525 2020-05-01 09:46:27Z hselasky $ + * $FreeBSD$ */ #ifndef _SYS_BUS_H_ diff --git a/sys/sys/callout.h b/sys/sys/callout.h index 0d845eeb4f1a08d0a2039ff125c347f114b3fb5f..f5675d1837d906445065ed7b075fcd8ec29d4780 100644 --- a/sys/sys/callout.h +++ b/sys/sys/callout.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)callout.h 8.2 (Berkeley) 1/21/94 - * $FreeBSD: releng/12.2/sys/sys/callout.h 330349 2018-03-03 18:36:38Z hselasky $ + * $FreeBSD$ */ #ifndef _SYS_CALLOUT_H_ diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 9b7e179eb55101b43023a0b92490d84101daf9d2..a1e417c51d8859632c3c707d7dd9c077e2742423 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)cdefs.h 8.8 (Berkeley) 1/9/95 - * $FreeBSD: releng/12.2/sys/sys/cdefs.h 337399 2018-08-06 23:51:08Z jhb $ + * $FreeBSD$ */ #ifndef _SYS_CDEFS_H_ @@ -595,7 +595,7 @@ * Embed the rcs id of a source file in the resulting library. Note that in * more recent ELF binutils, we use .ident allowing the ID to be stripped. * Usage: - * __FBSDID("$FreeBSD: releng/12.2/sys/sys/cdefs.h 337399 2018-08-06 23:51:08Z jhb $"); + * __FBSDID("$FreeBSD$"); */ #ifndef __FBSDID #if !defined(STRIP_FBSDID) diff --git a/sys/sys/condvar.h b/sys/sys/condvar.h index 1efdec320163c002892b176fd7bb4f5b0277100f..cf9d78bfd2a7b6d506239d23efc183d41cfc5318 100644 --- a/sys/sys/condvar.h +++ b/sys/sys/condvar.h @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/sys/condvar.h 326256 2017-11-27 15:01:59Z pfg $ + * $FreeBSD$ */ #ifndef _SYS_CONDVAR_H_ diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index e2a229bd0a6dd4b5ba9147bde395e8cf469cd9da..8eb6aafd6028e7f7c0ed931ca1adbde0cd7e0e71 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -41,7 +41,7 @@ * SUCH DAMAGE. * * @(#)kernel.h 8.3 (Berkeley) 1/21/94 - * $FreeBSD: releng/12.2/sys/sys/kernel.h 358962 2020-03-13 16:52:16Z markj $ + * $FreeBSD$ */ #ifndef _SYS_KERNEL_H_ diff --git a/sys/sys/kobj.h b/sys/sys/kobj.h index f299db12da4519c96d9ad53646b14b8e868bf222..68bda505e1cc251e9294de28fb82f22797317b42 100644 --- a/sys/sys/kobj.h +++ b/sys/sys/kobj.h @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/sys/kobj.h 326256 2017-11-27 15:01:59Z pfg $ + * $FreeBSD$ */ #ifndef _SYS_KOBJ_H_ diff --git a/sys/sys/linker_set.h b/sys/sys/linker_set.h index 2c9455465aad2bbe799f282cabc5f4555943d560..aa0efca72d7bd7faba1240a5439cbbb02f05404b 100644 --- a/sys/sys/linker_set.h +++ b/sys/sys/linker_set.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/sys/linker_set.h 331290 2018-03-21 10:26:39Z kib $ + * $FreeBSD$ */ #ifndef _SYS_LINKER_SET_H_ diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index 68bdd209c55b4508f8f2c912f0ee7a65649bcc1b..30f7ba4482baafeebc8b03382717d2c6ebced93f 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)malloc.h 8.5 (Berkeley) 5/3/95 - * $FreeBSD: releng/12.2/sys/sys/malloc.h 365383 2020-09-06 17:40:35Z wulf $ + * $FreeBSD$ */ #ifndef _SYS_MALLOC_H_ diff --git a/sys/sys/module.h b/sys/sys/module.h index 883dbc1ff0c30ea3d2bce81661e3775653684a09..b383e4258ce7bf06a45291dac9b6bd58a65c5951 100644 --- a/sys/sys/module.h +++ b/sys/sys/module.h @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/sys/module.h 338948 2018-09-26 17:12:14Z imp $ + * $FreeBSD$ */ #ifndef _SYS_MODULE_H_ diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h index a65916c3eef8a7b8b323e87ccec0bdcf8f221284..573ffbf8d98b3512e8ea449d2a33e5e6fc3d8e20 100644 --- a/sys/sys/mutex.h +++ b/sys/sys/mutex.h @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: releng/12.2/sys/sys/mutex.h 335873 2018-07-02 19:48:38Z mmacy $ + * $FreeBSD$ */ #ifndef _SYS_MUTEX_H_ diff --git a/sys/sys/priv.h b/sys/sys/priv.h index 8552ecb622fdd920cfeee66f33fdf66539ffd383..bd09354a5fbc9e49695f004221242f6464b7029e 100644 --- a/sys/sys/priv.h +++ b/sys/sys/priv.h @@ -28,7 +28,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: releng/12.2/sys/sys/priv.h 365670 2020-09-12 19:33:25Z bz $ + * $FreeBSD$ */ /* diff --git a/sys/sys/queue.h b/sys/sys/queue.h index 13521df56088ddab23c91d01e2023568c49e9358..63645a546a09b55f229306cc36763cce99084e0a 100644 --- a/sys/sys/queue.h +++ b/sys/sys/queue.h @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD: releng/12.2/sys/sys/queue.h 349826 2019-07-07 18:49:39Z mav $ + * $FreeBSD$ */ #ifndef _SYS_QUEUE_H_ @@ -91,6 +91,7 @@ * _CLASS_ENTRY + + + + * _INIT + + + + * _EMPTY + + + + + * _END + + + + * _FIRST + + + + * _NEXT + + + + * _PREV - + - + @@ -817,7 +818,7 @@ struct { \ /* * The FAST function is fast in that it causes no data access other * then the access to the head. The standard LAST function above - * will cause a data access of both the element you want and + * will cause a data access of both the element you want and * the previous element. FAST is very useful for instances when * you may want to prefetch the last data element. */ diff --git a/sys/sys/sema.h b/sys/sys/sema.h index bbc7c534e4bd4b150a1524624c8736fbacdba8b4..bd8b3ee4b221914b52bc2703e1646176eb949973 100644 --- a/sys/sys/sema.h +++ b/sys/sys/sema.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: releng/12.2/sys/sys/sema.h 326256 2017-11-27 15:01:59Z pfg $ + * $FreeBSD$ */ #ifndef _SYS_SEMA_H_ diff --git a/sys/sys/serial.h b/sys/sys/serial.h index e174753fedaae59f42087dd1b97082a9cf49113e..1f6eda4030e2d9cb7401d63d351d6793c119da40 100644 --- a/sys/sys/serial.h +++ b/sys/sys/serial.h @@ -29,7 +29,7 @@ * (both async and sync), but which do not necessarily have anything to * do with tty processing. * - * $FreeBSD: releng/12.2/sys/sys/serial.h 326256 2017-11-27 15:01:59Z pfg $ + * $FreeBSD$ */ #ifndef _SYS_SERIAL_H_ diff --git a/sys/sys/sx.h b/sys/sys/sx.h index 43d97c2f02d602059f423cfed58252d5365fbeab..cb635ab83f0edbe65e122774343b1f7a98a4d8b5 100644 --- a/sys/sys/sx.h +++ b/sys/sys/sx.h @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: releng/12.2/sys/sys/sx.h 336230 2018-07-12 22:34:40Z mjg $ + * $FreeBSD$ */ #ifndef _SYS_SX_H_ diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 5766f4414572cbf4877cc2ace02cecf3b7aa4fb2..f5761b8a0c068578f197fb0a8edb521c16067e17 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: releng/12.2/sys/sys/systm.h 361315 2020-05-21 02:08:34Z kevans $ + * $FreeBSD$ */ #ifndef _SYS_SYSTM_H_ diff --git a/sys/sys/tree.h b/sys/sys/tree.h index b01c077755f08da2b4c8a83af05412eaf99e5b24..d2d8b585174c59cd7c45a8b38e1689bc2ca895f7 100644 --- a/sys/sys/tree.h +++ b/sys/sys/tree.h @@ -1,6 +1,6 @@ /* $NetBSD: tree.h,v 1.8 2004/03/28 19:38:30 provos Exp $ */ /* $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $ */ -/* $FreeBSD: releng/12.2/sys/sys/tree.h 326256 2017-11-27 15:01:59Z pfg $ */ +/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD