[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20131212015752.GA14254@kroah.com>
Date: Wed, 11 Dec 2013 17:57:52 -0800
From: Greg KH <gregkh@...uxfoundation.org>
To: Dan Carpenter <dan.carpenter@...cle.com>
Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@...il.com>,
devel@...verdev.osuosl.org, fabs@...sec.de, tony@...mide.com,
linux-kernel@...r.kernel.org, Steven Luo <steven@...ven676.net>,
pavel@....cz, pali.rohar@...il.com, Joe Perches <joe@...ches.com>,
nico@...lde.de
Subject: Re: [PATCH] Staging: TIDSPBRIDGE: Use vm_iomap_memory for mmap-ing
instead of remap_pfn_range
On Wed, Dec 11, 2013 at 01:27:17PM +0300, Dan Carpenter wrote:
> On Wed, Dec 11, 2013 at 11:57:04AM +0200, Ivaylo Dimitrov wrote:
> > On 11.12.2013 10:33, Dan Carpenter wrote:
> > >On Wed, Dec 11, 2013 at 09:45:52AM +0200, Ivajlo Dimitrov wrote:
> > >>I can pick your changes and re-send the original patch with them
> > >>incorporated if there are no objections. Are you fine with that?
> > >>
> > >Do it on top of staging-next, don't redo the original.
> > >
> > >regards,
> > >dan carpenter
> >
> > I don't see the original patch in the staging-next tree [0], how to
> > proceed? Isn't it better to resend the original patch with Steven's
> > changes included?
> >
> > [0] http://git.kernel.org/cgit/linux/kernel/git/gregkh/staging.git/log/drivers/staging/tidspbridge?h=staging-next
> >
>
> Oops. It's in staging-linus not staging-next. I don't know how Greg
> handles that tree.
The same way I do my others:
*-next : for the "next" kernel merge window
*-linus : for Linus's tree now before the -final release comes out.
The original patch here went to Linus, so it was in staging-linus and
it's already in Linus's tree.
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