diff mbox series

Updated the FSF address to <https://www.gnu.org/licenses/>

Message ID d1500fe9389a1f6964a2b132466d5be2a44d205f.1675858906.git.kkamran.bese16seecs@seecs.edu.pk
State New
Headers show
Series Updated the FSF address to <https://www.gnu.org/licenses/> | expand

Commit Message

Khadija Kamran Feb. 8, 2023, 12:51 p.m. UTC

Comments

Khadija Kamran Feb. 8, 2023, 12:56 p.m. UTC | #1
Hey Markus! Thank you for the help with the git rebase command. I was able
to combine my commits to one, create a patch and email it. :)

On Wed, Feb 8, 2023 at 12:52 PM Khadija Kamran <
kkamran.bese16seecs@seecs.edu.pk> wrote:

> diff --git a/contrib/gitdm/filetypes.txt b/contrib/gitdm/filetypes.txt
> index d2d6f6db8d..b1d01c0992 100644
> --- a/contrib/gitdm/filetypes.txt
> +++ b/contrib/gitdm/filetypes.txt
> @@ -12,8 +12,7 @@
>  # GNU Library General Public License for more details.
>  #
>  # You should have received a copy of the GNU General Public License
> -# along with this program; if not, write to the Free Software
> -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
> USA.
> +# along with this program. If not, see <https://www.gnu.org/licenses/>.
>  #
>  # Authors : Gregorio Robles <grex@gsyc.escet.urjc.es>
>  # Authors : Germán Póo-Caamaño <gpoo@gnome.org>
> diff --git a/hw/scsi/viosrp.h b/hw/scsi/viosrp.h
> index e5f9768e8f..58c29aa925 100644
> --- a/hw/scsi/viosrp.h
> +++ b/hw/scsi/viosrp.h
> @@ -16,8 +16,7 @@
>  /* GNU General Public License for more details.
>     */
>  /*
>    */
>  /* You should have received a copy of the GNU General Public License
>    */
> -/* along with this program; if not, write to the Free Software
>    */
> -/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
> USA */
> +/* along with this program. If not, see <https://www.gnu.org/licenses/>.
>    */
>  /*
>    */
>  /*
>    */
>  /* This file contains structures and definitions for IBM RPA (RS/6000
>     */
> diff --git a/hw/sh4/sh7750_regs.h b/hw/sh4/sh7750_regs.h
> index beb571d5e9..94043431e6 100644
> --- a/hw/sh4/sh7750_regs.h
> +++ b/hw/sh4/sh7750_regs.h
> @@ -22,8 +22,7 @@
>   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>   * General Public License for more details. You should have received
>   * a copy of the GNU General Public License along with RTEMS; see
> - * file COPYING. If not, write to the Free Software Foundation, 675
> - * Mass Ave, Cambridge, MA 02139, USA.
> + * file COPYING. If not, see <https://www.gnu.org/licenses/>.
>   *
>   * As a special exception, including RTEMS header files in a file,
>   * instantiating RTEMS generics or templates, or linking other files
> diff --git a/include/hw/arm/raspi_platform.h
> b/include/hw/arm/raspi_platform.h
> index e0e6c8ce94..4a56dd4b89 100644
> --- a/include/hw/arm/raspi_platform.h
> +++ b/include/hw/arm/raspi_platform.h
> @@ -18,8 +18,7 @@
>   * GNU General Public License for more details.
>   *
>   * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
> USA
> + * along with this program. If not, see <https://www.gnu.org/licenses/>.
>   *
>   * Various undocumented addresses and names come from Herman Hermitage's
> VC4
>   * documentation:
> diff --git a/include/qemu/uri.h b/include/qemu/uri.h
> index d201c61260..cf8ec70356 100644
> --- a/include/qemu/uri.h
> +++ b/include/qemu/uri.h
> @@ -41,8 +41,7 @@
>   * Lesser General Public License for more details.
>   *
>   * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> USA
> + * License along with this library. If not, see <
> https://www.gnu.org/licenses/>.
>   *
>   * Authors:
>   *    Richard W.M. Jones <rjones@redhat.com>
> diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022
> index a116cfe255..d98d1ea90f 100755
> --- a/tests/qemu-iotests/022
> +++ b/tests/qemu-iotests/022
> @@ -16,9 +16,7 @@
>  # GNU General Public License for more details.
>  #
>  # You should have received a copy of the GNU General Public License
> -# along with this program; if not, write to the Free Software
> -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
> -# USA
> +# along with this program. If not, see <https://www.gnu.org/licenses/>.
>  #
>
>  # creator
> diff --git a/tests/unit/rcutorture.c b/tests/unit/rcutorture.c
> index 495a4e6f42..7662081683 100644
> --- a/tests/unit/rcutorture.c
> +++ b/tests/unit/rcutorture.c
> @@ -50,8 +50,7 @@
>   * GNU General Public License for more details.
>   *
>   * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
> USA.
> + * along with this program. If not, see <https://www.gnu.org/licenses/>.
>   *
>   * Copyright (c) 2008 Paul E. McKenney, IBM Corporation.
>   */
> diff --git a/tests/unit/test-rcu-list.c b/tests/unit/test-rcu-list.c
> index 64b81ae058..9964171da4 100644
> --- a/tests/unit/test-rcu-list.c
> +++ b/tests/unit/test-rcu-list.c
> @@ -14,8 +14,7 @@
>   * GNU General Public License for more details.
>   *
>   * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
> USA.
> + * along with this program. If not, see <https://www.gnu.org/licenses/>.
>   *
>   * Copyright (c) 2013 Mike D. Day, IBM Corporation.
>   */
> diff --git a/util/uri.c b/util/uri.c
> index ff72c6005f..dcb3305236 100644
> --- a/util/uri.c
> +++ b/util/uri.c
> @@ -43,8 +43,7 @@
>   * Lesser General Public License for more details.
>   *
>   * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> USA
> + * License along with this library. If not, see <
> https://www.gnu.org/licenses/>.
>   *
>   * Authors:
>   *    Richard W.M. Jones <rjones@redhat.com>
> --
> 2.34.1
>
>
Thomas Huth Feb. 9, 2023, 10:37 a.m. UTC | #2
Hi Khadija,

