[PATCH 2/2] SPI: SAMSUNG: Bug fix for SPI with different FIFO level

[Grant Likely]

On Wed, Jul 06, 2011 at 04:17:05PM +0900, Kukjin Kim wrote:
> Grant Likely wrote:
> > 
> > On Wed, Jul 06, 2011 at 03:22:08PM +0900, Kukjin Kim wrote:
> > > Kukjin Kim wrote:
> > > >
> > > > Grant Likely wrote:
> > > > >
> > > > > On Mon, Jul 04, 2011 at 07:08:55PM +0900, Kukjin Kim wrote:
> > > > > > Kukjin Kim wrote:
> > > > > > >
> > > > > > > Thanks Grant, Jassi and all,
> > > > > > >
> > > > > > > I will apply these 1 and 2 in my -fix tree for 3.0 with your
> acks.
> > > > > > >
> > > > > > Oops, this needs previous 'cleanup spi platform specific code' so
> > > can't
> > > > > > apply -fix tree now.
> > > > >
> > > > > There may also be conflicts with the heavy rework in the spi tree.
> > > > > Kgene, when you pick up this series, can you put it into a separate
> > > > > topic branch and merge that into your main tree?  That way if there
> > > > > are difficult conflicts, then I can also merge that same topic
> branch
> > > > > into spi/next to resolve them.
> > > > >
> > > > Hi Grant,
> > > >
> > > > Sure, no problem. I'm waiting for Padmavathi's new patch which is
> based on
> > > old
> > > > code not new SPI code. When I merge topic branch for this into my
> tree,
> > > let you
> > > > know immediately. Then if any problems, let's talk again :)
> > >
> > > Hi,
> > >
> > > I made topic branch for this based on 3.0-rc6.
> > > git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> > > #for-spi
> > 
> > Okay.  If there are problems, then I'll merge it.  Thanks.
> > 
> 
> Maybe 'If there are not problems'?

If there are no problems, then I don't need to merge the topic branch.
It is only if merge conflicts show up in linux-next that I'll need to
merge the topic branch.  (regardless, I'm expecting you to merge the
topic branch into one of your trees to actually get it into mainline
or linux-next).

g.