Messages in this thread | | | From | Arnd Bergmann <> | Subject | Re: [GIT PULL] Renesas SoC updates for v3.4 | Date | Sat, 10 Mar 2012 10:53:42 +0000 |
| |
On Friday 09 March 2012, Rafael J. Wysocki wrote: > On Friday, March 09, 2012, Arnd Bergmann wrote: > > On Friday 09 March 2012, Rafael J. Wysocki wrote: > > > Hi, > > > > > > On Friday, March 09, 2012, Arnd Bergmann wrote: > > > > On Friday 09 March 2012, Rafael J. Wysocki wrote: > > > > > Hi, > > > > > > > > > > Please pull Renesas SoC updates for v3.4 since commit > > > > > ce8fea7aa4ad9e3b40999a08622ef27c77159659: > > > > > > > > > > mmap: EINVAL not ENOMEM when rejecting VM_GROWS > > > > > > > > > > with top-most commit f57fd2100e8273af3a9d2ff67714903d2dfd1eef > > > > > > > > Hi Rafael, > > > > > > > > Please rebase this on an -rc release, otherwise we get a rather > > > > messy history in the arm-soc tree. > > > > > > Well, OK, I can rebase it on -rc7 if there is one, unless Paul > > > has already pulled from clk_ops-rename. Paul? > > > > Why not rebase back to -rc6? > > Well, I can do that too, if I have to, but still I'd like to be sure that > Paul hasn't pulled from the clk_ops-rename branch yet.
The point is that there might not be an -rc7 any more. I'd suggest that you rebase on -rc6 if Paul has not yet pulled them, otherwise we will merge them in the current state and put an explanation into the merge changeset.
Arnd
| |