All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones@linaro.org>
To: Cheng-yi Chiang <cychiang@chromium.org>
Cc: alsa-devel@alsa-project.org, tzungbi@chromium.org,
	linux-kernel@vger.kernel.org, Mark Brown <broonie@kernel.org>,
	rohitkr@codeaurora.org, Dylan Reid <dgreid@chromium.org>
Subject: Re: [PATCH 1/3] mfd: cros_ec: Add commands to control codec
Date: Fri, 7 Dec 2018 07:23:07 +0000	[thread overview]
Message-ID: <20181207072307.GF26661@dell> (raw)
In-Reply-To: <CAFv8NwKgspykPHWfdjapzY-wCAp8MmduKq_yhrvWct2r7yFCzA@mail.gmail.com>

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.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

WARNING: multiple messages have this Message-ID (diff)
From: Lee Jones <lee.jones@linaro.org>
To: Cheng-yi Chiang <cychiang@chromium.org>
Cc: linux-kernel@vger.kernel.org, Mark Brown <broonie@kernel.org>,
	alsa-devel@alsa-project.org, Dylan Reid <dgreid@chromium.org>,
	tzungbi@chromium.org, rohitkr@codeaurora.org
Subject: Re: [PATCH 1/3] mfd: cros_ec: Add commands to control codec
Date: Fri, 7 Dec 2018 07:23:07 +0000	[thread overview]
Message-ID: <20181207072307.GF26661@dell> (raw)
In-Reply-To: <CAFv8NwKgspykPHWfdjapzY-wCAp8MmduKq_yhrvWct2r7yFCzA@mail.gmail.com>

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.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

  reply	other threads:[~2018-12-07  7:23 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-27 12:00 [PATCH 1/3] mfd: cros_ec: Add commands to control codec Cheng-Yi Chiang
2018-11-27 12:00 ` [PATCH 2/3] ASoC: Documentation: Add google,cros-ec-codec Cheng-Yi Chiang
2018-11-27 12:00 ` [PATCH 3/3] ASoC: cros_ec_codec: Add codec driver for Cros EC Cheng-Yi Chiang
2018-11-29 12:42   ` [alsa-devel] " Enric Balletbo Serra
2018-12-24  8:47     ` Cheng-yi Chiang
2018-11-28  9:34 ` [PATCH 1/3] mfd: cros_ec: Add commands to control codec Lee Jones
2018-12-03 11:19   ` Lee Jones
2018-12-04  1:46     ` Cheng-yi Chiang
2018-12-05  9:01       ` Cheng-yi Chiang
2018-12-05 11:30         ` Lee Jones
2018-12-05 11:34           ` Lee Jones
2018-12-06  2:36             ` Cheng-yi Chiang
2018-12-07  7:23               ` Lee Jones [this message]
2018-12-07  7:23                 ` Lee Jones

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=20181207072307.GF26661@dell \
    --to=lee.jones@linaro.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=cychiang@chromium.org \
    --cc=dgreid@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rohitkr@codeaurora.org \
    --cc=tzungbi@chromium.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.