Re: linux-next: fixes while rebasing the akpm tree

From: Stephen Rothwell
Date: Tue Jul 05 2011 - 02:31:48 EST


Hi all,

On Mon, 4 Jul 2011 16:28:16 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> While rebasing the akpm tree onto today's linux-next, I discovered the
> following:
>
> The patch hfsplus-add-missing-call-to-bio_put.patch appears to be already
> applied (as commit 50176ddefa4a ("hfsplus: add missing call to bio_put()"
> from the hfsplus tree).
>
> The patches
> x86-mtrr-lock-stop-machine-during-mtrr-rendezvous-sequence.patch,
> stop_machine-reorganize-stop_cpus-implementation.patch and
> stop_machine-implement-stop_machine_from_inactive_cpu.patch seem to be
> already applied (as commits 6d3321e8e2b3 ("x86, mtrr: lock stop machine
> during MTRR rendezvous sequence"), fd7355ba1e93 ("stop_machine:
> reorganize stop_cpus() implementation") and f740e6cd0cb5 ("stop_machine:
> implement stop_machine_from_inactive_cpu()") from the tip tree)

I have removed all the above patches from the akpm tree today as well as
x86-mtrr-use-stop_machine-apis-for-doing-mtrr-rendezvous.patch which is
also in the tip tree.

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature