Re: [meta-ti] [dunfell/master PATCH] linux-ti-staging: Update 5.10 kernel to the latest commit SHA

["Lukas Wunner" <lukas@wunner.de>]

On Tue, Jun 08, 2021 at 07:40:07PM -0500, praneeth via lists.yoctoproject.org wrote:
> On 6/8/21 9:04 AM, Lukas Wunner wrote:
> > This doesn't apply cleanly to any of the dunfell, dunfell-next nor master
> > branches.  SRCREV is currently 8fbd16658d11 and d85aee3e19aa, respectively
> > on those branches.
> > 
> > Which branch did you base this patch on?
> 
> The patch was made based on dunfell-next.
> The conflict is seen because dunfell-next is not in sync with dunfell yet.
> Once the following patches are pulled to dunfell branch, the patch can be
> applied cleanly. I am sending a v2 shortly.
> 
> Ref:
> 2de2c5ec linux-ti-staging: Update 5.10 kernel to the latest commit SHA
> 6983b50e linux-ti-staging: Update 5.10 kernel to 5.10.35

It looks like dunfell-next wasn't pushed to git.ti.com, hence when I
fetched yesterday afternoon, the above-quoted commits were missing on
the branch:

$ cat .git/logs/refs/remotes/origin/dunfell-next
542456ca082de7133a61be21222d13974a87e41d f0abcc93b2bd272f2fc3a6ecc13f44f9658e1217 Lukas Wunner <lukas@wunner.de> 1620636780 +0200	pull --rebase: fast-forward
f0abcc93b2bd272f2fc3a6ecc13f44f9658e1217 99cf543ee385677589edc6bd132068c5a710803f Lukas Wunner <lukas@wunner.de> 1623076459 +0200	pull --rebase: fast-forward

$ date -j -f%s 1623076459
Mo  7 Jun 2021 16:34:19 CEST

But in the meantime the branch was pushed, so I've now
fetched the missing commits.

Thanks!

Lukas