From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Wim Van Sebroeck <wim@iguana•be>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Paul Mundt <lethal@linux-sh•org>
Subject: linux-next: manual merge of the watchdog tree with the sh tree
Date: Wed, 23 Feb 2011 14:34:46 +1100 [thread overview]
Message-ID: <20110223143446.8646373f.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
Hi Wim,
Today's linux-next merge of the watchdog tree got a conflict in
drivers/watchdog/shwdt.c between commits b1fa888e0124 ("watchdog: shwdt:
Kill off mmap stub and superfluous comments") and 8f5585ec3d17
("watchdog: shwdt: driver model conversion") from the sh tree and commit
e273d97a2281 ("watchdog: cleanup spaces before tabs") from the watchdog
tree.
The spaces seem to have been cleaned up in the former patches, so I used
the sh tree version of this file.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-02-23 3:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-23 3:34 Stephen Rothwell [this message]
2011-02-23 7:42 ` linux-next: manual merge of the watchdog tree with the sh tree 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=20110223143446.8646373f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=lethal@linux-sh$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=wim@iguana$(echo .)be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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