[lkml]   [2017]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the tip tree with the FIXME tree
On Wed, Oct 11, 2017 at 06:23:29PM +0100, Will Deacon wrote:
> On Wed, Oct 11, 2017 at 05:10:35PM +0100, Mark Brown wrote:

> > I'm don't feel confident I can resolve this conflict sensibly without
> > taking too long so I've used the tip tree from yesterday.

> It's a shame that the conflict is so messy -- most of it is just context
> because that file has changed a lot in the s390 tree so the cleanup doesn't
> apply. I resolved it below.

Thanks, I'll give that a spin today. It did look like it should be fine
but it was such a mess I didn't want to try to resolve by hand.
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2017-10-12 10:38    [W:0.035 / U:4.964 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site