Messages in this thread | | | Date | Mon, 7 Nov 2011 13:49:12 +1100 | From | Stephen Rothwell <> | Subject | Re: [PATCH 12/49] MIPS: irq: Remove IRQF_DISABLED |
| |
Hi Yong,
On Mon, 7 Nov 2011 10:10:48 +0800 Yong Zhang <yong.zhang0@gmail.com> wrote: > > On Fri, Nov 04, 2011 at 12:21:06PM +0000, Ralf Baechle wrote: > > Thanks, queued for 3.3. I resolved a conflict in dbdma.c and remove > > one IRQF_DISABLED which had been missed in arch/mips/kernel/perf_event.c. > > And FYI, my patch is based on next-20111014 when I made it.
You should never base anything on top of a linux-next tree. You should use the tree you are fixing (Linus' or the Mips tree or ...) as the base.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |