From: Michael Ellerman <mpe@ellerman•id.au>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Kees Cook <keescook@google•com>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
linuxppc-dev@lists•ozlabs.org
Cc: oss@buserror•net, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the kspp tree with the powerpc tree
Date: Mon, 18 Jul 2016 21:00:05 +1000 [thread overview]
Message-ID: <43553.2571901151$1468839660@news.gmane.org> (raw)
In-Reply-To: <20160718130315.314f8a77@canb.auug.org.au>
Stephen Rothwell <sfr@canb•auug.org.au> writes:
> Hi Kees,
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> arch/powerpc/Kconfig
>
> between commit:
>
> c223c90386bc ("powerpc32: provide VIRT_CPU_ACCOUNTING")
>
> from the powerpc tree and commit:
Actually that's in Scott's tree.
I didn't love it, but I guess it's OK to go in.
> 006d998dda94 ("powerpc/uaccess: Enable hardened usercopy")
>
> from the kspp tree.
>
> I fixed it up (see below) 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.
>
> Michael: time to sort these selects?
Yeah I was thinking that the other day. Not sure when is a good time though.
cheers
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists•ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
next prev parent reply other threads:[~2016-07-18 11:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-18 3:03 linux-next: manual merge of the kspp tree with the powerpc tree Stephen Rothwell
2016-07-18 11:00 ` Michael Ellerman [this message]
2016-07-18 11:00 ` Michael Ellerman
[not found] ` <871t2rb496.fsf@@concordia.ellerman.id.au>
2016-07-18 12:19 ` Stephen Rothwell
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='43553.2571901151$1468839660@news.gmane.org' \
--to=mpe@ellerman$(echo .)id.au \
--cc=benh@kernel$(echo .)crashing.org \
--cc=keescook@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=oss@buserror$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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