the diffs below look fine now ... but unfortunately the commit description 
is now lacking your "Signed-off-by" line as we require it for QEMU:

 
https://www.qemu.org/docs/master/devel/submitting-a-patch.html#patch-emails-must-include-a-signed-off-by-line

You can edit the commit description easily by running "git commit --amend" 
again in the branch where you have your commit (assuming it is the topmost 
one), or by running "git rebase -i master" and then mark the commit with 
"reword" instead of "pick".

While you're at it, it would also be nice to re-add the description and the 
"Resolves:" line that you had in earlier version of the patches.

  HTH,
   Thomas


On 08/02/2023 13.51, Khadija Kamran wrote:
> diff --git a/contrib/gitdm/filetypes.txt b/contrib/gitdm/filetypes.txt
> index d2d6f6db8d..b1d01c0992 100644
> --- a/contrib/gitdm/filetypes.txt
> +++ b/contrib/gitdm/filetypes.txt
> @@ -12,8 +12,7 @@
>   # GNU Library General Public License for more details.
>   #
>   # You should have received a copy of the GNU General Public License
> -# along with this program; if not, write to the Free Software
> -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
> +# along with this program. If not, see <https://www.gnu.org/licenses/>.
>   #
>   # Authors : Gregorio Robles <grex@gsyc.escet.urjc.es>
>   # Authors : Germán Póo-Caamaño <gpoo@gnome.org>
> diff --git a/hw/scsi/viosrp.h b/hw/scsi/viosrp.h
> index e5f9768e8f..58c29aa925 100644
> --- a/hw/scsi/viosrp.h
> +++ b/hw/scsi/viosrp.h
> @@ -16,8 +16,7 @@
>   /* GNU General Public License for more details.                              */
>   /*                                                                           */
>   /* You should have received a copy of the GNU General Public License         */
> -/* along with this program; if not, write to the Free Software               */
> -/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
> +/* along with this program. If not, see <https://www.gnu.org/licenses/>.     */
>   /*                                                                           */
>   /*                                                                           */
>   /* This file contains structures and definitions for IBM RPA (RS/6000        */
> diff --git a/hw/sh4/sh7750_regs.h b/hw/sh4/sh7750_regs.h
> index beb571d5e9..94043431e6 100644
> --- a/hw/sh4/sh7750_regs.h
> +++ b/hw/sh4/sh7750_regs.h
> @@ -22,8 +22,7 @@
>    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>    * General Public License for more details. You should have received
>    * a copy of the GNU General Public License along with RTEMS; see
> - * file COPYING. If not, write to the Free Software Foundation, 675
> - * Mass Ave, Cambridge, MA 02139, USA.
> + * file COPYING. If not, see <https://www.gnu.org/licenses/>.
>    *
>    * As a special exception, including RTEMS header files in a file,
>    * instantiating RTEMS generics or templates, or linking other files
> diff --git a/include/hw/arm/raspi_platform.h b/include/hw/arm/raspi_platform.h
> index e0e6c8ce94..4a56dd4b89 100644
> --- a/include/hw/arm/raspi_platform.h
> +++ b/include/hw/arm/raspi_platform.h
> @@ -18,8 +18,7 @@
>    * GNU General Public License for more details.
>    *
>    * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> + * along with this program. If not, see <https://www.gnu.org/licenses/>.
>    *
>    * Various undocumented addresses and names come from Herman Hermitage's VC4
>    * documentation:
> diff --git a/include/qemu/uri.h b/include/qemu/uri.h
> index d201c61260..cf8ec70356 100644
> --- a/include/qemu/uri.h
> +++ b/include/qemu/uri.h
> @@ -41,8 +41,7 @@
>    * Lesser General Public License for more details.
>    *
>    * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
> + * License along with this library. If not, see <https://www.gnu.org/licenses/>.
>    *
>    * Authors:
>    *    Richard W.M. Jones <rjones@redhat.com>
> diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022
> index a116cfe255..d98d1ea90f 100755
> --- a/tests/qemu-iotests/022
> +++ b/tests/qemu-iotests/022
> @@ -16,9 +16,7 @@
>   # GNU General Public License for more details.
>   #
>   # You should have received a copy of the GNU General Public License
> -# along with this program; if not, write to the Free Software
> -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
> -# USA
> +# along with this program. If not, see <https://www.gnu.org/licenses/>.
>   #
>   
>   # creator
> diff --git a/tests/unit/rcutorture.c b/tests/unit/rcutorture.c
> index 495a4e6f42..7662081683 100644
> --- a/tests/unit/rcutorture.c
> +++ b/tests/unit/rcutorture.c
> @@ -50,8 +50,7 @@
>    * GNU General Public License for more details.
>    *
>    * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
> + * along with this program. If not, see <https://www.gnu.org/licenses/>.
>    *
>    * Copyright (c) 2008 Paul E. McKenney, IBM Corporation.
>    */
> diff --git a/tests/unit/test-rcu-list.c b/tests/unit/test-rcu-list.c
> index 64b81ae058..9964171da4 100644
> --- a/tests/unit/test-rcu-list.c
> +++ b/tests/unit/test-rcu-list.c
> @@ -14,8 +14,7 @@
>    * GNU General Public License for more details.
>    *
>    * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
> + * along with this program. If not, see <https://www.gnu.org/licenses/>.
>    *
>    * Copyright (c) 2013 Mike D. Day, IBM Corporation.
>    */
> diff --git a/util/uri.c b/util/uri.c
> index ff72c6005f..dcb3305236 100644
> --- a/util/uri.c
> +++ b/util/uri.c
> @@ -43,8 +43,7 @@
>    * Lesser General Public License for more details.
>    *
>    * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
> + * License along with this library. If not, see <https://www.gnu.org/licenses/>.
>    *
>    * Authors:
>    *    Richard W.M. Jones <rjones@redhat.com>
Khadija Kamran Feb. 9, 2023, 11:08 a.m. UTC | #3
Hey Thomas! I feel really confused because my patch file has all the
details that you mentioned. I wonder why it is not sending it the way it
did before.

