From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jean Delvare <khali@linux-fr•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Rudolf Marek <r.marek@assembler•cz>,
Michael Riepe <michael.riepe@googlemail•com>,
Andrew Morton <akpm@linux-foundation•org>
Subject: linux-next: manual merge of the jdelvare-hwmon tree with Linus' tree
Date: Wed, 23 Sep 2009 11:42:57 +1000 [thread overview]
Message-ID: <20090923114257.e6e101cf.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 532 bytes --]
Hi Jean,
Today's linux-next merge of the jdelvare-hwmon tree got a conflict in
drivers/hwmon/coretemp.c between commit
0bf41d9f414a5cf558aff234a0ff486257537574 ("drivers/hwmon/coretemp.c:
enable the Intel Atom") from Linus' tree and commit
af663ff4d88e09c4e45661251e3c1eeff147ffc1 ("hwmon: (coretemp) Add support
for Atom CPUs") from the jdelvare-hwmon tree.
I used the version from the jdelvare-hwmon for today.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2009-09-23 1:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-23 1:42 Stephen Rothwell [this message]
2009-09-23 8:51 ` linux-next: manual merge of the jdelvare-hwmon tree with Linus' tree Jean Delvare
-- strict thread matches above, loose matches on Subject: below --
2013-12-16 0:57 Stephen Rothwell
2013-12-16 8:45 ` 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=20090923114257.e6e101cf.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=khali@linux-fr$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=michael.riepe@googlemail$(echo .)com \
--cc=r.marek@assembler$(echo .)cz \
/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