Re: Pull request for OMAP PM, clock, SDRC 2.6.32 patches
* Paul Walmsley [090818 15:35]: > Hello Russell, > > On Mon, 17 Aug 2009, Russell King - ARM Linux wrote: > > > On Sun, Aug 16, 2009 at 07:45:59AM -0600, Paul Walmsley wrote: > > > > > > Hello Russell, > > > > > > Here's the pull request for the thirteen patches posted earlier, plus > > > Hiroshi's clock debugfs error path fix. > > > > I'm afraid to say that I think you've left it far too late to send this. > > I did set a date of the 16th as being the final date to sort out stuff > > (which was flexible to a degree) but since these patches were only posted > > on Saturday, and they're still being discussed, I don't think it would > > make sense for me to pull it today. > > I've dropped the two patches that are being discussed and reposted the > remainder. The updated series is here (et seq.): > > http://marc.info/?l=linux-arm-kernel&m=125059872200340&w=2 > > and the pull request is here: > > http://marc.info/?l=linux-arm-kernel&m=125059845132331&w=2 I've added this into omap for-next branch. Tony > > > - Paul > > > > > And this is likely to be the final day that I merge anything into my > > kernel tree for the next two weeks. > > > > > > regards, > > > > > > - Paul > > > > > > The following changes since commit > > > 3b3119fc549c93df60316d28bdd77c2de3986588: > > > Russell King (1): > > > Merge branch 'ixp4xx-fixes' of > > > git://git.kernel.org/.../chris/linux-2.6 > > > > That's stupid. Someone publishing _my_ tree, which I make no guarantees > > about the life of the commits, for other people to base their work on... > > That's definitely a big FAIL. > > > > Luckily for you though, that commit still exists in my tree, and I've > > asked Linus to pull that set; so essentially it became immutable only > > last night. > > > > Don't base patches on the contents of my tree without talking to me first > > please. > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-arm" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: Pull request for OMAP PM, clock, SDRC 2.6.32 patches
> From: Paul Walmsley [mailto:p...@pwsan.com] > Sent: Tuesday, August 18, 2009 6:27 PM > To: Woodruff, Richard > The series cannot conflict with Rajendra's patches 1-3, since there are no > files in common between the two series. As for patches 4-6, there are > comments pending: OK, there are recent comments, good, but is it conflicting? Thanks for clarifying, I'm not able to do a check right now and am hoping they don't interfere. Hopefully the series are not all too inter-related. Seems like getting to multiple and smaller feature branches will reduce collisions. Any big branch carries more risk (and potential reward also I suppose). Regards, Richard W. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: Pull request for OMAP PM, clock, SDRC 2.6.32 patches
Hello Richard, On Tue, 18 Aug 2009, Woodruff, Richard wrote: > > -Original Message- > > From: linux-omap-ow...@vger.kernel.org [mailto:linux-omap- > > ow...@vger.kernel.org] On Behalf Of Paul Walmsley > > Sent: Tuesday, August 18, 2009 7:36 AM > > To: Russell King - ARM Linux > > > I've dropped the two patches that are being discussed and reposted the > > remainder. The updated series is here (et seq.): > > > > http://marc.info/?l=linux-arm-kernel&m=125059872200340&w=2 > > > > and the pull request is here: > > > > http://marc.info/?l=linux-arm-kernel&m=125059845132331&w=2 > > Does this series conflict with patches already submitted on OMAP4? > > http://www.mail-archive.com/linux-omap@vger.kernel.org/msg15488.html > > I'm not able to check now but its best to be careful here. The series cannot conflict with Rajendra's patches 1-3, since there are no files in common between the two series. As for patches 4-6, there are comments pending: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg15568.html - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: Pull request for OMAP PM, clock, SDRC 2.6.32 patches
Hi Paul, > -Original Message- > From: linux-omap-ow...@vger.kernel.org [mailto:linux-omap- > ow...@vger.kernel.org] On Behalf Of Paul Walmsley > Sent: Tuesday, August 18, 2009 7:36 AM > To: Russell King - ARM Linux > > I'm afraid to say that I think you've left it far too late to send this. > > I did set a date of the 16th as being the final date to sort out stuff > > (which was flexible to a degree) but since these patches were only posted > > on Saturday, and they're still being discussed, I don't think it would > > make sense for me to pull it today. > > I've dropped the two patches that are being discussed and reposted the > remainder. The updated series is here (et seq.): > > http://marc.info/?l=linux-arm-kernel&m=125059872200340&w=2 > > and the pull request is here: > > http://marc.info/?l=linux-arm-kernel&m=125059845132331&w=2 Does this series conflict with patches already submitted on OMAP4? http://www.mail-archive.com/linux-omap@vger.kernel.org/msg15488.html I'm not able to check now but its best to be careful here. Thanks, Richard W. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Pull request for OMAP PM, clock, SDRC 2.6.32 patches
Hello Russell, On Mon, 17 Aug 2009, Russell King - ARM Linux wrote: > On Sun, Aug 16, 2009 at 07:45:59AM -0600, Paul Walmsley wrote: > > > > Hello Russell, > > > > Here's the pull request for the thirteen patches posted earlier, plus > > Hiroshi's clock debugfs error path fix. > > I'm afraid to say that I think you've left it far too late to send this. > I did set a date of the 16th as being the final date to sort out stuff > (which was flexible to a degree) but since these patches were only posted > on Saturday, and they're still being discussed, I don't think it would > make sense for me to pull it today. I've dropped the two patches that are being discussed and reposted the remainder. The updated series is here (et seq.): http://marc.info/?l=linux-arm-kernel&m=125059872200340&w=2 and the pull request is here: http://marc.info/?l=linux-arm-kernel&m=125059845132331&w=2 - Paul > > And this is likely to be the final day that I merge anything into my > kernel tree for the next two weeks. > > > > regards, > > > > - Paul > > > > The following changes since commit 3b3119fc549c93df60316d28bdd77c2de3986588: > > Russell King (1): > > Merge branch 'ixp4xx-fixes' of > > git://git.kernel.org/.../chris/linux-2.6 > > That's stupid. Someone publishing _my_ tree, which I make no guarantees > about the life of the commits, for other people to base their work on... > That's definitely a big FAIL. > > Luckily for you though, that commit still exists in my tree, and I've > asked Linus to pull that set; so essentially it became immutable only > last night. > > Don't base patches on the contents of my tree without talking to me first > please. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Pull request for OMAP PM, clock, SDRC 2.6.32 patches
On Sun, Aug 16, 2009 at 07:45:59AM -0600, Paul Walmsley wrote: > > Hello Russell, > > Here's the pull request for the thirteen patches posted earlier, plus > Hiroshi's clock debugfs error path fix. I'm afraid to say that I think you've left it far too late to send this. I did set a date of the 16th as being the final date to sort out stuff (which was flexible to a degree) but since these patches were only posted on Saturday, and they're still being discussed, I don't think it would make sense for me to pull it today. And this is likely to be the final day that I merge anything into my kernel tree for the next two weeks. > > regards, > > - Paul > > The following changes since commit 3b3119fc549c93df60316d28bdd77c2de3986588: > Russell King (1): > Merge branch 'ixp4xx-fixes' of > git://git.kernel.org/.../chris/linux-2.6 That's stupid. Someone publishing _my_ tree, which I make no guarantees about the life of the commits, for other people to base their work on... That's definitely a big FAIL. Luckily for you though, that commit still exists in my tree, and I've asked Linus to pull that set; so essentially it became immutable only last night. Don't base patches on the contents of my tree without talking to me first please. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