On Thu, Feb 9, 2023, 3:39 PM Thomas Huth <thuth@redhat.com> wrote:

>
>   Hi Khadija,
>
> the diffs below look fine now ... but unfortunately the commit description
> is now lacking your "Signed-off-by" line as we require it for QEMU:
>
>
>
> https://www.qemu.org/docs/master/devel/submitting-a-patch.html#patch-emails-must-include-a-signed-off-by-line
>
> You can edit the commit description easily by running "git commit --amend"
> again in the branch where you have your commit (assuming it is the topmost
> one), or by running "git rebase -i master" and then mark the commit with
> "reword" instead of "pick".
>
> While you're at it, it would also be nice to re-add the description and
> the
> "Resolves:" line that you had in earlier version of the patches.
>
>   HTH,
>    Thomas
>
>
> On 08/02/2023 13.51, Khadija Kamran wrote:
> > diff --git a/contrib/gitdm/filetypes.txt b/contrib/gitdm/filetypes.txt
> > index d2d6f6db8d..b1d01c0992 100644
> > --- a/contrib/gitdm/filetypes.txt
> > +++ b/contrib/gitdm/filetypes.txt
> > @@ -12,8 +12,7 @@
> >   # GNU Library General Public License for more details.
> >   #
> >   # You should have received a copy of the GNU General Public License
> > -# along with this program; if not, write to the Free Software
> > -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
> USA.
> > +# along with this program. If not, see <https://www.gnu.org/licenses/>.
> >   #
> >   # Authors : Gregorio Robles <grex@gsyc.escet.urjc.es>
> >   # Authors : Germán Póo-Caamaño <gpoo@gnome.org>
> > diff --git a/hw/scsi/viosrp.h b/hw/scsi/viosrp.h
> > index e5f9768e8f..58c29aa925 100644
> > --- a/hw/scsi/viosrp.h
> > +++ b/hw/scsi/viosrp.h
> > @@ -16,8 +16,7 @@
> >   /* GNU General Public License for more details.
>       */
> >   /*
>        */
> >   /* You should have received a copy of the GNU General Public License
>        */
> > -/* along with this program; if not, write to the Free Software
>      */
> > -/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
> 02111-1307  USA */
> > +/* along with this program. If not, see <https://www.gnu.org/licenses/>.
>    */
> >   /*
>        */
> >   /*
>        */
> >   /* This file contains structures and definitions for IBM RPA (RS/6000
>       */
> > diff --git a/hw/sh4/sh7750_regs.h b/hw/sh4/sh7750_regs.h
> > index beb571d5e9..94043431e6 100644
> > --- a/hw/sh4/sh7750_regs.h
> > +++ b/hw/sh4/sh7750_regs.h
> > @@ -22,8 +22,7 @@
> >    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> >    * General Public License for more details. You should have received
> >    * a copy of the GNU General Public License along with RTEMS; see
> > - * file COPYING. If not, write to the Free Software Foundation, 675
> > - * Mass Ave, Cambridge, MA 02139, USA.
> > + * file COPYING. If not, see <https://www.gnu.org/licenses/>.
> >    *
> >    * As a special exception, including RTEMS header files in a file,
> >    * instantiating RTEMS generics or templates, or linking other files
> > diff --git a/include/hw/arm/raspi_platform.h
> b/include/hw/arm/raspi_platform.h
> > index e0e6c8ce94..4a56dd4b89 100644
> > --- a/include/hw/arm/raspi_platform.h
> > +++ b/include/hw/arm/raspi_platform.h
> > @@ -18,8 +18,7 @@
> >    * GNU General Public License for more details.
> >    *
> >    * You should have received a copy of the GNU General Public License
> > - * along with this program; if not, write to the Free Software
> > - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
> 02111-1307  USA
> > + * along with this program. If not, see <https://www.gnu.org/licenses/
> >.
> >    *
> >    * Various undocumented addresses and names come from Herman
> Hermitage's VC4
> >    * documentation:
> > diff --git a/include/qemu/uri.h b/include/qemu/uri.h
> > index d201c61260..cf8ec70356 100644
> > --- a/include/qemu/uri.h
> > +++ b/include/qemu/uri.h
> > @@ -41,8 +41,7 @@
> >    * Lesser General Public License for more details.
> >    *
> >    * You should have received a copy of the GNU Lesser General Public
> > - * License along with this library; if not, write to the Free Software
> > - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> USA
> > + * License along with this library. If not, see <
> https://www.gnu.org/licenses/>.
> >    *
> >    * Authors:
> >    *    Richard W.M. Jones <rjones@redhat.com>
> > diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022
> > index a116cfe255..d98d1ea90f 100755
> > --- a/tests/qemu-iotests/022
> > +++ b/tests/qemu-iotests/022
> > @@ -16,9 +16,7 @@
> >   # GNU General Public License for more details.
> >   #
> >   # You should have received a copy of the GNU General Public License
> > -# along with this program; if not, write to the Free Software
> > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
> > -# USA
> > +# along with this program. If not, see <https://www.gnu.org/licenses/>.
> >   #
> >
> >   # creator
> > diff --git a/tests/unit/rcutorture.c b/tests/unit/rcutorture.c
> > index 495a4e6f42..7662081683 100644
> > --- a/tests/unit/rcutorture.c
> > +++ b/tests/unit/rcutorture.c
> > @@ -50,8 +50,7 @@
> >    * GNU General Public License for more details.
> >    *
> >    * You should have received a copy of the GNU General Public License
> > - * along with this program; if not, write to the Free Software
> > - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
> 02111-1307, USA.
> > + * along with this program. If not, see <https://www.gnu.org/licenses/
> >.
> >    *
> >    * Copyright (c) 2008 Paul E. McKenney, IBM Corporation.
> >    */
> > diff --git a/tests/unit/test-rcu-list.c b/tests/unit/test-rcu-list.c
> > index 64b81ae058..9964171da4 100644
> > --- a/tests/unit/test-rcu-list.c
> > +++ b/tests/unit/test-rcu-list.c
> > @@ -14,8 +14,7 @@
> >    * GNU General Public License for more details.
> >    *
> >    * You should have received a copy of the GNU General Public License
> > - * along with this program; if not, write to the Free Software
> > - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
> 02111-1307, USA.
> > + * along with this program. If not, see <https://www.gnu.org/licenses/
> >.
> >    *
> >    * Copyright (c) 2013 Mike D. Day, IBM Corporation.
> >    */
> > diff --git a/util/uri.c b/util/uri.c
> > index ff72c6005f..dcb3305236 100644
> > --- a/util/uri.c
> > +++ b/util/uri.c
> > @@ -43,8 +43,7 @@
> >    * Lesser General Public License for more details.
> >    *
> >    * You should have received a copy of the GNU Lesser General Public
> > - * License along with this library; if not, write to the Free Software
> > - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> USA
> > + * License along with this library. If not, see <
> https://www.gnu.org/licenses/>.
> >    *
> >    * Authors:
> >    *    Richard W.M. Jones <rjones@redhat.com>
>
>
diff mbox series

