From owner-svn-src-head@freebsd.org Wed May 9 20:27:54 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC4CCFCB376 for ; Wed, 9 May 2018 20:27:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x22e.google.com (mail-it0-x22e.google.com [IPv6:2607:f8b0:4001:c0b::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 61C238517B for ; Wed, 9 May 2018 20:27:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x22e.google.com with SMTP id n64-v6so489251itb.3 for ; Wed, 09 May 2018 13:27:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=OqaHnmYNgJi+IzCGFD+gFU4uP0r1H66ieeWLk09sCqA=; b=bX8kGodEk61ynujZo/+dR7j3okb1q9YOXE9xpiHDtao90JUUol08ALKehe8X1vPefS wQnX8aEV69cqUU5RMcxybkug6uRX8bWxdb5NTeVokpfjw7ryQ4kr79DCR1U+BK0x4j7M fEpmzkOD+z845kRJZJj1oaYKWyWNAdWQ6mjW2ywl5bqM4oWI+nmt1a9LaDeZyFl5NXaU x3AuIpEl2C9FtHcy6VySvDapRvnQzlq3WLlKurkQQEXzuRw0U0MgW75xzInve7bKxFf0 FAo5A09QBDoMMdfW6RHdgrE202eZw9QLAelQUjraAVbwJXhX5QyhjPV0CxmI0CpFHzoN yOhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=OqaHnmYNgJi+IzCGFD+gFU4uP0r1H66ieeWLk09sCqA=; b=f5rEVQ2xQ/wdUfPFdqyUWuvK/TJK+Ba+ICtg6scRs/3b5bvLxN/MjeXRPaXU7sUBSC hU613VRZlzj946TtOJYvKywLNkYqjV2JUp3MGnEPTVV/MKdarjMEVffUGLOHy0qlYFLg gaA2QKKBWJMxmDfLJSjTvdlF4SPufIFhT1QcicVWJ3XCgjLf8vz/4fyC7ctwgQ24PhXq I5anq6Cm43drPVR4bSzBaQxCLKj+k6UOu30Se+M8HnadeZJPWeo9oHS76CL1ZrA10k70 KQA7UhNMwnPZTbG+RIVhYrYU6JpFQahspqfIf40ameo6altgkSjTglhZdzFAAclhIk3l bDWw== X-Gm-Message-State: ALKqPwcQWtLQN+pBtwFjz55jZ6UFyKM0K2vsFG76AhwCkka7chPHAnBS l2t+fOi+nEXPtYMnZ8rlgeeTmhyGy31NdKSC+cmSctoi X-Google-Smtp-Source: AB8JxZrrFVCaA0SeJyzZ/86PbNKHI+79Ogeq66zXRrQP7NmxUrWOQfZuWLLu2RfSfWbczIptsYqI72fHkV2HhjAHvVI= X-Received: by 2002:a24:4c55:: with SMTP id a82-v6mr11227249itb.1.1525897672668; Wed, 09 May 2018 13:27:52 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 2002:a4f:a649:0:0:0:0:0 with HTTP; Wed, 9 May 2018 13:27:51 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:1052:acc7:f9de:2b6d] In-Reply-To: References: <201805091411.w49EBaa6073113@repo.freebsd.org> From: Warner Losh Date: Wed, 9 May 2018 14:27:51 -0600 X-Google-Sender-Auth: jbQ2DwxcPa3uo8-1GuBApK6tFCo Message-ID: Subject: Re: svn commit: r333409 - in head/sys: netinet sys To: Oliver Pinter Cc: Warner Losh , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 May 2018 20:27:54 -0000 On Wed, May 9, 2018 at 2:05 PM, Oliver Pinter wrote: > > > On Wednesday, May 9, 2018, Warner Losh wrote: > >> Author: imp >> Date: Wed May 9 14:11:35 2018 >> New Revision: 333409 >> URL: https://svnweb.freebsd.org/changeset/base/333409 >> >> Log: >> Minor style nits >> >> Use full copyright year. >> Remove 'All Rights Reserved' from new file (rights holder OK'd) >> Minor #ifdef motion and #endif tagging >> Remove __FBSDID macro from comments >> >> Sponsored by: Netflix >> OK'd by: rrs@ >> >> Modified: >> head/sys/netinet/tcp_hpts.c >> head/sys/netinet/tcp_hpts.h >> head/sys/sys/kern_prefetch.h >> >> Modified: head/sys/netinet/tcp_hpts.c >> ============================================================ >> ================== >> --- head/sys/netinet/tcp_hpts.c Wed May 9 13:53:10 2018 (r333408) >> +++ head/sys/netinet/tcp_hpts.c Wed May 9 14:11:35 2018 (r333409) >> @@ -1,6 +1,5 @@ >> /*- >> - * Copyright (c) 2016-8 >> - * Netflix Inc. All rights reserved. >> + * Copyright (c) 2016-2018 Netflix Inc. >> * >> * Redistribution and use in source and binary forms, with or without >> * modification, are permitted provided that the following conditions >> >> Modified: head/sys/netinet/tcp_hpts.h >> ============================================================ >> ================== >> --- head/sys/netinet/tcp_hpts.h Wed May 9 13:53:10 2018 (r333408) >> +++ head/sys/netinet/tcp_hpts.h Wed May 9 14:11:35 2018 (r333409) >> @@ -1,8 +1,5 @@ >> -#ifndef __tcp_hpts_h__ >> -#define __tcp_hpts_h__ >> /*- >> - * Copyright (c) 2016-8 >> - * Netflix Inc. All rights reserved. >> + * Copyright (c) 2016-18 Netflix Inc. > > > Hi! > > Could you please use full year here, same as in the other parts of this > patch? > Doh! I fixed that before the commit. I was sure.... Anyway, fixed now in r333433. Warner * >> * Redistribution and use in source and binary forms, with or without >> * modification, are permitted provided that the following conditions >> @@ -25,9 +22,12 @@ >> * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF >> * SUCH DAMAGE. >> * >> - * __FBSDID("$FreeBSD$") >> + * $FreeBSD$ >> */ >> >> +#ifndef __tcp_hpts_h__ >> +#define __tcp_hpts_h__ >> + >> /* >> * The hpts uses a 102400 wheel. The wheel >> * defines the time in 10 usec increments (102400 x 10). >> @@ -300,5 +300,5 @@ tcp_get_usecs(struct timeval *tv) >> return (tcp_tv_to_usectick(tv)); >> } >> >> -#endif >> -#endif >> +#endif /* _KERNEL */ >> +#endif /* __tcp_hpts_h__ */ >> >> Modified: head/sys/sys/kern_prefetch.h >> ============================================================ >> ================== >> --- head/sys/sys/kern_prefetch.h Wed May 9 13:53:10 2018 >> (r333408) >> +++ head/sys/sys/kern_prefetch.h Wed May 9 14:11:35 2018 >> (r333409) >> @@ -1,7 +1,5 @@ >> -#ifndef __kern_prefetch_h__ >> /*- >> - * Copyright (c) 2016-8 >> - * Netflix Inc. All rights reserved. >> + * Copyright (c) 2016-2018 Netflix Inc. >> * >> * Redistribution and use in source and binary forms, with or without >> * modification, are permitted provided that the following conditions >> @@ -24,8 +22,9 @@ >> * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF >> * SUCH DAMAGE. >> * >> - * __FBSDID("$FreeBSD$") >> + * $FreeBSD$ >> */ >> +#ifndef __kern_prefetch_h__ >> #define __kern_prefetch_h__ >> #ifdef _KERNEL >> >> @@ -39,5 +38,5 @@ kern_prefetch(const volatile void *addr, void* before) >> #endif >> } >> >> -#endif >> -#endif >> +#endif /* _KERNEL */ >> +#endif /* __kern_prefetch_h__ */ >> _______________________________________________ >> svn-src-head@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/svn-src-head >> To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >> >