Commit 31ca08f
hw-mgmt: patches: Update DPU driver patch to avoid conflict with BF3 patches
Add DPU driver at the end of drivers/platform/mellanox/Makefile to avoid
conflict with BF3 PTM driver in the same file. Since Sonic and CL do not
apply BF3 patches, the application of DPU driver patch fails due to missing
context. By moving DPU driver to the end of the Makefile we can avoid the
conflict and remove special CL and Sonic versions of DPU driver patch.
Bug: 4524005
Signed-off-by: Felix Radensky <[email protected]>1 parent a7919b8 commit 31ca08f
File tree
4 files changed
+5
-1415
lines changed- recipes-kernel/linux
- linux-6.1
- cumulus
- sonic
4 files changed
+5
-1415
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
702 | 702 | | |
703 | 703 | | |
704 | 704 | | |
705 | | - | |
| 705 | + | |
706 | 706 | | |
707 | 707 | | |
708 | 708 | | |
| |||
Lines changed: 4 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
| 58 | + | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
| 61 | + | |
67 | 62 | | |
68 | 63 | | |
| 64 | + | |
| 65 | + | |
69 | 66 | | |
70 | 67 | | |
71 | 68 | | |
| |||
0 commit comments