From: Artem Bityutskiy <dedekind1@gmail.com>
To: "Rafał Miłecki" <zajec5@gmail.com>
Cc: linux-mtd@lists.infradead.org
Subject: Re: Problem with verify-ing patch (error: arch/m68k/Kconfig.cpu: patch does not apply)
Date: Mon, 24 Sep 2012 18:04:54 +0300 [thread overview]
Message-ID: <1348499094.4880.65.camel@sauron.fi.intel.com> (raw)
In-Reply-To: <CACna6rwju0g+sq+vBAfCqFJm=EBLg79G2XoGEKs5n1Y=PcmKBg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1142 bytes --]
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
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-09-24 15:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-24 11:14 Problem with verify-ing patch (error: arch/m68k/Kconfig.cpu: patch does not apply) Rafał Miłecki
2012-09-24 15:04 ` Artem Bityutskiy [this message]
2012-09-25 9:33 ` Rafał Miłecki
2012-09-25 12:06 ` Artem Bityutskiy
2012-10-05 8:48 ` Artem Bityutskiy
2012-10-06 10:57 ` Rafał Miłecki
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=1348499094.4880.65.camel@sauron.fi.intel.com \
--to=dedekind1@gmail.com \
--cc=linux-mtd@lists.infradead.org \
--cc=zajec5@gmail.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