On Thu, 16 Mar 2017 10:26:48 +0900, Greg KH said:

On Tue, Mar 14, 2017 at 07:52:36PM -0600, Perry Hooker wrote:

quoted

$ git checkout next-20170310

quoted

What am I doing wrong / where should I go for more info?

linux-next is usually a day or so behind my tree, so maybe there were
other patches from other developers that caused the conflict.  Try
linux-next now and see if there still is a conflict or not, and if not,
rebase and resend the patches.

Stephen Rothwell posted that there won't be any linux-next this week.  Try
on Monday.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 484 bytes
Desc: not available
Url : http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20170316/f1a8ac84/attachment.bin