diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-08 21:24:48 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-08 21:24:48 +0200 |
commit | 38d5c149cae32d286308f7962e1d561e7939072f (patch) | |
tree | 25e564ee34a2fe3778379afae39270d1023fe859 /0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch | |
parent | f4c3c7a8ab9226af448d66103dfddf387711af9d (diff) | |
parent | 05706a271a8883a9bf1bc091089a315129f3db00 (diff) | |
download | kernel-38d5c149cae32d286308f7962e1d561e7939072f.tar.gz kernel-38d5c149cae32d286308f7962e1d561e7939072f.tar.xz kernel-38d5c149cae32d286308f7962e1d561e7939072f.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc31
Diffstat (limited to '0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch')
-rw-r--r-- | 0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch b/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch index cb5344d98..c0280ed39 100644 --- a/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch +++ b/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch @@ -41,10 +41,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com> 1 file changed, 2 insertions(+) diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c -index 4afdd2e20883..05e637aa0e3d 100644 +index 5642eefb4ba1..01c8d750b9e0 100644 --- a/drivers/infiniband/sw/rxe/rxe.c +++ b/drivers/infiniband/sw/rxe/rxe.c -@@ -335,6 +335,8 @@ static int __init rxe_module_init(void) +@@ -336,6 +336,8 @@ static int __init rxe_module_init(void) { int err; |