linux-kernel - Re: [PATCH v3] mfd: sec-core: Update sec

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20140428094037.GQ6264@lee--X1>
Date:	Mon, 28 Apr 2014 10:40:37 +0100
From:	Lee Jones <lee.jones@...aro.org>
To:	Krzysztof Kozlowski <k.kozlowski@...sung.com>
Cc:	Sangbeom Kim <sbkim73@...sung.com>,
	Samuel Ortiz <sameo@...ux.intel.com>,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH v3] mfd: sec-core: Update sec_pmic documentation

> > Update the documentation for sec_pmic state container structure to
> > reflect current code.
> > 
> > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@...sung.com>
> > Acked-by: Lee Jones <lee.jones@...aro.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 majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/