public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: wim@iguana.be, Guenter Roeck <linux@roeck-us.net>
Cc: Arnd Bergmann <arnd@arndb.de>,
	dbaryshkov@gmail.com, dwmw2@infradead.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org,
	linux-sunxi@googlegroups.com
Subject: Re: [PATCH v2 1/6] wdt: sunxi: Move restart code to the watchdog driver
Date: Mon, 23 Jun 2014 12:31:42 +0200	[thread overview]
Message-ID: <20140623103142.GB19730@lukather> (raw)
In-Reply-To: <20140522211207.GA28704@roeck-us.net>

[-- Attachment #1: Type: text/plain, Size: 2411 bytes --]

On Thu, May 22, 2014 at 02:12:07PM -0700, Guenter Roeck wrote:
> On Thu, May 22, 2014 at 10:34:44PM +0200, Maxime Ripard wrote:
> > On Mon, May 19, 2014 at 05:04:22PM +0200, Maxime Ripard wrote:
> > > On Thu, May 15, 2014 at 11:11:23AM +0200, Maxime Ripard wrote:
> > > > On Wed, May 07, 2014 at 02:33:18PM -0700, Guenter Roeck wrote:
> > > > > On Tue, May 06, 2014 at 09:44:19PM -0500, Maxime Ripard wrote:
> > > > > > Most of the watchdog code is duplicated between the machine restart code and
> > > > > > the watchdog driver. Add the restart hook to the watchdog driver, to be able to
> > > > > > remove it from the machine code eventually.
> > > > > > 
> > > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > > > > > Acked-by: Arnd Bergmann <arnd@arndb.de>
> > > > > 
> > > > > Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> > > > 
> > > > Wim, do you have any comment on this one?
> > > 
> > > Ping?
> > > 
> > > It would be really great to see this in 3.16, and we get quite close
> > > to the end of ARM's merge window.
> > 
> > Ping?
> > 
> > Guenter, since you seem to be the only responsive, may I suggest that
> > you start merging patches and do a pull request to either Wim or Linus
> > directly during the merge window?
> > 
> I had prepared a pull request for Wim last weekend or so, but then there
> were more patches piling in and I got distracted, so I didn't have time
> to actually send it. I'll try again this weekend ... the kids should be
> busy learning for their finals, and I'll have Friday and Monday off
> from work, so I should be able to find the time.
> 
> As for sending patches to Linus directly, well, Wim is the watchdog maintainer.
> I manage to upset enough people, and would not want to add Wim to the list.
> 
> The patches _are_ in my watchdog-next branch and get some coverage from
> both my auto-builders and from Fenguang's build robots, so while they are
> not in linux-next, they are not completely in the dark either.

So, this patch finally didn't make it into 3.16. Great. Now, we can't
even reboot the boards.

Given how it's just impossible to get something merged reliably
through the watchdog tree, I guess I should just start merging the
patches through mine?

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

  parent reply	other threads:[~2014-06-23 10:35 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-07  2:44 [PATCH v2 0/6] ARM: sunxi: Machine code cleanup Maxime Ripard
2014-05-07  2:44 ` [PATCH v2 1/6] wdt: sunxi: Move restart code to the watchdog driver Maxime Ripard
2014-05-07 21:33   ` Guenter Roeck
2014-05-15  9:11     ` Maxime Ripard
2014-05-19 15:04       ` Maxime Ripard
2014-05-22 20:34         ` Maxime Ripard
2014-05-22 20:39           ` One Thousand Gnomes
2014-05-22 20:56             ` Maxime Ripard
2014-06-23 21:16             ` Wim Van Sebroeck
2014-05-22 21:12           ` Guenter Roeck
2014-05-23  8:33             ` Maxime Ripard
2014-06-23 10:31             ` Maxime Ripard [this message]
2014-06-23 14:30               ` Guenter Roeck
2014-06-23 14:42                 ` Arnd Bergmann
2014-06-23 15:16                   ` Guenter Roeck
2014-06-23 15:35                     ` Arnd Bergmann
2014-06-23 15:40                       ` Guenter Roeck
2014-06-23 15:49                 ` Maxime Ripard
2014-06-23 21:30                   ` Wim Van Sebroeck
2014-06-23 21:47                     ` Guenter Roeck
2014-06-24  9:27                       ` Arnd Bergmann
2014-06-23 21:13               ` Wim Van Sebroeck
2014-06-24 14:49                 ` Maxime Ripard
2014-06-24 16:01                   ` Guenter Roeck
2014-08-02  8:02                   ` Wim Van Sebroeck
2014-08-02 15:17                     ` Maxime Ripard
2014-08-02 15:45                     ` Guenter Roeck
2014-05-07  2:44 ` [PATCH v2 2/6] power: reset: Add Allwinner A31 reset code Maxime Ripard
2014-05-07  2:44 ` [PATCH v2 3/6] ARM: sunxi: Remove reset code from the platform Maxime Ripard
2014-05-07  2:44 ` [PATCH v2 4/6] ARM: sunxi: Remove init_machine callback Maxime Ripard
2014-05-07  2:44 ` [PATCH v2 5/6] ARM: sunxi: Add A31 reset driver to sunxi_defconfig Maxime Ripard
2014-05-07  2:44 ` [PATCH v2 6/6] ARM: multi_v7: Add Allwinner reset drivers to multi_v7_defconfig Maxime Ripard

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=20140623103142.GB19730@lukather \
    --to=maxime.ripard@free-electrons.com \
    --cc=arnd@arndb.de \
    --cc=dbaryshkov@gmail.com \
    --cc=dwmw2@infradead.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sunxi@googlegroups.com \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=wim@iguana.be \
    /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