| Message ID | 20111206151541.GA13774@linaro.org |
|---|---|
| State | Not Applicable |
| Headers | show |
> ... it looks like Alessandro's proposed change to tidy up scripts/mod/ > ile2alias.c may get merged soon No, I don't think it will happen. Rusty disagrees, and his own suggestion is in the queue. I'm waiting a while to understand what is happening. Anyways, I think it's better for me to wait for amba to come in, and work on scripts/mod later on. After all, it's meant to ease adding new buses later, not to make it more difficult for already scheduled ones. /alessandro
On Tue, Dec 06, 2011 at 04:59:11PM +0100, Alessandro Rubini wrote: > > ... it looks like Alessandro's proposed change to tidy up scripts/mod/ > > ile2alias.c may get merged soon > > No, I don't think it will happen. Rusty disagrees, and his own > suggestion is in the queue. I'm waiting a while to understand > what is happening. > > Anyways, I think it's better for me to wait for amba to come in, and > work on scripts/mod later on. After all, it's meant to ease adding new > buses later, not to make it more difficult for already scheduled ones. OK -- thanks for the clarification. Russell, it sounds like you shouldn't get a merge conflict with the original version of the series after all. For reference, the original pull request is here: http://lists.infradead.org/pipermail/linux-arm-kernel/2011-November/073619.html Cheers ---Dave
Hi Russell, This one isn't urgent, but I'm not seeing the amba modalias patches anywhere yet. Did you have any outstanding concerns which need to be resolved? If you can suggest when/if these are likely to merge that would be great. Since Alessandro is now expecting to have to rebase on top of the amba additions anyway, we shouldn't need to worry about conflicting with his patches. Of course, if you've already merged these somewhere, then there's no problem. Cheers ---Dave
On Mon, Dec 19, 2011 at 01:24:09PM +0000, Dave Martin wrote: > Hi Russell, > > This one isn't urgent, but I'm not seeing the amba modalias patches > anywhere yet. Did you have any outstanding concerns which need to be > resolved? > > If you can suggest when/if these are likely to merge that would be great. > > Since Alessandro is now expecting to have to rebase on top of the amba > additions anyway, we shouldn't need to worry about conflicting with his > patches. > > Of course, if you've already merged these somewhere, then there's no > problem. I have pulled it, I just haven't merged it in anywhere yet.
On Mon, Dec 19, 2011 at 09:39:42PM +0000, Russell King - ARM Linux wrote: > On Mon, Dec 19, 2011 at 01:24:09PM +0000, Dave Martin wrote: > > Hi Russell, > > > > This one isn't urgent, but I'm not seeing the amba modalias patches > > anywhere yet. Did you have any outstanding concerns which need to be > > resolved? > > > > If you can suggest when/if these are likely to merge that would be great. > > > > Since Alessandro is now expecting to have to rebase on top of the amba > > additions anyway, we shouldn't need to worry about conflicting with his > > patches. > > > > Of course, if you've already merged these somewhere, then there's no > > problem. > > I have pulled it, I just haven't merged it in anywhere yet. OK, great -- thanks. I wasn't too familiar with the procedure, so I just wanted to be sure that I hadn't done things wrong. Have a good Christmas in the meantime! Cheers ---Dave
On Thu, Dec 22, 2011 at 11:21:25AM +0000, Dave Martin wrote: > On Mon, Dec 19, 2011 at 09:39:42PM +0000, Russell King - ARM Linux wrote: > > I have pulled it, I just haven't merged it in anywhere yet. > > OK, great -- thanks. > > I wasn't too familiar with the procedure, so I just wanted > to be sure that I hadn't done things wrong. FYI, I'll be pushing out an update to my tree Friday evening.