On Thu, 06 Dec 2018, Cheng-yi Chiang wrote:
On Wed, Dec 5, 2018 at 7:34 PM Lee Jones lee.jones@linaro.org wrote:
On Wed, 05 Dec 2018, Lee Jones wrote:
On Wed, 05 Dec 2018, Cheng-yi Chiang wrote:
Hi Lee,
I tried to apply this patch based on for-mfd-next branch of mfd tree ( git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ) Then, I tried to compile all modules by
ARCH=x86_64 make allyesconfig ARCH=x86_64 make -j64
There was no error. Could you please let me know what was the error when you failed to apply this patch ?
Doesn't work for me.
lee@host:~/projects/kernel [for-mfd-next]$ formfdnext Applying: mfd: cros_ec: Add commands to control codec error: sha1 information is lacking or useless (include/linux/mfd/cros_ec_commands.h). error: could not build fake ancestor Patch failed at 0001 mfd: cros_ec: Add commands to control codec Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
Not that the following lines (as seen in your patch) are not present in the Mainline kernel.
@@ -4077,6 +4077,100 @@ struct __ec_align1 ec_response_i2c_passthru_protect { uint8_t status; /* Status flags (0: unlocked, 1: locked) */ };
Do you have other patches applied to your tree?
Hi Lee, Sorry, I see the problem. I was using git am -3 which solves the conflict by itself.
That's what I use, but it still had issues.
Git is probably using a previous resolution in your case.
I will resend a patch based on your for-mfd-next branch so we can keep the patch clean. Thanks for your time.