[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20110512165459.GA14243@kroah.com>
Date: Thu, 12 May 2011 09:54:59 -0700
From: Greg KH <greg@...ah.com>
To: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@...ricsson.com>
Cc: Greg Kroah-Hartman <gregkh@...e.de>,
"devel@...verdev.osuosl.org" <devel@...verdev.osuosl.org>,
Linus Walleij <linus.walleij@...aro.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-bluetooth@...r.kernel.org" <linux-bluetooth@...r.kernel.org>,
Pavan Savoy <pavan_savoy@...y.com>,
Vitaly Wool <vitalywool@...il.com>,
Alan Cox <alan@...rguk.ukuu.org.uk>,
Arnd Bergmann <arnd@...db.de>,
Marcel Holtmann <marcel@...tmann.org>,
Lukasz Rymanowski <Lukasz.Rymanowski@...to.com>,
Linus WALLEIJ <linus.walleij@...ricsson.com>,
Par-Gunnar Hjalmdahl <pghatwork@...il.com>,
Lee Jones <lee.jones@...aro.org>,
Mathieu Poirier <mathieu.poirier@...aro.org>
Subject: Re: [PATCH v6] staging: Add ST-Ericsson CG2900 driver
On Thu, May 12, 2011 at 01:54:46PM +0200, Par-Gunnar HJALMDAHL wrote:
> Hi Greg,
>
> I downloaded you staging tree and compared the logs for the core.h file.
> Compared to linux-next tag next-20110510 it is missing 2 commits:
> 4dbee6b76fffd5740e87e286f4f4c1c15901bcae
> 558aa9c0d620b91a896d5e39ce8a570bed65589b
> where the first one is the "oldest" one in the log and is the most
> important one for my patch.
What trees are these patches coming from?
> Another option would be for me to fix the patch for your tree, but
> then I would probably have to fix it back in a few days when you update
> your staging tree to Linux-next. How often is your tree updated?
linux-next pulls from my tree, I don't pull from linux-next.
As I don't see those patches in Linus's tree, I can't merge my tree
forward to include them yet. I could take those patches also through my
tree if you want me to, or you could send this patch through the mfd
tree so that things build properly there too.
> The easiest is probably to wait a few days until you have the next-20110510
> tag in your tree and then apply the patch.
That will never happen, see above for how linux-next works.
thanks,
greg k-h
--
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/
Powered by blists - more mailing lists