On Sat, May 09, 2020 at 08:56:46PM +0200, Rasmus Villemoes wrote: > On 09/05/2020 00.59, Tom Rini wrote: > > On Fri, Mar 27, 2020 at 12:02:00AM +0100, Rasmus Villemoes wrote: > > > > > > Applied to u-boot/master, thanks! > > > > Eh, thanks, but you already applied v1 consisting of 5 patches. v1 1/5 > corresponded to v2 1/2, while v1 5/5 corresponded to v2 2/2 - v1 3/5 and > 4/5 were left out of v2. v1 2/5 was a helper macro I decided wasn't that > much of a helper (but it's still needed since v1 3/5 and v1 4/5 were > applied). > > This doesn't mean anything needs fixing up - I'm guessing you rebased > the two patches, git saw that v2 1/2 was already applied, and then > either you or git saw that most of v2 2/2 was already applied, so the > only thing commit 6d3524c2ad does is to replace ENV_SAVE_PTR with its > definition.
:headdesk: So, 'git am' went through and applied what could be applied and I didn't see a "skipping" message. But at this point, are there any changes that need to still come in? Thanks! -- Tom
signature.asc
Description: PGP signature