Linux-Next discussions
 help / color / mirror / Atom feed
From: Jean Delvare <khali@linux-fr.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: rebase of the jdelvare-hwmon quilt series
Date: Thu, 11 Jul 2013 07:57:00 +0200	[thread overview]
Message-ID: <20130711075700.21d8482c@endymion.delvare> (raw)
In-Reply-To: <20130711102724.51608a4ace419b6d42591257@canb.auug.org.au>

Hi Stephen,

On Thu, 11 Jul 2013 10:27:24 +1000, Stephen Rothwell wrote:
> Why have you just rebased the jdelvare-hwmon series
> (http://khali.linux-fr.org/devel/linux-3/jdelvare-hwmon/)?  You have
> just invalidated your testing and made it likely that Linus will blast
> you if you ask him to pull your patches.  Your whole series was already
> based after v3.10 (i.e. released or rebased after the merge window
> opened), so why move it again?

I'm quite confused by this complaint of yours. I do not have the
feeling that I rebased anything or invalidated any testing. And I don't
think I did anything different this time from the way I have been
proceeding for years.

I had only 2 hwmon patches for Linus for this merge window:
  hwmon-lm63-drop-redundant-safety.patch
  hwmon-lm90-drop-redundant-safety.patch

They have been in
http://khali.linux-fr.org/devel/linux-3/jdelvare-hwmon/ (and thus in
linux-next) continuously since May 19th so I'd say they received pretty
good testing. I did not touch them, I did not even have to refresh them.

3 days ago I added these 2 patches to the hwmon-for-linus branch of my
staging tree:
http://git.kernel.org/cgit/linux/kernel/git/jdelvare/staging.git/log/?h=hwmon-for-linus
and asked Linux to pull from it.

Yesterday I reviewed a new (trivial) hwmon patch, and I accepted it, so
it was added to http://khali.linux-fr.org/devel/linux-3/jdelvare-hwmon/ as 
hwmon-w83792d-update-module-author.patch (and thus went to linux-next.)

Last night Linus pulled from
http://git.kernel.org/cgit/linux/kernel/git/jdelvare/staging.git/log/?h=hwmon-for-linus
so the 2 "old" patches are now merged upstream. The one "new" patch
is not, it will get upstream next time I ask Linus to pull from my
staging tree.

This is how things have happened, and I just can't see anything wrong.
If you do, please explain what you thing shouldn't have happened, and
let me know what I should have done instead.

Thanks,
-- 
Jean Delvare

  reply	other threads:[~2013-07-11  5:57 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-11  0:27 linux-next: rebase of the jdelvare-hwmon quilt series Stephen Rothwell
2013-07-11  5:57 ` Jean Delvare [this message]
2013-07-11  6:53   ` Stephen Rothwell
2013-07-11  7:39     ` Jean Delvare
2013-07-11 23:17       ` Paul Gortmaker
2013-07-12  0:27         ` Stephen Rothwell
2013-07-12  0:36           ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2013-09-05  0:19 Stephen Rothwell
2013-09-05  7:25 ` Jean Delvare

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=20130711075700.21d8482c@endymion.delvare \
    --to=khali@linux-fr.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox