All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wim Van Sebroeck <wim@iguana.be>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Fabio Baltieri <fabio.baltieri@linaro.org>,
	Samuel Ortiz <sameo@linux.intel.com>,
	Aaro Koskinen <aaro.koskinen@iki.fi>
Subject: Re: linux-next: manual merge of the watchdog tree with the mfd tree
Date: Fri, 8 Feb 2013 12:36:26 +0100	[thread overview]
Message-ID: <20130208113626.GV7867@spo001.leaseweb.com> (raw)
In-Reply-To: <20130208125220.37a34d89ea4cc7e43b27cf4e@canb.auug.org.au>

Hi Stephen,

> Today's linux-next merge of the watchdog tree got conflicts in
> drivers/watchdog/Kconfig and drivers/watchdog/Makefile between commit
> 699ff59052e7 ("watchdog: Add support for ux500_wdt watchdog") from the
> mfd tree and commit 77b709cb6c9d ("watchdog: introduce retu_wdt driver")
> from the watchdog tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks!

Kind regards,
Wim.


  reply	other threads:[~2013-02-08 11:36 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-08  1:52 linux-next: manual merge of the watchdog tree with the mfd tree Stephen Rothwell
2013-02-08 11:36 ` Wim Van Sebroeck [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-05-18  5:23 Stephen Rothwell
2012-05-18  8:32 ` Wim Van Sebroeck
2012-05-19  1:20   ` Guenter Roeck
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

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=20130208113626.GV7867@spo001.leaseweb.com \
    --to=wim@iguana.be \
    --cc=aaro.koskinen@iki.fi \
    --cc=fabio.baltieri@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sameo@linux.intel.com \
    --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 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.