diff mbox series

[1/9] Updated the FSF address in file hw/sh4/sh7750_regs.h

Message ID bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk
State New
Headers show
Series [1/9] Updated the FSF address in file hw/sh4/sh7750_regs.h | expand

Commit Message

Khadija Kamran Feb. 1, 2023, 5:33 p.m. UTC 
The Free Software Foundation moved to a new address and this file referred to their old location.
The address should be updated and replaced to a pointer to <https://www.gnu.org/licenses/>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/379

Signed-off-by: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
---
 hw/sh4/sh7750_regs.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Markus Armbruster Feb. 2, 2023, 6:37 a.m. UTC | #1 
I guess this is your attempt to implement my suggestion to squash your
series into one patch.  It came out as a concatenation of patches in a
single e-mail.  That's not what we mean by "squashing patches" :)

The common tool for squashing patches is git-rebase.  Say your series is
on branch "work", which is based on master.  Then

    $ git-rebase -i master work

If master has advanced since you based branch work on it, this will
advance your branch to be based on current master.  Hence "rebase".

The -i lets you edit the list of commits to be rebased.  It'll show
instruction right in the editor.  Relevant lines:

    # c        pick <commit> = use commit
    [...]
    # s        squash <commit> = use commit, but meld into previous commit
    # f        fixup [-C | -c] <commit> = like "squash" but keep only the previous
    #                    commit's log message, unless -C is used, in which case
    #                    keep only this commit's message; -c is same as -C but
    #                    opens the editor

If you keep the first (top-most) commit as "pick", and change the
remainder to "fixup", the patches become one, using the first patch's
commit message.

You'll then have to reword that commit message.  Since you're already
editing a rebase sequence, you may want to do that by changing "pick" to
"reword".

Hope this helps.
Khadija Kamran Feb. 3, 2023, 4:47 a.m. UTC | #2 
Thank you so much. I will get back to you after looking into this and
resend the email. This is great help. :)

On Thu, Feb 2, 2023, 11:37 AM Markus Armbruster <armbru@redhat.com> wrote:

> I guess this is your attempt to implement my suggestion to squash your
> series into one patch.  It came out as a concatenation of patches in a
> single e-mail.  That's not what we mean by "squashing patches" :)
>
> The common tool for squashing patches is git-rebase.  Say your series is
> on branch "work", which is based on master.  Then
>
>     $ git-rebase -i master work
>
> If master has advanced since you based branch work on it, this will
> advance your branch to be based on current master.  Hence "rebase".
>
> The -i lets you edit the list of commits to be rebased.  It'll show
> instruction right in the editor.  Relevant lines:
>
>     # c        pick <commit> = use commit
>     [...]
>     # s        squash <commit> = use commit, but meld into previous commit
>     # f        fixup [-C | -c] <commit> = like "squash" but keep only the
> previous
>     #                    commit's log message, unless -C is used, in which
> case
>     #                    keep only this commit's message; -c is same as -C
> but
>     #                    opens the editor
>
> If you keep the first (top-most) commit as "pick", and change the
> remainder to "fixup", the patches become one, using the first patch's
> commit message.
>
> You'll then have to reword that commit message.  Since you're already
> editing a rebase sequence, you may want to do that by changing "pick" to
> "reword".
>
> Hope this helps.
>
>
diff mbox series

Patch

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
-- 
2.34.1


From 0cbfbd52041b97982d1c8a4dbd94a1b71427bff9 Mon Sep 17 00:00:00 2001
Message-Id: <0cbfbd52041b97982d1c8a4dbd94a1b71427bff9.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
In-Reply-To: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
References: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
From: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
Date: Wed, 1 Feb 2023 11:39:24 +0500
Subject: [PATCH 2/9] Updated the FSF address in file contrib/gitdm/filetypes.txt

The Free Software Foundation moved to a new address and this file referred to their old location.
The address should be updated and replaced to a pointer to <https://www.gnu.org/licenses/>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/379

Signed-off-by: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
---
 contrib/gitdm/filetypes.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/gitdm/filetypes.txt b/contrib/gitdm/filetypes.txt
index d2d6f6db8d..4d26650988 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>
-- 
2.34.1


From 3c2ceaf1995dfd98c254cf3e2f6d1a68970bb1e8 Mon Sep 17 00:00:00 2001
Message-Id: <3c2ceaf1995dfd98c254cf3e2f6d1a68970bb1e8.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
In-Reply-To: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
References: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
From: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
Date: Wed, 1 Feb 2023 11:40:22 +0500
Subject: [PATCH 3/9] Updated the FSF address in file hw/scsi/viosrp.h

The Free Software Foundation moved to a new address and this file referred to their old location.
The address should be updated and replaced to a pointer to <https://www.gnu.org/licenses/>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/379

Signed-off-by: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
---
 hw/scsi/viosrp.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hw/scsi/viosrp.h b/hw/scsi/viosrp.h
