> > Update the documentation for sec_pmic state container structure to > > reflect current code. > > > > Signed-off-by: Krzysztof Kozlowski <k.kozlow...@samsung.com> > > Acked-by: Lee Jones <lee.jo...@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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
