Re: [PATCH] drivers:misc: ti-st: fix debugging code

From: Greg KH
Date: Wed Mar 09 2011 - 19:10:59 EST


On Thu, Mar 03, 2011 at 08:31:45AM -0800, Greg KH wrote:
> On Thu, Mar 03, 2011 at 12:34:17PM +0530, Pavan Savoy wrote:
> >
> >
> > >What tree was this made against? I can't seem to apply it to my
> > >staging-next tree.
> > >confused,
> >
> > Made against linux-next as usual.
> > However I see that your staging-next has these for drivers/misc/ti-st/
> >
> > 73f12e8d3d94828b9efe2b8b8a34b4ad6d14ee47 drivers: misc: ti-st: fix review comments
> > 2bb32e84a17fab547c7a746c7888e846c9cd88cc misc: ti-st: Kconfig & Makefile for TI_ST
> > a0cc2f3b51a8649da5262aba7501dc21738e1b8d staging: ti-st: move TI_ST from staging to misc/
> >
> > and the linux-next has these for drivers/misc/ti-st/
> >
> > bb6a7d53d52ec5b574467c48159677904d34a56a drivers:misc: ti-st: fix debugging code
> > 781a7395d239dbdb59738ca7fe08e71641bf583c drivers:misc: ti-st: remove multiple gpio handling
> > 6d71ba2105a1d8c1712cdfcf46fc6040e4707cb9 drivers:misc: ti-st: fix hci-ll on wake_ind collision
> > ef04d121f030329aae0c2d3ec22beea0c5cbcfd3 drivers:misc: ti-st: firmware download optimization
> > 6710fcff66ef0330cdc458557271ee86026745d0 drivers:misc: ti-st: set right debug levels for logs
> > 704426649dd4324b34cefea322f4333e5280f852 drivers:misc: ti-st: fix error codes
> > ec60d0ad20ff8796dc41b30a9dce485478ccd263 drivers:misc: ti-st: move from rfkill to sysfs
> > 5c88b02196a99332dacf305c8757674dd7a303ff drivers:misc: ti-st: register with channel IDs
> > 73f12e8d3d94828b9efe2b8b8a34b4ad6d14ee47 drivers: misc: ti-st: fix review comments
> > 2bb32e84a17fab547c7a746c7888e846c9cd88cc misc: ti-st: Kconfig & Makefile for TI_ST
> > a0cc2f3b51a8649da5262aba7501dc21738e1b8d staging: ti-st: move TI_ST from staging to misc/
> >
> > So, I am not sure how the 8 patches on top of "drivers: misc: ti-st:
> > fix review comments" made it to linux-next without making to
> > staging-next ....
> > when I received the automated mail of these 8 patches I got the tree link as
> > "git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git" unlike the usual staging-next !!
> >
> > So make be you should apply them on driver-core-2.6 ?
> > Can you help me understand the flow ?
>
> Ah crap, I think I messed this up by applying the patches to the wrong
> tree. I'll work out the issues and get it resolved later today.

Now resolved, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/