Hi all,
Today's linux-next merge of the kselftest tree got a conflict in:
tools/testing/selftests/clone3/clone3.c
between commit:
fc7f04dc23db ("selftests/clone3: Fix broken test under !CONFIG_TIME_NS")
from the mm-hotfixes tree and commit:
34dce23f7e40 ("selftests/clone3: Report descriptive test names")
from the kselftest tree.
I fixed it up (I used this files form the latter commit) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging. You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
On 10/18/23 23:33, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kselftest tree got a conflict in:
>
> tools/testing/selftests/clone3/clone3.c
>
> between commit:
>
> fc7f04dc23db ("selftests/clone3: Fix broken test under !CONFIG_TIME_NS")
>
> from the mm-hotfixes tree and commit:
>
> 34dce23f7e40 ("selftests/clone3: Report descriptive test names")
>
> from the kselftest tree.
>
> I fixed it up (I used this files form the latter commit) and can carry the
> fix as necessary. This is now fixed as far as linux-next is concerned,
> but any non trivial conflicts should be mentioned to your upstream
> maintainer when your tree is submitted for merging. You may also want
> to consider cooperating with the maintainer of the conflicting tree to
> minimise any particularly complex conflicts.
>
Thank you Stephen.
I can rebase linux-kselftest next to pick up the following once it goes
into Linus's tree.
fc7f04dc23db ("selftests/clone3: Fix broken test under !CONFIG_TIME_NS")
thanks,
-- Shuah
On Thu, Oct 19, 2023 at 08:49:24AM -0600, Shuah Khan wrote:
> On 10/18/23 23:33, Stephen Rothwell wrote:
> > I fixed it up (I used this files form the latter commit) and can carry the
> > fix as necessary. This is now fixed as far as linux-next is concerned,
> > but any non trivial conflicts should be mentioned to your upstream
> > maintainer when your tree is submitted for merging. You may also want
> > to consider cooperating with the maintainer of the conflicting tree to
> > minimise any particularly complex conflicts.
That'll drop the fix that Tiezhu did which is a good one.
> I can rebase linux-kselftest next to pick up the following once it goes
> into Linus's tree.
I've got the rebase/rework locally (I did it as a new commit which isn't
ideal but it's such a complete conflict that it felt like the best
option). Assuming nothing blows up in my local CI I should send it out
later today.
Hi all,
On Thu, 19 Oct 2023 16:33:10 +1100 Stephen Rothwell <[email protected]> wrote:
>
> Today's linux-next merge of the kselftest tree got a conflict in:
>
> tools/testing/selftests/clone3/clone3.c
>
> between commit:
>
> fc7f04dc23db ("selftests/clone3: Fix broken test under !CONFIG_TIME_NS")
>
> from the mm-hotfixes tree and commit:
>
> 34dce23f7e40 ("selftests/clone3: Report descriptive test names")
>
> from the kselftest tree.
>
> I fixed it up (I used this file from the latter commit) and can carry the
> fix as necessary. This is now fxed as far as linux-next is concerned,
> but any non trivial conflicts should be mentioned to your upstream
> maintainer when your tree is submitted for merging. You may also want
> to consider cooperating with the maintainer of the conflicting tree to
> minimise any particularly complex conflicts.
This is now a conflict between the mm-hotfixes tree and Linus' tree.
--
Cheers,
Stephen Rothwell