Skip to content

Commit

Permalink
Merge pull request #761 from nathanchance/update-patches-jul-01-2024
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanchance authored Jul 1, 2024
2 parents 2c8250e + 85891c3 commit 19c3cb4
Show file tree
Hide file tree
Showing 27 changed files with 290 additions and 706 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
From git@z Thu Jan 1 00:00:00 1970
Subject: [PATCH] drm/radeon: Remove __counted_by from StateArray.states[]
From 2bac084468847cfe5bbc7166082b2a208514bb1c Mon Sep 17 00:00:00 2001
From: Bill Wendling <[email protected]>
Date: Wed, 29 May 2024 14:54:44 -0700
Message-Id: <20240529-drop-counted-by-radeon-states-state-array-v1-1-5cdc1fb29be7@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Subject: [PATCH] drm/radeon: Remove __counted_by from StateArray.states[]

Work for __counted_by on generic pointers in structures (not just
flexible array members) has started landing in Clang 19 (current tip of
Expand Down Expand Up @@ -47,14 +43,16 @@ Closes: https://github.com/ClangBuiltLinux/linux/issues/2028
Fixes: efade6fe50e7 ("drm/radeon: silence UBSAN warning (v3)")
Signed-off-by: Bill Wendling <[email protected]>
Co-developed-by: Nathan Chancellor <[email protected]>
Link: https://lore.kernel.org/r/20240529-drop-counted-by-radeon-states-state-array-v1-1-5cdc1fb29be7@kernel.org
Signed-off-by: Nathan Chancellor <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
---
Link: https://gitlab.freedesktop.org/agd5f/linux/-/commit/2bac084468847cfe5bbc7166082b2a208514bb1c
---
drivers/gpu/drm/radeon/pptable.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/pptable.h b/drivers/gpu/drm/radeon/pptable.h
index b7f22597ee95..969a8fb0ee9e 100644
index b7f22597ee95e..969a8fb0ee9e0 100644
--- a/drivers/gpu/drm/radeon/pptable.h
+++ b/drivers/gpu/drm/radeon/pptable.h
@@ -439,7 +439,7 @@ typedef struct _StateArray{
Expand All @@ -66,12 +64,6 @@ index b7f22597ee95..969a8fb0ee9e 100644
}StateArray;



---
base-commit: e64e8f7c178e5228e0b2dbb504b9dc75953a319f
change-id: 20240529-drop-counted-by-radeon-states-state-array-01936ded4c18

Best regards,
--
Nathan Chancellor <[email protected]>
GitLab

2 changes: 1 addition & 1 deletion patches/6.6/series
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20240529_nathan_drm_radeon_remove___counted_by_from_statearray_states.patch
2bac084468847cfe5bbc7166082b2a208514bb1c.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
From git@z Thu Jan 1 00:00:00 1970
Subject: [PATCH] tty: mxser: Remove __counted_by from mxser_board.ports[]
From 1c07c9be87dd3dd0634033bf08728b32465f08fb Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <[email protected]>
Date: Wed, 29 May 2024 14:29:42 -0700
Message-Id: <20240529-drop-counted-by-ports-mxser-board-v1-1-0ab217f4da6d@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Subject: tty: mxser: Remove __counted_by from mxser_board.ports[]

Work for __counted_by on generic pointers in structures (not just
flexible array members) has started landing in Clang 19 (current tip of
Expand Down Expand Up @@ -42,17 +38,18 @@ Remove this use of __counted_by to fix the warning/error. However,
rather than remove it altogether, leave it commented, as it may be
possible to support this in future compiler releases.

Cc: [email protected]
Cc: <[email protected]>
Closes: https://github.com/ClangBuiltLinux/linux/issues/2026
Fixes: f34907ecca71 ("mxser: Annotate struct mxser_board with __counted_by")
Link: https://lore.kernel.org/r/20240529-drop-counted-by-ports-mxser-board-v1-1-0ab217f4da6d@kernel.org
Signed-off-by: Nathan Chancellor <[email protected]>
Link: https://lore.kernel.org/r/20240529-drop-counted-by-ports-mxser-board-v1-1-0ab217f4da6d@kernel.org
Signed-off-by: Kees Cook <[email protected]>
---
drivers/tty/mxser.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 458bb1280ebf..5b97e420a95f 100644
index 458bb1280ebf9d..5b97e420a95f84 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -288,7 +288,7 @@ struct mxser_board {
Expand All @@ -64,12 +61,6 @@ index 458bb1280ebf..5b97e420a95f 100644
};

static DECLARE_BITMAP(mxser_boards, MXSER_BOARDS);

---
base-commit: 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0
change-id: 20240529-drop-counted-by-ports-mxser-board-ed2a66f1a6e2

Best regards,
--
Nathan Chancellor <[email protected]>
cgit 1.2.3-korg

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
From git@z Thu Jan 1 00:00:00 1970
Subject: [PATCH] drm/radeon: Remove __counted_by from StateArray.states[]
From 2bac084468847cfe5bbc7166082b2a208514bb1c Mon Sep 17 00:00:00 2001
From: Bill Wendling <[email protected]>
Date: Wed, 29 May 2024 14:54:44 -0700
Message-Id: <20240529-drop-counted-by-radeon-states-state-array-v1-1-5cdc1fb29be7@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Subject: [PATCH] drm/radeon: Remove __counted_by from StateArray.states[]

Work for __counted_by on generic pointers in structures (not just
flexible array members) has started landing in Clang 19 (current tip of
Expand Down Expand Up @@ -47,14 +43,16 @@ Closes: https://github.com/ClangBuiltLinux/linux/issues/2028
Fixes: efade6fe50e7 ("drm/radeon: silence UBSAN warning (v3)")
Signed-off-by: Bill Wendling <[email protected]>
Co-developed-by: Nathan Chancellor <[email protected]>
Link: https://lore.kernel.org/r/20240529-drop-counted-by-radeon-states-state-array-v1-1-5cdc1fb29be7@kernel.org
Signed-off-by: Nathan Chancellor <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
---
Link: https://gitlab.freedesktop.org/agd5f/linux/-/commit/2bac084468847cfe5bbc7166082b2a208514bb1c
---
drivers/gpu/drm/radeon/pptable.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/pptable.h b/drivers/gpu/drm/radeon/pptable.h
index b7f22597ee95..969a8fb0ee9e 100644
index b7f22597ee95e..969a8fb0ee9e0 100644
--- a/drivers/gpu/drm/radeon/pptable.h
+++ b/drivers/gpu/drm/radeon/pptable.h
@@ -439,7 +439,7 @@ typedef struct _StateArray{
Expand All @@ -66,12 +64,6 @@ index b7f22597ee95..969a8fb0ee9e 100644
}StateArray;



---
base-commit: e64e8f7c178e5228e0b2dbb504b9dc75953a319f
change-id: 20240529-drop-counted-by-radeon-states-state-array-01936ded4c18

Best regards,
--
Nathan Chancellor <[email protected]>
GitLab

Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
From git@z Thu Jan 1 00:00:00 1970
Subject: [PATCH] nvmet-fc: Remove __counted_by from
nvmet_fc_tgt_queue.fod[]
From 440e2051c577896275c0e0513ec26964e04c7810 Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <[email protected]>
Date: Wed, 29 May 2024 14:42:40 -0700
Message-Id: <20240529-drop-counted-by-fod-nvmet-fc-tgt-queue-v1-1-286adbc25943@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Subject: nvmet-fc: Remove __counted_by from nvmet_fc_tgt_queue.fod[]

Work for __counted_by on generic pointers in structures (not just
flexible array members) has started landing in Clang 19 (current tip of
Expand Down Expand Up @@ -46,14 +41,16 @@ possible to support this in future compiler releases.
Cc: [email protected]
Closes: https://github.com/ClangBuiltLinux/linux/issues/2027
Fixes: ccd3129aca28 ("nvmet-fc: Annotate struct nvmet_fc_tgt_queue with __counted_by")
Link: https://lore.kernel.org/r/20240529-drop-counted-by-fod-nvmet-fc-tgt-queue-v1-1-286adbc25943@kernel.org
Signed-off-by: Nathan Chancellor <[email protected]>
Signed-off-by: Keith Busch <[email protected]>
---
Link: https://git.kernel.org/linus/440e2051c577896275c0e0513ec26964e04c7810
---
drivers/nvme/target/fc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c
index 337ee1cb09ae..381b4394731f 100644
index 337ee1cb09ae64..381b4394731f1d 100644
--- a/drivers/nvme/target/fc.c
+++ b/drivers/nvme/target/fc.c
@@ -148,7 +148,7 @@ struct nvmet_fc_tgt_queue {
Expand All @@ -65,12 +62,6 @@ index 337ee1cb09ae..381b4394731f 100644
} __aligned(sizeof(unsigned long long));

struct nvmet_fc_hostport {

---
base-commit: c758b77d4a0a0ed3a1292b3fd7a2aeccd1a169a4
change-id: 20240529-drop-counted-by-fod-nvmet-fc-tgt-queue-50edd2f8d60e

Best regards,
--
Nathan Chancellor <[email protected]>
cgit 1.2.3-korg

6 changes: 3 additions & 3 deletions patches/arm64-fixes/series
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
20240529_nathan_drm_radeon_remove___counted_by_from_statearray_states.patch
20240529_nathan_nvmet_fc_remove___counted_by_from_nvmet_fc_tgt_queue_fod.patch
20240612_gustavo_re_patch_tty_mxser_remove___counted_by_from_mxser_board_ports.patch
1c07c9be87dd3dd0634033bf08728b32465f08fb.patch
2bac084468847cfe5bbc7166082b2a208514bb1c.patch
440e2051c577896275c0e0513ec26964e04c7810.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
From git@z Thu Jan 1 00:00:00 1970
Subject: [PATCH] tty: mxser: Remove __counted_by from mxser_board.ports[]
From 1c07c9be87dd3dd0634033bf08728b32465f08fb Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <[email protected]>
Date: Wed, 29 May 2024 14:29:42 -0700
Message-Id: <20240529-drop-counted-by-ports-mxser-board-v1-1-0ab217f4da6d@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Subject: tty: mxser: Remove __counted_by from mxser_board.ports[]

Work for __counted_by on generic pointers in structures (not just
flexible array members) has started landing in Clang 19 (current tip of
Expand Down Expand Up @@ -42,17 +38,18 @@ Remove this use of __counted_by to fix the warning/error. However,
rather than remove it altogether, leave it commented, as it may be
possible to support this in future compiler releases.

Cc: [email protected]
Cc: <[email protected]>
Closes: https://github.com/ClangBuiltLinux/linux/issues/2026
Fixes: f34907ecca71 ("mxser: Annotate struct mxser_board with __counted_by")
Link: https://lore.kernel.org/r/20240529-drop-counted-by-ports-mxser-board-v1-1-0ab217f4da6d@kernel.org
Signed-off-by: Nathan Chancellor <[email protected]>
Link: https://lore.kernel.org/r/20240529-drop-counted-by-ports-mxser-board-v1-1-0ab217f4da6d@kernel.org
Signed-off-by: Kees Cook <[email protected]>
---
drivers/tty/mxser.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 458bb1280ebf..5b97e420a95f 100644
index 458bb1280ebf9d..5b97e420a95f84 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -288,7 +288,7 @@ struct mxser_board {
Expand All @@ -64,12 +61,6 @@ index 458bb1280ebf..5b97e420a95f 100644
};

static DECLARE_BITMAP(mxser_boards, MXSER_BOARDS);

---
base-commit: 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0
change-id: 20240529-drop-counted-by-ports-mxser-board-ed2a66f1a6e2

Best regards,
--
Nathan Chancellor <[email protected]>
cgit 1.2.3-korg

Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
From git@z Thu Jan 1 00:00:00 1970
Subject: [PATCH] drm/radeon: Remove __counted_by from StateArray.states[]
From 2bac084468847cfe5bbc7166082b2a208514bb1c Mon Sep 17 00:00:00 2001
From: Bill Wendling <[email protected]>
Date: Wed, 29 May 2024 14:54:44 -0700
Message-Id: <20240529-drop-counted-by-radeon-states-state-array-v1-1-5cdc1fb29be7@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Subject: [PATCH] drm/radeon: Remove __counted_by from StateArray.states[]

Work for __counted_by on generic pointers in structures (not just
flexible array members) has started landing in Clang 19 (current tip of
Expand Down Expand Up @@ -47,14 +43,16 @@ Closes: https://github.com/ClangBuiltLinux/linux/issues/2028
Fixes: efade6fe50e7 ("drm/radeon: silence UBSAN warning (v3)")
Signed-off-by: Bill Wendling <[email protected]>
Co-developed-by: Nathan Chancellor <[email protected]>
Link: https://lore.kernel.org/r/20240529-drop-counted-by-radeon-states-state-array-v1-1-5cdc1fb29be7@kernel.org
Signed-off-by: Nathan Chancellor <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
---
Link: https://gitlab.freedesktop.org/agd5f/linux/-/commit/2bac084468847cfe5bbc7166082b2a208514bb1c
---
drivers/gpu/drm/radeon/pptable.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/pptable.h b/drivers/gpu/drm/radeon/pptable.h
index b7f22597ee95..969a8fb0ee9e 100644
index b7f22597ee95e..969a8fb0ee9e0 100644
--- a/drivers/gpu/drm/radeon/pptable.h
+++ b/drivers/gpu/drm/radeon/pptable.h
@@ -439,7 +439,7 @@ typedef struct _StateArray{
Expand All @@ -66,12 +64,6 @@ index b7f22597ee95..969a8fb0ee9e 100644
}StateArray;



---
base-commit: e64e8f7c178e5228e0b2dbb504b9dc75953a319f
change-id: 20240529-drop-counted-by-radeon-states-state-array-01936ded4c18

Best regards,
--
Nathan Chancellor <[email protected]>
GitLab

Loading

0 comments on commit 19c3cb4

Please sign in to comment.