From: "Rafael J. Wysocki" <rjw@sisk.pl> To: Arnd Bergmann <arnd@arndb.de> Cc: Paul Mundt <lethal@linux-sh.org>, LKML <linux-kernel@vger.kernel.org>, Magnus Damm <magnus.damm@gmail.com>, Linux-sh list <linux-sh@vger.kernel.org>, "arm@kernel.org" <arm@kernel.org>, Rob Herring <robherring2@gmail.com> Subject: Re: [GIT PULL] Renesas SoC updates for v3.4 Date: Sat, 10 Mar 2012 21:26:00 +0000 [thread overview] Message-ID: <201203102226.00687.rjw@sisk.pl> (raw) In-Reply-To: <201203101053.42926.arnd@arndb.de> On Saturday, March 10, 2012, Arnd Bergmann wrote: > 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. Yes, I'm aware of that. :-) > I'd suggest that you rebase on -rc6 if Paul has not yet pulled them, I'm still waiting for a word from Paul. > otherwise we will merge them in the current state and put an explanation > into the merge changeset. Well, if there's no -rc7 (which means that the final v3.3 is released tomorrow) or there's no information from Paul within the next few days, I'm afraid rebasing won't be very safe. Thanks a lot and sorry for the trouble (I think I didn't understand you correctly when you said you wanted things to be based on -rc, I thought you meant the Linus' tree in general and not specific commits). Rafael
WARNING: multiple messages have this Message-ID (diff)
From: "Rafael J. Wysocki" <rjw@sisk.pl> To: Arnd Bergmann <arnd@arndb.de> Cc: Paul Mundt <lethal@linux-sh.org>, LKML <linux-kernel@vger.kernel.org>, Magnus Damm <magnus.damm@gmail.com>, "Linux-sh list" <linux-sh@vger.kernel.org>, "arm@kernel.org" <arm@kernel.org>, Rob Herring <robherring2@gmail.com> Subject: Re: [GIT PULL] Renesas SoC updates for v3.4 Date: Sat, 10 Mar 2012 22:26:00 +0100 [thread overview] Message-ID: <201203102226.00687.rjw@sisk.pl> (raw) In-Reply-To: <201203101053.42926.arnd@arndb.de> On Saturday, March 10, 2012, Arnd Bergmann wrote: > 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. Yes, I'm aware of that. :-) > I'd suggest that you rebase on -rc6 if Paul has not yet pulled them, I'm still waiting for a word from Paul. > otherwise we will merge them in the current state and put an explanation > into the merge changeset. Well, if there's no -rc7 (which means that the final v3.3 is released tomorrow) or there's no information from Paul within the next few days, I'm afraid rebasing won't be very safe. Thanks a lot and sorry for the trouble (I think I didn't understand you correctly when you said you wanted things to be based on -rc, I thought you meant the Linus' tree in general and not specific commits). Rafael
next prev parent reply other threads:[~2012-03-10 21:26 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-03-09 20:55 [GIT PULL] Renesas SoC updates for v3.4 Rafael J. Wysocki 2012-03-09 20:55 ` Rafael J. Wysocki 2012-03-09 21:34 ` Arnd Bergmann 2012-03-09 21:34 ` Arnd Bergmann 2012-03-09 21:48 ` Rob Herring 2012-03-09 21:48 ` Rob Herring 2012-03-09 21:52 ` Rafael J. Wysocki 2012-03-09 21:52 ` Rafael J. Wysocki 2012-03-09 22:03 ` Arnd Bergmann 2012-03-09 22:03 ` Arnd Bergmann 2012-03-09 22:27 ` Rafael J. Wysocki 2012-03-09 22:27 ` Rafael J. Wysocki 2012-03-10 10:53 ` Arnd Bergmann 2012-03-10 21:26 ` Rafael J. Wysocki [this message] 2012-03-10 21:26 ` Rafael J. Wysocki 2012-03-10 22:06 ` Geert Uytterhoeven 2012-03-10 22:06 ` Geert Uytterhoeven 2012-03-12 1:13 ` Paul Mundt 2012-03-12 1:13 ` Paul Mundt 2012-03-12 21:30 ` Rafael J. Wysocki 2012-03-12 21:30 ` Rafael J. Wysocki 2012-03-12 22:53 ` [GIT PULL] Renesas SoC updates for v3.4, take 2 Rafael J. Wysocki 2012-03-12 22:53 ` Rafael J. Wysocki 2012-03-13 10:26 ` Arnd Bergmann 2012-03-13 19:36 ` Rafael J. Wysocki 2012-03-13 19:36 ` Rafael J. Wysocki 2012-03-13 19:39 ` Arnd Bergmann 2012-03-13 20:17 ` Rafael J. Wysocki 2012-03-13 20:17 ` Rafael J. Wysocki 2012-03-13 21:42 ` Rafael J. Wysocki 2012-03-13 21:42 ` Rafael J. Wysocki 2012-03-14 0:02 ` Olof Johansson 2012-03-14 0:02 ` Olof Johansson 2012-03-14 0:16 ` Rafael J. Wysocki 2012-03-14 0:16 ` Rafael J. Wysocki 2012-03-14 0:40 ` Olof Johansson 2012-03-14 0:40 ` Olof Johansson 2012-03-14 9:03 ` Rafael J. Wysocki 2012-03-14 9:03 ` Rafael J. Wysocki
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=201203102226.00687.rjw@sisk.pl \ --to=rjw@sisk.pl \ --cc=arm@kernel.org \ --cc=arnd@arndb.de \ --cc=lethal@linux-sh.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=magnus.damm@gmail.com \ --cc=robherring2@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.