On Mon, Aug 06, 2012 at 01:22:53, Daniel Mack wrote: > On 03.08.2012 17:48, Hiremath, Vaibhav wrote: > > On Fri, Aug 03, 2012 at 17:11:38, Daniel Mack wrote: > >> On 03.08.2012 11:07, Hiremath, Vaibhav wrote: > >>> I have just pushed the code (V7 which Ravi submitted), so can you please try > >>> with below branch? > >>> > >>> https://github.com/hvaibhav/am335x-linux/tree/am335x-upstream-staging-usb > >> > >> Thanks for doing this, but I'm unfortunately getting tons of merge > >> conflicts when I try to put this on top of 3.6-rc1. Still pondering > >> which way around is the easiest to get this solved. > >> > >> OTOH, I wonder whether your staging branches would need to rebased > >> sooner or later anyway? > >> > > > > I have already pushed branch based on v3.6-rc1 (boot tested), > > > > https://github.com/hvaibhav/am335x-linux/tree/am335x-linux-next-master > > Sorry, I don't get it yet. Your am335x-linux-next-master can be merged > into v3.6-rc1 without problems, but it doesn't contain Ravi's patches. > And am335x-upstream-staging-usb doesn't apply on top of either > am335x-linux-next-master or v3.6-rc1. > > Maybe I just miss a detail here. Could you again explain which branch > will you publish for merging in the 3.7 merge window, and what are its > dependencies? > Daniel, Every developer is supposed to submit the patches on top of their maintainer's repository, which may or may not be in-sync with latest linux- next or Linus's tree at given time OR their could be some extra dependency from framework. For example, linux-omap is still not updated to v3.6-rc1, but I have to use linux-omap/master for all patch submissions. It becomes extra work for each developers to maintain branch for both, one against their maintainer HEAD and one against linux-next/master. So I am just pushing the branch which is being tested/validated (on BeagleBone) before submitting patches to the list. I hope this clarifies all your confusion. Thanks, Vaibhav > > Thanks for your work, > Daniel > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
