Messages in this thread | | | Date | Thu, 19 Oct 2023 08:49:24 -0600 | Subject | Re: linux-next: manual merge of the kselftest tree with the mm-hotfixes tree | From | Shuah Khan <> |
| |
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
| |