index e5f9768e8f..8b3ac3af56 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        */
-- 
2.34.1


From eeb9c64164a72bcdf77c76d1923ff9d9feeff206 Mon Sep 17 00:00:00 2001
Message-Id: <eeb9c64164a72bcdf77c76d1923ff9d9feeff206.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
In-Reply-To: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
References: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
From: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
Date: Wed, 1 Feb 2023 11:41:20 +0500
Subject: [PATCH 4/9] Updated the FSF address in file include/qemu/uri.h

The Free Software Foundation moved to a new address and this file referred to their old location.
The address should be updated and replaced to a pointer to <https://www.gnu.org/licenses/>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/379

Signed-off-by: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
---
 include/qemu/uri.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/qemu/uri.h b/include/qemu/uri.h
index d201c61260..2c1f6350eb 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>
-- 
2.34.1


From 2027b734e65a94bbe59be038e580d55064edca54 Mon Sep 17 00:00:00 2001
Message-Id: <2027b734e65a94bbe59be038e580d55064edca54.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
In-Reply-To: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
References: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
From: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
Date: Wed, 1 Feb 2023 11:42:35 +0500
Subject: [PATCH 5/9] Updated the FSF address in file
 include/hw/arm/raspi_platform.h

The Free Software Foundation moved to a new address and this file referred to their old location.
The address should be updated and replaced to a pointer to <https://www.gnu.org/licenses/>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/379

Signed-off-by: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
---
 include/hw/arm/raspi_platform.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/hw/arm/raspi_platform.h b/include/hw/arm/raspi_platform.h
index e0e6c8ce94..bdeb6012d6 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:
-- 
2.34.1


From c9c0f70c68d9fb37eb8cd397bf89a92a31c84ba0 Mon Sep 17 00:00:00 2001
Message-Id: <c9c0f70c68d9fb37eb8cd397bf89a92a31c84ba0.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
In-Reply-To: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
References: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
From: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
Date: Wed, 1 Feb 2023 11:43:23 +0500
Subject: [PATCH 6/9] Updated the FSF address in file tests/unit/rcutorture.c

The Free Software Foundation moved to a new address and this file referred to their old location.
The address should be updated and replaced to a pointer to <https://www.gnu.org/licenses/>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/379

Signed-off-by: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
---
 tests/unit/rcutorture.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/unit/rcutorture.c b/tests/unit/rcutorture.c
index 495a4e6f42..fb02d85ac2 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.
  */
-- 
2.34.1


From 58bb1e1b7c97931620cd21de0b71d9893b66fae7 Mon Sep 17 00:00:00 2001
Message-Id: <58bb1e1b7c97931620cd21de0b71d9893b66fae7.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
In-Reply-To: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
References: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
From: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
Date: Wed, 1 Feb 2023 11:44:17 +0500
Subject: [PATCH 7/9] Updated the FSF address in file util/uri.c

The Free Software Foundation moved to a new address and this file referred to their old location.
The address should be updated and replaced to a pointer to <https://www.gnu.org/licenses/>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/379

Signed-off-by: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
---
 util/uri.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/util/uri.c b/util/uri.c
index ff72c6005f..98164bdb0f 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


From 16ac94d6761721ffe5e65dbc9f2b6319c880e369 Mon Sep 17 00:00:00 2001
Message-Id: <16ac94d6761721ffe5e65dbc9f2b6319c880e369.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
In-Reply-To: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
References: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
From: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
Date: Wed, 1 Feb 2023 11:44:55 +0500
Subject: [PATCH 8/9] Updated the FSF address in tests/unit/test-rcu-list.c

The Free Software Foundation moved to a new address and this file referred to their old location.
The address should be updated and replaced to a pointer to <https://www.gnu.org/licenses/>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/379

Signed-off-by: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
---
 tests/unit/test-rcu-list.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/unit/test-rcu-list.c b/tests/unit/test-rcu-list.c
index 64b81ae058..2011a78ed0 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.
  */
-- 
2.34.1


From 404c2309c845321a21e2896a151840750ec4fe2e Mon Sep 17 00:00:00 2001
Message-Id: <404c2309c845321a21e2896a151840750ec4fe2e.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
In-Reply-To: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
References: <bd7883e4dbedd5119c52a37f00a23a5dcef52610.1675270567.git.kkamran.bese16seecs@seecs.edu.pk>
From: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
Date: Wed, 1 Feb 2023 11:45:36 +0500
Subject: [PATCH 9/9] Updated the FSF address in tests/qemu-iotests/022

The Free Software Foundation moved to a new address and this file referred to their old location.
The address should be updated and replaced to a pointer to <https://www.gnu.org/licenses/>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/379

Signed-off-by: Khadija Kamran <kkamran.bese16seecs@seecs.edu.pk>
---
 tests/qemu-iotests/022 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022
index a116cfe255..52473aefde 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