linux-kernel - Re: linux-next: manual merge of the pcmcia tree with the pxa tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20091130102444.4ebc0a45@life-in-the-fast-lane>
Date:	Mon, 30 Nov 2009 10:24:44 +0100
From:	Marc Zyngier <maz@...terjones.org>
To:	Eric Miao <eric.y.miao@...il.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Dominik Brodowski <linux@...inikbrodowski.net>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King - ARM Linux <linux@....linux.org.uk>
Subject: Re: linux-next: manual merge of the pcmcia tree with the pxa tree

On Mon, 30 Nov 2009 16:16:38 +0800
Eric Miao <eric.y.miao@...il.com> wrote:

> On Mon, Nov 30, 2009 at 4:10 PM, Marc Zyngier <maz@...terjones.org>
> wrote:
> > On Mon, 30 Nov 2009 11:17:08 +0800
> > Eric Miao <eric.y.miao@...il.com> wrote:
> >
> > Hi Eric,
> >
> >> Could you take a look into this, I wonder you may need to rebase
> >> against Russell's PCMCIA generalization stuffs. Let me know if you
> >> want me to drop this patch.
> >
> > Patch looks good. I'm more worried about creating dependencies
> > between trees:
> >
> > - Stephen fix depends on Russell's changes, which are in Dominik's
> > tree,
> > - My patch depends on Zeus support, which is in your tree,
> > - Rebasing Zeus PCMCIA support against Dominik's tree is just
> > another dependency between the two trees.
> >
> > Should we drop my PCMCIA changes until both Russell's changes and
> > main Zeus support are merged?
> >
> 
> I'd propose to postpone your patches until dependency is resolved,
> will send a second git pull til then. Sounds OK to you?

Sounds good. I'll post rebased patches as soon as PCMCIA hits Linus'
tree.

Thanks,

	M.
-- 
Fast. Cheap. Reliable. Pick two.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/