Re: [GIT PULL 00/15] arm-soc: changes for v3.6
On Tue, Jul 24, 2012 at 02:51:35PM -0600, Paul Walmsley wrote: > Hi > > On Tue, 24 Jul 2012, Arnd Bergmann wrote: > > > On Tuesday 24 July 2012, Linus Torvalds wrote: > > > > > In your "for-linus" branch, "_3xxx_clkdm" remains in the > > > clockdomains_common[] array. In my merge, it is gone. But I think I > > > did the merge correctly, and you did it wrong. HOWEVER, I don't know > > > the code, maybe there is some subtle reason why you did it like you > > > did. > > > > Yes, I think you are right now that I look at it again. Paul Walmsley > > can have another look at the merge and send an update if we are both > > missing something now. > > Linus' merge is correct. FWIW, it looks right to me too. Thanks, Mark -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL 00/15] arm-soc: changes for v3.6
On Tue, Jul 24, 2012 at 02:51:35PM -0600, Paul Walmsley wrote: Hi On Tue, 24 Jul 2012, Arnd Bergmann wrote: On Tuesday 24 July 2012, Linus Torvalds wrote: In your for-linus branch, mpu_3xxx_clkdm remains in the clockdomains_common[] array. In my merge, it is gone. But I think I did the merge correctly, and you did it wrong. HOWEVER, I don't know the code, maybe there is some subtle reason why you did it like you did. Yes, I think you are right now that I look at it again. Paul Walmsley can have another look at the merge and send an update if we are both missing something now. Linus' merge is correct. FWIW, it looks right to me too. Thanks, Mark -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL 00/15] arm-soc: changes for v3.6
Hi On Tue, 24 Jul 2012, Arnd Bergmann wrote: > On Tuesday 24 July 2012, Linus Torvalds wrote: > > > In your "for-linus" branch, "_3xxx_clkdm" remains in the > > clockdomains_common[] array. In my merge, it is gone. But I think I > > did the merge correctly, and you did it wrong. HOWEVER, I don't know > > the code, maybe there is some subtle reason why you did it like you > > did. > > Yes, I think you are right now that I look at it again. Paul Walmsley > can have another look at the merge and send an update if we are both > missing something now. Linus' merge is correct. thanks for asking, - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL 00/15] arm-soc: changes for v3.6
On Tuesday 24 July 2012, Tony Lindgren wrote: > > I spent too much time fiddling with my scripts again in an attempt to > > get closer to the regular git-request-pull version. The older version > > got this right, but unfortunately I removed the part where I manually > > print the right pull address because that had caused other problems > > before. > > FYI, this issue happens also with git request-pull if the tag has not > yet gotten mirrored but the branch is already mirrored. In this case it they were both there, but it picked up the branch anyway. I actually made sure that the tag description was included by git-request-pull, and the tag has a different name from the branch (no "next/" prefix), but the tool is not does not attempt to pick up the tag rather than the branch when both are available. Apparently, the problem is that it treats the branch "next/foo" as as exact match for a pull request on the "foo" tag even when that tag is present as "foo" on the server. If I either name the branch or the tag differently, or pass "tags/foo" as the argument to git-request-pull, it reports back the tag instead. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL 00/15] arm-soc: changes for v3.6
* Arnd Bergmann [120724 00:57]: > On Tuesday 24 July 2012, Linus Torvalds wrote: > > > In your "for-linus" branch, "_3xxx_clkdm" remains in the > > clockdomains_common[] array. In my merge, it is gone. But I think I > > did the merge correctly, and you did it wrong. HOWEVER, I don't know > > the code, maybe there is some subtle reason why you did it like you > > did. > > Yes, I think you are right now that I look at it again. Paul Walmsley > can have another look at the merge and send an update if we are both > missing something now. Yes thanks looks good. We've had the mismerge there from my earlier merge as noted by Paul. Looks like clockdomain.[ch] parts need some patching. > > Anyway, apart from that "please check" comment, I also have small > > complaint: your pull requests didn't actually point to the tags, they > > pointed to the next/xyz commits. So every time I did a pull, I had to > > change "next/xyz" to "tags/xyz". That's just annoying make-work. I > > think it's because you just said "xyz" to the git request-pull script, > > and then git had to pick one of the things and picked next. Please > > disambiguate by just saying "tags/xyz" explicitly. > > I spent too much time fiddling with my scripts again in an attempt to > get closer to the regular git-request-pull version. The older version > got this right, but unfortunately I removed the part where I manually > print the right pull address because that had caused other problems > before. FYI, this issue happens also with git request-pull if the tag has not yet gotten mirrored but the branch is already mirrored. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL 00/15] arm-soc: changes for v3.6
On Tuesday 24 July 2012, Linus Torvalds wrote: > In your "for-linus" branch, "_3xxx_clkdm" remains in the > clockdomains_common[] array. In my merge, it is gone. But I think I > did the merge correctly, and you did it wrong. HOWEVER, I don't know > the code, maybe there is some subtle reason why you did it like you > did. Yes, I think you are right now that I look at it again. Paul Walmsley can have another look at the merge and send an update if we are both missing something now. > Your "for-linus" branch also had that > >arch/arm/arm-soc-for-next-contents.txt > > file that shouldn't have been there, but whatever. That's the file I use for communication with Olof about stuff we merge. I briefly considered rebuilding a branch for your reference without it, but since you always do the merges yourself I figured there would be no need. We do leave this file in the for-next branch because it helps some people sending us patches to see what the existing branches and interdependencies are. > Anyway, apart from that "please check" comment, I also have small > complaint: your pull requests didn't actually point to the tags, they > pointed to the next/xyz commits. So every time I did a pull, I had to > change "next/xyz" to "tags/xyz". That's just annoying make-work. I > think it's because you just said "xyz" to the git request-pull script, > and then git had to pick one of the things and picked next. Please > disambiguate by just saying "tags/xyz" explicitly. I spent too much time fiddling with my scripts again in an attempt to get closer to the regular git-request-pull version. The older version got this right, but unfortunately I removed the part where I manually print the right pull address because that had caused other problems before. I did the trivial fix you suggested now. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL 00/15] arm-soc: changes for v3.6
On Tuesday 24 July 2012, Linus Torvalds wrote: In your for-linus branch, mpu_3xxx_clkdm remains in the clockdomains_common[] array. In my merge, it is gone. But I think I did the merge correctly, and you did it wrong. HOWEVER, I don't know the code, maybe there is some subtle reason why you did it like you did. Yes, I think you are right now that I look at it again. Paul Walmsley can have another look at the merge and send an update if we are both missing something now. Your for-linus branch also had that arch/arm/arm-soc-for-next-contents.txt file that shouldn't have been there, but whatever. That's the file I use for communication with Olof about stuff we merge. I briefly considered rebuilding a branch for your reference without it, but since you always do the merges yourself I figured there would be no need. We do leave this file in the for-next branch because it helps some people sending us patches to see what the existing branches and interdependencies are. Anyway, apart from that please check comment, I also have small complaint: your pull requests didn't actually point to the tags, they pointed to the next/xyz commits. So every time I did a pull, I had to change next/xyz to tags/xyz. That's just annoying make-work. I think it's because you just said xyz to the git request-pull script, and then git had to pick one of the things and picked next. Please disambiguate by just saying tags/xyz explicitly. I spent too much time fiddling with my scripts again in an attempt to get closer to the regular git-request-pull version. The older version got this right, but unfortunately I removed the part where I manually print the right pull address because that had caused other problems before. I did the trivial fix you suggested now. Arnd -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL 00/15] arm-soc: changes for v3.6
* Arnd Bergmann a...@arndb.de [120724 00:57]: On Tuesday 24 July 2012, Linus Torvalds wrote: In your for-linus branch, mpu_3xxx_clkdm remains in the clockdomains_common[] array. In my merge, it is gone. But I think I did the merge correctly, and you did it wrong. HOWEVER, I don't know the code, maybe there is some subtle reason why you did it like you did. Yes, I think you are right now that I look at it again. Paul Walmsley can have another look at the merge and send an update if we are both missing something now. Yes thanks looks good. We've had the mismerge there from my earlier merge as noted by Paul. Looks like clockdomain.[ch] parts need some patching. Anyway, apart from that please check comment, I also have small complaint: your pull requests didn't actually point to the tags, they pointed to the next/xyz commits. So every time I did a pull, I had to change next/xyz to tags/xyz. That's just annoying make-work. I think it's because you just said xyz to the git request-pull script, and then git had to pick one of the things and picked next. Please disambiguate by just saying tags/xyz explicitly. I spent too much time fiddling with my scripts again in an attempt to get closer to the regular git-request-pull version. The older version got this right, but unfortunately I removed the part where I manually print the right pull address because that had caused other problems before. FYI, this issue happens also with git request-pull if the tag has not yet gotten mirrored but the branch is already mirrored. Regards, Tony -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL 00/15] arm-soc: changes for v3.6
On Tuesday 24 July 2012, Tony Lindgren wrote: I spent too much time fiddling with my scripts again in an attempt to get closer to the regular git-request-pull version. The older version got this right, but unfortunately I removed the part where I manually print the right pull address because that had caused other problems before. FYI, this issue happens also with git request-pull if the tag has not yet gotten mirrored but the branch is already mirrored. In this case it they were both there, but it picked up the branch anyway. I actually made sure that the tag description was included by git-request-pull, and the tag has a different name from the branch (no next/ prefix), but the tool is not does not attempt to pick up the tag rather than the branch when both are available. Apparently, the problem is that it treats the branch next/foo as as exact match for a pull request on the foo tag even when that tag is present as foo on the server. If I either name the branch or the tag differently, or pass tags/foo as the argument to git-request-pull, it reports back the tag instead. Arnd -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL 00/15] arm-soc: changes for v3.6
Hi On Tue, 24 Jul 2012, Arnd Bergmann wrote: On Tuesday 24 July 2012, Linus Torvalds wrote: In your for-linus branch, mpu_3xxx_clkdm remains in the clockdomains_common[] array. In my merge, it is gone. But I think I did the merge correctly, and you did it wrong. HOWEVER, I don't know the code, maybe there is some subtle reason why you did it like you did. Yes, I think you are right now that I look at it again. Paul Walmsley can have another look at the merge and send an update if we are both missing something now. Linus' merge is correct. thanks for asking, - Paul -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL 00/15] arm-soc: changes for v3.6
On Mon, Jul 23, 2012 at 1:32 PM, Arnd Bergmann wrote: > > There are about 600 changesets in here, and a bunch of simple > conflicts between the 15 branches, but so far no conflicts with > stuff that you have merged already. For reference, you can check > the "for-linus" branch in the same tree to see how we resolved > the conflicts. Ok, so I've merged some things a bit differently, but afaik it's all semantically identical *except* for the merge of the file arch/arm/mach-omap2/clockdomains3xxx_data.c in my merge of your "general arm-soc cleanups" pull request. In your "for-linus" branch, "_3xxx_clkdm" remains in the clockdomains_common[] array. In my merge, it is gone. But I think I did the merge correctly, and you did it wrong. HOWEVER, I don't know the code, maybe there is some subtle reason why you did it like you did. Your "for-linus" branch also had that arch/arm/arm-soc-for-next-contents.txt file that shouldn't have been there, but whatever. Anyway, apart from that "please check" comment, I also have small complaint: your pull requests didn't actually point to the tags, they pointed to the next/xyz commits. So every time I did a pull, I had to change "next/xyz" to "tags/xyz". That's just annoying make-work. I think it's because you just said "xyz" to the git request-pull script, and then git had to pick one of the things and picked next. Please disambiguate by just saying "tags/xyz" explicitly. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL 00/15] arm-soc: changes for v3.6
On Mon, Jul 23, 2012 at 1:32 PM, Arnd Bergmann a...@arndb.de wrote: There are about 600 changesets in here, and a bunch of simple conflicts between the 15 branches, but so far no conflicts with stuff that you have merged already. For reference, you can check the for-linus branch in the same tree to see how we resolved the conflicts. Ok, so I've merged some things a bit differently, but afaik it's all semantically identical *except* for the merge of the file arch/arm/mach-omap2/clockdomains3xxx_data.c in my merge of your general arm-soc cleanups pull request. In your for-linus branch, mpu_3xxx_clkdm remains in the clockdomains_common[] array. In my merge, it is gone. But I think I did the merge correctly, and you did it wrong. HOWEVER, I don't know the code, maybe there is some subtle reason why you did it like you did. Your for-linus branch also had that arch/arm/arm-soc-for-next-contents.txt file that shouldn't have been there, but whatever. Anyway, apart from that please check comment, I also have small complaint: your pull requests didn't actually point to the tags, they pointed to the next/xyz commits. So every time I did a pull, I had to change next/xyz to tags/xyz. That's just annoying make-work. I think it's because you just said xyz to the git request-pull script, and then git had to pick one of the things and picked next. Please disambiguate by just saying tags/xyz explicitly. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
