diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-20 09:06:37 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-20 09:06:37 +0100 |
commit | abae262640ef9c7f24bad65acade25b44c7ba0eb (patch) | |
tree | c5d9a340af15969f4b3fe2485e2e3589933e7efe /net/iucv | |
parent | 6ca8f8bf706d874090b74f811194e94ebbc560df (diff) | |
parent | e8d018dd0257f744ca50a729e3d042cf2ec9da65 (diff) | |
download | linux-stable-abae262640ef9c7f24bad65acade25b44c7ba0eb.tar.gz linux-stable-abae262640ef9c7f24bad65acade25b44c7ba0eb.tar.bz2 linux-stable-abae262640ef9c7f24bad65acade25b44c7ba0eb.zip |
Merge 6.3-rc3 into char-misc-next
We need the mainline fixes in this branch for testing and other
subsystem changes to be based properly on.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/iucv')
-rw-r--r-- | net/iucv/iucv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c index eb0295d90039..fc3fddeb6f36 100644 --- a/net/iucv/iucv.c +++ b/net/iucv/iucv.c @@ -83,7 +83,7 @@ struct iucv_irq_data { u16 ippathid; u8 ipflags1; u8 iptype; - u32 res2[8]; + u32 res2[9]; }; struct iucv_irq_list { |