* linux-next: manual merge of the staging tree with the kselftest-fixes tree
@ 2020-10-29 2:27 Stephen Rothwell
2020-10-29 5:22 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2020-10-29 2:27 UTC (permalink / raw)
To: Greg KH, Shuah Khan
Cc: Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List, Tommi Rantala
[-- Attachment #1: Type: text/plain, Size: 831 bytes --]
Hi all,
Today's linux-next merge of the staging tree got conflicts in:
tools/testing/selftests/android/ion/ipcsocket.c
tools/testing/selftests/android/ion/ipcsocket.h
between commit:
08c5d41130e5 ("selftests: android: fix multiple definition of sock_name")
from the kselftest-fixes tree and commit:
e722a295cf49 ("staging: ion: remove from the tree")
from the staging tree.
I fixed it up (I just removed the files) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the staging tree with the kselftest-fixes tree
2020-10-29 2:27 linux-next: manual merge of the staging tree with the kselftest-fixes tree Stephen Rothwell
@ 2020-10-29 5:22 ` Greg KH
2020-10-30 16:38 ` Shuah Khan
0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2020-10-29 5:22 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Shuah Khan, Linux Kernel Mailing List, Linux Next Mailing List,
Tommi Rantala
On Thu, Oct 29, 2020 at 01:27:13PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got conflicts in:
>
> tools/testing/selftests/android/ion/ipcsocket.c
> tools/testing/selftests/android/ion/ipcsocket.h
>
> between commit:
>
> 08c5d41130e5 ("selftests: android: fix multiple definition of sock_name")
>
> from the kselftest-fixes tree and commit:
>
> e722a295cf49 ("staging: ion: remove from the tree")
>
> from the staging tree.
>
> I fixed it up (I just removed the files) 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.
Easy fix, thanks!
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the staging tree with the kselftest-fixes tree
2020-10-29 5:22 ` Greg KH
@ 2020-10-30 16:38 ` Shuah Khan
0 siblings, 0 replies; 3+ messages in thread
From: Shuah Khan @ 2020-10-30 16:38 UTC (permalink / raw)
To: Greg KH, Stephen Rothwell
Cc: Shuah Khan, Linux Kernel Mailing List, Linux Next Mailing List,
Tommi Rantala, Shuah Khan
On 10/28/20 11:22 PM, Greg KH wrote:
> On Thu, Oct 29, 2020 at 01:27:13PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the staging tree got conflicts in:
>>
>> tools/testing/selftests/android/ion/ipcsocket.c
>> tools/testing/selftests/android/ion/ipcsocket.h
>>
>> between commit:
>>
>> 08c5d41130e5 ("selftests: android: fix multiple definition of sock_name")
>>
>> from the kselftest-fixes tree and commit:
>>
>> e722a295cf49 ("staging: ion: remove from the tree")
>>
>> from the staging tree.
>>
>> I fixed it up (I just removed the files) 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.
>
> Easy fix, thanks!
>
Thanks for catching it. I knew this test was removed. My bad.
-- Shuah
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-30 16:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-29 2:27 linux-next: manual merge of the staging tree with the kselftest-fixes tree Stephen Rothwell
2020-10-29 5:22 ` Greg KH
2020-10-30 16:38 ` Shuah Khan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox