On Mon, 2012-09-24 at 13:14 +0200, Rafał Miłecki wrote:
> I wanted to verify my patch before sending it.
> 
> TRY[0]:
> > ./verify ../wireless-testing/ mips-bcm47xx_defconfig < ../nand4/0001-mtd-prepare-place-for-BCMA-NAND-flash-driver-s.patch
> error: patch failed: arch/m68k/Kconfig.cpu:28
> error: arch/m68k/Kconfig.cpu: patch does not apply
> 
> Weird. My patch doesn't touch m68k and applies cleanly to the
> ../wireless-testing tree:
> 
> > cd ../wireless-testing/
> > git am ../nand4/0001-mtd-prepare-place-for-BCMA-NAND-flash-driver-s.patch
> Applying: mtd: prepare place for BCMA NAND flash driver(s)
> 
> Help? :|

It tries to apply quick fixes - I carry them because the kernel gets
broken in various places all the time. So you need to fix the quick
fixes patch - probably a fix was applied in upstream already.

Obviously, quick fixes are in maintaining.git, not in the generic aiaiai
tools. They are in 'quick_fixes.mbox'.

In this case it easy - the m68k patch get merged upstream and just can
be dropped from quick_fixes.mbox. Just done that and pushed out.

-- 
Best Regards,
Artem Bityutskiy