Patch

diff --git a/contrib/gitdm/filetypes.txt b/contrib/gitdm/filetypes.txt
index d2d6f6db8d..b1d01c0992 100644
--- a/contrib/gitdm/filetypes.txt
+++ b/contrib/gitdm/filetypes.txt
@@ -12,8 +12,7 @@ 
 # GNU Library General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 # Authors : Gregorio Robles <grex@gsyc.escet.urjc.es>
 # Authors : Germán Póo-Caamaño <gpoo@gnome.org>
diff --git a/hw/scsi/viosrp.h b/hw/scsi/viosrp.h
index e5f9768e8f..58c29aa925 100644
--- a/hw/scsi/viosrp.h
+++ b/hw/scsi/viosrp.h
@@ -16,8 +16,7 @@ 
 /* GNU General Public License for more details.                              */
 /*                                                                           */
 /* You should have received a copy of the GNU General Public License         */
-/* along with this program; if not, write to the Free Software               */
-/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+/* along with this program. If not, see <https://www.gnu.org/licenses/>.     */
 /*                                                                           */
 /*                                                                           */
 /* This file contains structures and definitions for IBM RPA (RS/6000        */
diff --git a/hw/sh4/sh7750_regs.h b/hw/sh4/sh7750_regs.h
index beb571d5e9..94043431e6 100644
--- a/hw/sh4/sh7750_regs.h
+++ b/hw/sh4/sh7750_regs.h
@@ -22,8 +22,7 @@ 
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * General Public License for more details. You should have received
  * a copy of the GNU General Public License along with RTEMS; see
