[PATCH] doc: sl-mx8mm: Fix mistake in merge conflict resolution

2023-03-30 Thread sbabic
> From: Frieder Schrempf > There was a conflict between the following two commits, that wasn't > resolved correctly. Fix this. > a93985ddfcc3 ("doc: sl-mx8mm: Update the NXP TF-A source reference") > f0f461287eff ("imx: Suggest the NXP ATF github repo") > Signed-off-by: Frieder Schrempf > Cc: Hei

Re: [PATCH] doc: sl-mx8mm: Fix mistake in merge conflict resolution

2023-02-08 Thread Fabio Estevam
On 08/02/2023 13:20, Frieder Schrempf wrote: From: Frieder Schrempf There was a conflict between the following two commits, that wasn't resolved correctly. Fix this. a93985ddfcc3 ("doc: sl-mx8mm: Update the NXP TF-A source reference") f0f461287eff ("imx: Suggest the NXP ATF github repo") Sign

[PATCH] doc: sl-mx8mm: Fix mistake in merge conflict resolution

2023-02-08 Thread Frieder Schrempf
From: Frieder Schrempf There was a conflict between the following two commits, that wasn't resolved correctly. Fix this. a93985ddfcc3 ("doc: sl-mx8mm: Update the NXP TF-A source reference") f0f461287eff ("imx: Suggest the NXP ATF github repo") Signed-off-by: Frieder Schrempf Cc: Heinrich Schuc