From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Shuah Khan <shuah@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Tommi Rantala <tommi.t.rantala@nokia.com>
Subject: Re: linux-next: manual merge of the staging tree with the kselftest-fixes tree
Date: Thu, 29 Oct 2020 06:22:25 +0100 [thread overview]
Message-ID: <20201029052225.GC282324@kroah.com> (raw)
In-Reply-To: <20201029132713.3a41c80b@canb.auug.org.au>
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
next prev parent reply other threads:[~2020-10-29 9:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2020-10-30 16:38 ` Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201029052225.GC282324@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=shuah@kernel.org \
--cc=tommi.t.rantala@nokia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox