Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Aug 2023 17:49:40 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: ecf688348bd2 - stable/13 - sys: Remove $FreeBSD$: two-line .c pattern
Message-ID:  <202308231749.37NHne32040788@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=ecf688348bd2c1e292b64a1a37b1d0f545aaa11e

commit ecf688348bd2c1e292b64a1a37b1d0f545aaa11e
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-08-22 01:31:20 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-08-23 17:43:23 +0000

    sys: Remove $FreeBSD$: two-line .c pattern
    
    Remove /^#include\s+<sys/cdefs.h>.*$\n\s+__FBSDID\("\$FreeBSD\$"\);\n/
    
    Similar commit in current:
    (cherry picked from commit dfc016587a1e)
---
 sys/arm/broadcom/bcm2835/bcm2835_rng.c | 3 ---
 sys/arm/freescale/imx/imx6_ahci.c      | 3 ---
 sys/dev/gpio/gpiopower.c               | 3 ---
 sys/dev/videomode/vesagtf.c            | 3 ---
 sys/fs/autofs/autofs_vfsops.c          | 2 --
 sys/fs/tmpfs/tmpfs_fifoops.c           | 2 --
 sys/net/rss_config.c                   | 3 ---
 sys/netinet/in_pcbgroup.c              | 3 ---
 sys/netinet/in_rss.c                   | 3 ---
 sys/netinet6/in6_pcbgroup.c            | 3 ---
 sys/netinet6/in6_rss.c                 | 3 ---
 11 files changed, 31 deletions(-)

diff --git a/sys/arm/broadcom/bcm2835/bcm2835_rng.c b/sys/arm/broadcom/bcm2835/bcm2835_rng.c
index c403bc3542e0..e7a4cfbabe91 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_rng.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_rng.c
@@ -24,9 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/arm/freescale/imx/imx6_ahci.c b/sys/arm/freescale/imx/imx6_ahci.c
index 8b49c71c34a0..69c4af40f9c0 100644
--- a/sys/arm/freescale/imx/imx6_ahci.c
+++ b/sys/arm/freescale/imx/imx6_ahci.c
@@ -24,9 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/gpio/gpiopower.c b/sys/dev/gpio/gpiopower.c
index 98b635e3fd2a..a3dd8b02622f 100644
--- a/sys/dev/gpio/gpiopower.c
+++ b/sys/dev/gpio/gpiopower.c
@@ -24,9 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/videomode/vesagtf.c b/sys/dev/videomode/vesagtf.c
index c02c421c14ac..077cf7d1a0ea 100644
--- a/sys/dev/videomode/vesagtf.c
+++ b/sys/dev/videomode/vesagtf.c
@@ -150,9 +150,6 @@
  */
 
 #ifdef	_KERNEL
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/autofs/autofs_vfsops.c b/sys/fs/autofs/autofs_vfsops.c
index 07bec01517c8..473a0b2280ac 100644
--- a/sys/fs/autofs/autofs_vfsops.c
+++ b/sys/fs/autofs/autofs_vfsops.c
@@ -29,8 +29,6 @@
  *
  */
 
-#include <sys/cdefs.h>
- __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/fs/tmpfs/tmpfs_fifoops.c b/sys/fs/tmpfs/tmpfs_fifoops.c
index 75122b10eacc..fba24e02a71e 100644
--- a/sys/fs/tmpfs/tmpfs_fifoops.c
+++ b/sys/fs/tmpfs/tmpfs_fifoops.c
@@ -35,8 +35,6 @@
 /*
  * tmpfs vnode interface for named pipes.
  */
-#include <sys/cdefs.h>
- __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sys/net/rss_config.c b/sys/net/rss_config.c
index 0b559307f1bb..9a636845d75a 100644
--- a/sys/net/rss_config.c
+++ b/sys/net/rss_config.c
@@ -27,9 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
 #include "opt_pcbgroup.h"
diff --git a/sys/netinet/in_pcbgroup.c b/sys/netinet/in_pcbgroup.c
index c48046b2acbc..0683f37a0e5f 100644
--- a/sys/netinet/in_pcbgroup.c
+++ b/sys/netinet/in_pcbgroup.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
 #include "opt_rss.h"
diff --git a/sys/netinet/in_rss.c b/sys/netinet/in_rss.c
index e73d2d236f92..72dfbf63f98c 100644
--- a/sys/netinet/in_rss.c
+++ b/sys/netinet/in_rss.c
@@ -27,9 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
 #include "opt_pcbgroup.h"
diff --git a/sys/netinet6/in6_pcbgroup.c b/sys/netinet6/in6_pcbgroup.c
index 7982c1edc646..3a72be553ca3 100644
--- a/sys/netinet6/in6_pcbgroup.c
+++ b/sys/netinet6/in6_pcbgroup.c
@@ -29,9 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
 #include "opt_rss.h"
diff --git a/sys/netinet6/in6_rss.c b/sys/netinet6/in6_rss.c
index 2b86d961515b..9308c758b5cc 100644
--- a/sys/netinet6/in6_rss.c
+++ b/sys/netinet6/in6_rss.c
@@ -27,9 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
 #include "opt_pcbgroup.h"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308231749.37NHne32040788>