Messages in this thread | | | Subject | Re: [PATCH v3 20/24] media: imx: Add Camera Interface subdev driver | From | Steve Longerbeam <> | Date | Tue, 31 Jan 2017 15:41:14 -0800 |
| |
On 01/31/2017 03:30 PM, Russell King - ARM Linux wrote: > On Tue, Jan 31, 2017 at 02:36:53PM -0800, Steve Longerbeam wrote: >> On 01/31/2017 02:04 PM, Russell King - ARM Linux wrote: >>> I don't want master though, I want v4.10-rc1, and if I ask for that >>> it tells me it knows nothing about v4.10-rc1, despite the fact that's >>> a tag in the mainline kernel repository which was merged into the >>> linux-media tree that this tree is based upon. >> Hi Russell, yes git@github.com:slongerbeam/mediatree.git is a fork >> of the linux-media tree, and the imx-media-staging-md-wip branch >> is up-to-date with master, currently at 4.10-rc1. > "up to date" is different from "contains other stuff other than is in > 4.10-rc1". > > What I see in your tree is that your code is based off a merge commit > between something called "patchwork" (which I assume is a branch in > the media tree containing stuff commited from patch work) and v4.10-rc1. > > Now, you don't get a commit when merging unless there's changes that > aren't in the commit you're merging - if "patchwork" was up to date > with v4.10-rc1, then git would have done a "fast forward" to v4.10-rc1. > > Therefore, while it may be "up to date" with v4.10-rc1 in so far that > it's had v4.10-rc1 merged into it, that's not what I've been saying. > There are other changes below that merge commit which aren't in > v4.10-rc1. It's those other changes that I'm talking about, and it's > those other changes I do not want without knowing what they are. > > It may be that those other changes have since been merged into > v4.10-rc6 - but github's web interface can't show me that. In fact, > github's web interface is pretty damned useless as far as this stuff > goes. > > So, what I'll get if I clone or pull your imx-media-staging-md-wip > branch is, yes, a copy of all your changes, but _also_ all the > changes that are in the media tree that _aren't_ in mainline at the > point that v4.10-rc1 was merged. > >> You don't need to use the web interface, just git clone the repo. > You're assuming I want to work off the top of your commits. I don't. > I've got other dependencies.
Well, I was suggesting cloning it just to have a look at the new code, but I understand you don't want to attempt to bring in your SMIA/bayer format changes and run from this branch, due to the other changes in the mediatree.
I suppose I should post the next version then.
Trouble is, I see issues in the current driver that prevents working with your SMIA pipeline. But I guess that will have to be worked out in another version.
Steve
> > Then there's yet another problem - lets say that I get a copy of your > patches that haven't been on the mailing list, and I then want to make > a comment about it. I can't reply to a patch that hasn't been on the > mailing list. So, the long established mechanism by which the Linux > community does patch review breaks down. > > So no, sorry, I'm not fetching your tree, and I will persist with your > v3 patch set for the time being. >
| |