From: Lee Jones <lee.jones@linaro.org>
To: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Sangbeom Kim <sbkim73@samsung.com>,
Samuel Ortiz <sameo@linux.intel.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3] mfd: sec-core: Update sec_pmic documentation
Date: Mon, 28 Apr 2014 10:40:37 +0100 [thread overview]
Message-ID: <20140428094037.GQ6264@lee--X1> (raw)
In-Reply-To: <20140428093832.GP6264@lee--X1>
> > Update the documentation for sec_pmic state container structure to
> > reflect current code.
> >
> > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> > Acked-by: Lee Jones <lee.jones@linaro.org>
> >
> > ---
> > Changes since v2:
> > - Rebased on lee/mfd.
>
> You did? Which tree/branch? I still get:
>
> Applying: mfd: sec-core: Update sec_pmic documentation
> Using index info to reconstruct a base tree...
> M include/linux/mfd/samsung/core.h
> Falling back to patching base and 3-way merge...
> Auto-merging include/linux/mfd/samsung/core.h
> CONFLICT (content): Merge conflict in include/linux/mfd/samsung/core.h
> Recorded preimage for 'include/linux/mfd/samsung/core.h'
> Failed to merge in the changes.
> Patch failed at 0002 mfd: sec-core: Update sec_pmic documentation
> The copy of the patch that failed is found in:
> /home/lee/projects/linux/.git/rebase-apply/patch
> When you have resolved this problem, run "git am --resolved".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am -abort".
Okay, I fixed it - now applied, thanks.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
prev parent reply other threads:[~2014-04-28 9:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-24 8:05 Krzysztof Kozlowski
2014-04-28 9:38 ` Lee Jones
2014-04-28 9:40 ` Lee Jones [this message]
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=20140428094037.GQ6264@lee--X1 \
--to=lee.jones@linaro.org \
--cc=k.kozlowski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=sbkim73@samsung.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome