public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Guenter Roeck <guenter@roeck-us•net>
To: Wim Van Sebroeck <wim@iguana•be>,
	Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Aaron Sierra <asierra@xes-inc•com>,
	Samuel Ortiz <sameo@linux•intel.com>,
	Randy Dunlap <rdunlap@xenotime•net>,
	linux-watchdog@vger•kernel.org, Jean Delvare <khali@linux-fr•org>
Subject: Re: linux-next: manual merge of the watchdog tree with the mfd tree
Date: Fri, 18 May 2012 18:20:01 -0700	[thread overview]
Message-ID: <6.2.5.6.2.20120518181141.028c8090@roeck-us.net> (raw)
In-Reply-To: <20120518083234.GW3074@spo001.leaseweb.com>

At 01:32 AM 5/18/2012, Wim Van Sebroeck wrote:
>Hi Stephen,
>
> > Today's linux-next merge of the watchdog tree got a conflict in
> > drivers/watchdog/iTCO_wdt.c between commit 887c8ec7219f ("watchdog:
> > Convert iTCO_wdt driver to mfd model") from the  tree and commit
> > c3614aa19d3e ("watchdog: iTCO_wdt.c: fix printk format warnings") from
> > the watchdog tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary.
>
>Thanks for fixing this up.
>
>But I'm a bit surprised: I wasn't Cc'ed about this patch to Convert
>the iTCO_wdt driver to the mfd model...
Oh my. Kind of embarrassing to forget one of the maintainers in all 
the discussions which tree this patch set should go through. Even 
though I didn't much of the code, my sign-off is there, and I should 
have made sure that you are on the Cc: list. Sorry for that, and I 
owe you a beer or two if we ever meet in person.

Hope you are ok with the changes - the patch set already missed the 
last commit window because of the which-tree-to-use issue, and it 
would be sad to miss another one. And Jean is really waiting for it 
to go in to be able to push some related patches which need the gpio driver.

Thanks,
Guenter

next prev parent reply	other threads:[~2012-05-19  1:26 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-18  5:23 linux-next: manual merge of the watchdog tree with the mfd tree Stephen Rothwell
2012-05-18  8:32 ` Wim Van Sebroeck
2012-05-19  1:20   ` Guenter Roeck [this message]
2012-05-22 16:35     ` Wim Van Sebroeck
2012-05-22 22:37       ` Guenter Roeck
2012-05-22 22:46         ` Stephen Rothwell
2012-05-23  5:44         ` Wim Van Sebroeck
2012-05-23 14:26           ` Samuel Ortiz
2012-05-23 14:55             ` Wim Van Sebroeck
  -- strict thread matches above, loose matches on Subject: below --
2013-02-08  1:52 Stephen Rothwell
2013-02-08 11:36 ` Wim Van Sebroeck

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=6.2.5.6.2.20120518181141.028c8090@roeck-us.net \
    --to=guenter@roeck-us$(echo .)net \
    --cc=asierra@xes-inc$(echo .)com \
    --cc=khali@linux-fr$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=linux-watchdog@vger$(echo .)kernel.org \
    --cc=rdunlap@xenotime$(echo .)net \
    --cc=sameo@linux$(echo .)intel.com \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=wim@iguana$(echo .)be \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox