Commit f884f5d
committed
spi: atmel-quadspi: add missed changes during v6.6.9 migration from v6.1.4
During kernel migration from v6.1.4 to v6.6.9, usually at91/spi
branch is ported first and then by taking at91/spi branch as base
for porting the at91/spi-nor branch. We missed to take at91/spi as
base instead we cherry-picked only required commits and ported
at91/spi-nor branch, which causes conflicts and few changes missed
when resolving conflicts. Now the missed changes are ported on top
of at91/spi-nor branch and sending as separate PR.
NOTE: During next version of kernel migration this commit should
be ignored when the ported at91/spi branch is taken as base for
at91/spi-nor branch. Always first pull-request should be send from
at91/spi and then at91/spi-nor to avoid conflicts.
This is related to commit id 3cb8f23.
Signed-off-by: Durai Manickam KR <durai.manickamkr@microchip.com>1 parent 3cb8f23 commit f884f5d
1 file changed
+1
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
920 | 920 | | |
921 | 921 | | |
922 | 922 | | |
923 | | - | |
924 | | - | |
925 | | - | |
| 923 | + | |
926 | 924 | | |
927 | | - | |
928 | 925 | | |
929 | 926 | | |
930 | 927 | | |
| |||
0 commit comments