On Thu, 1 Mar 2012 21:41:51 -0600 Will Drewry <wad@xxxxxxxxxxxx> wrote: > > No explicit dependency. It's just a conflict in how ptrace options > are set, defined, and masked (and STOP being renumbered). Other than > the ptrace changes, the whole series patches cleanly onto both trees. > The resolved version is less code and easier to read, so I don't > suspect it'll be a challenge at all. OK, so we need a tree based on Linus' (like v3.3-rc5 or something - and preferably tested ;-)) and an explicit request to me to include that tree. I will sort out any conflicts with Andrews's tree and post the fixups I make so others can correct me if necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpfuixYnUwKr.pgp
Description: PGP signature
