git: 9a73b5b1e843 - main - xen: remove PV suspend/resume support copyright

From: Roger Pau Monné <royger_at_FreeBSD.org>
Date: Mon, 07 Oct 2024 17:00:01 UTC
The branch main has been updated by royger:

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

commit 9a73b5b1e8430dedca205115bf618d5c56c7a56e
Author:     Roger Pau Monné <royger@FreeBSD.org>
AuthorDate: 2024-10-01 09:37:06 +0000
Commit:     Roger Pau Monné <royger@FreeBSD.org>
CommitDate: 2024-10-07 16:59:45 +0000

    xen: remove PV suspend/resume support copyright
    
    Thew code for PV suspend/resume support has long been removed, also remove the
    copyright notice associated with it.
    
    There are still two copyright blocks with (to my understanding) slightly
    different wordings of the BSD 2 clause license.  I however don't feel like
    merging them due to those wording differences.
    
    The removal of the PV suspend/resume code was done in
    ed95805e90ec0f61683cd402a42e6f915339de7d.
    
    Sponsored by: Cloud Software Group
    Reviewed by: imp
    Differential revision: https://reviews.freebsd.org/D46860
---
 sys/dev/xen/control/control.c | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c
index 4601db70ef16..123df4992894 100644
--- a/sys/dev/xen/control/control.c
+++ b/sys/dev/xen/control/control.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause AND BSD-4-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2010 Justin T. Gibbs, Spectra Logic Corporation
  * All rights reserved.
@@ -30,39 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-/*-
- * PV suspend/resume support:
- *
- * Copyright (c) 2004 Christian Limpach.
- * Copyright (c) 2004-2006,2008 Kip Macy
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Christian Limpach.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 /*-
  * HVM suspend/resume support:
  *