* Merge confict chunk
@ 2021-07-14 17:15 Khem Raj
2021-07-14 18:21 ` [EXTERNAL] [meta-ti] " Yogesh Siraswar
0 siblings, 1 reply; 4+ messages in thread
From: Khem Raj @ 2021-07-14 17:15 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-ti
Hi Denys
This commit
https://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/commit/?id=4c1d26f6282b9959b9ee10aa77b3e05ed56299fb
has a merge anchor thats committed perhaps accidentally.
Thanks
-Khem
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [EXTERNAL] [meta-ti] Merge confict chunk
2021-07-14 17:15 Merge confict chunk Khem Raj
@ 2021-07-14 18:21 ` Yogesh Siraswar
2021-07-14 19:57 ` Denys Dmytriyenko
0 siblings, 1 reply; 4+ messages in thread
From: Yogesh Siraswar @ 2021-07-14 18:21 UTC (permalink / raw)
To: Khem Raj, Denys Dmytriyenko, meta-ti
Hi Raj,
Thanks for pointing it out. Have fixed the same. Will try to be more
careful in future.
Thanks
Yogesh
more
On 7/14/21 12:15 PM, Khem Raj wrote:
> Hi Denys
>
> This commit
>
> https://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/commit/?id=4c1d26f6282b9959b9ee10aa77b3e05ed56299fb
>
> has a merge anchor thats committed perhaps accidentally.
>
> Thanks
> -Khem
>
>
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [EXTERNAL] [meta-ti] Merge confict chunk
2021-07-14 18:21 ` [EXTERNAL] [meta-ti] " Yogesh Siraswar
@ 2021-07-14 19:57 ` Denys Dmytriyenko
2021-07-15 12:08 ` Yogesh Siraswar
0 siblings, 1 reply; 4+ messages in thread
From: Denys Dmytriyenko @ 2021-07-14 19:57 UTC (permalink / raw)
To: Yogesh Siraswar; +Cc: Khem Raj, meta-ti
Yogesh,
You should not rebase master or release branches like dunfell.
It appears master already had a similar patch from March, which was never
merged to dunfell. So master now tries to patch it twice...
I'll send a cleanup for master shortly.
On Wed, Jul 14, 2021 at 01:21:11PM -0500, Yogesh Siraswar wrote:
> Hi Raj,
> Thanks for pointing it out. Have fixed the same. Will try to be
> more careful in future.
>
> Thanks
> Yogesh
>
> more
> On 7/14/21 12:15 PM, Khem Raj wrote:
> >Hi Denys
> >
> >This commit
> >
> >https://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/commit/?id=4c1d26f6282b9959b9ee10aa77b3e05ed56299fb
> >
> >has a merge anchor thats committed perhaps accidentally.
> >
> >Thanks
> >-Khem
--
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [EXTERNAL] [meta-ti] Merge confict chunk
2021-07-14 19:57 ` Denys Dmytriyenko
@ 2021-07-15 12:08 ` Yogesh Siraswar
0 siblings, 0 replies; 4+ messages in thread
From: Yogesh Siraswar @ 2021-07-15 12:08 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Khem Raj, meta-ti
Denys,
This patch was marked for both master and dunfell. The patch file name
were different so missed on the changes. My bad. I guess, we need to
back-port master patch to dunfell instead of creating new patch.
Thanks
Yogesh
On 7/14/2021 2:57 PM, Denys Dmytriyenko wrote:
> Yogesh,
>
> You should not rebase master or release branches like dunfell.
>
> It appears master already had a similar patch from March, which was never
> merged to dunfell. So master now tries to patch it twice...
>
> I'll send a cleanup for master shortly.
>
>
> On Wed, Jul 14, 2021 at 01:21:11PM -0500, Yogesh Siraswar wrote:
>> Hi Raj,
>> Thanks for pointing it out. Have fixed the same. Will try to be
>> more careful in future.
>>
>> Thanks
>> Yogesh
>>
>> more
>> On 7/14/21 12:15 PM, Khem Raj wrote:
>>> Hi Denys
>>>
>>> This commit
>>>
>>> https://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/commit/?id=4c1d26f6282b9959b9ee10aa77b3e05ed56299fb
>>>
>>> has a merge anchor thats committed perhaps accidentally.
>>>
>>> Thanks
>>> -Khem
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-15 12:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-14 17:15 Merge confict chunk Khem Raj
2021-07-14 18:21 ` [EXTERNAL] [meta-ti] " Yogesh Siraswar
2021-07-14 19:57 ` Denys Dmytriyenko
2021-07-15 12:08 ` Yogesh Siraswar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.