- * file COPYING. If not, write to the Free Software Foundation, 675
- * Mass Ave, Cambridge, MA 02139, USA.
+ * file COPYING. If not, see <https://www.gnu.org/licenses/>.
  *
  * As a special exception, including RTEMS header files in a file,
  * instantiating RTEMS generics or templates, or linking other files
diff --git a/include/hw/arm/raspi_platform.h b/include/hw/arm/raspi_platform.h
index e0e6c8ce94..4a56dd4b89 100644
--- a/include/hw/arm/raspi_platform.h
+++ b/include/hw/arm/raspi_platform.h
@@ -18,8 +18,7 @@ 
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  * Various undocumented addresses and names come from Herman Hermitage's VC4
  * documentation:
diff --git a/include/qemu/uri.h b/include/qemu/uri.h
index d201c61260..cf8ec70356 100644
--- a/include/qemu/uri.h
+++ b/include/qemu/uri.h
@@ -41,8 +41,7 @@ 
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library. If not, see <https://www.gnu.org/licenses/>.
  *
  * Authors:
  *    Richard W.M. Jones <rjones@redhat.com>
diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022
index a116cfe255..d98d1ea90f 100755
--- a/tests/qemu-iotests/022
+++ b/tests/qemu-iotests/022
@@ -16,9 +16,7 @@ 
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/unit/rcutorture.c b/tests/unit/rcutorture.c
index 495a4e6f42..7662081683 100644
--- a/tests/unit/rcutorture.c
+++ b/tests/unit/rcutorture.c
@@ -50,8 +50,7 @@ 
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  * Copyright (c) 2008 Paul E. McKenney, IBM Corporation.
  */
diff --git a/tests/unit/test-rcu-list.c b/tests/unit/test-rcu-list.c
index 64b81ae058..9964171da4 100644
--- a/tests/unit/test-rcu-list.c
+++ b/tests/unit/test-rcu-list.c
@@ -14,8 +14,7 @@ 
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  * Copyright (c) 2013 Mike D. Day, IBM Corporation.
  */
diff --git a/util/uri.c b/util/uri.c
index ff72c6005f..dcb3305236 100644
--- a/util/uri.c
+++ b/util/uri.c
@@ -43,8 +43,7 @@ 
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * License along with this library. If not, see <https://www.gnu.org/licenses/>.
  *
  * Authors:
  *    Richard W.M. Jones <rjones@redhat.com>