From: Jean Delvare <khali@linux-fr.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the jdelvare-hwmon tree with Linus' tree
Date: Mon, 16 Dec 2013 09:45:57 +0100 [thread overview]
Message-ID: <20131216094557.3391bb6a@endymion.delvare> (raw)
In-Reply-To: <20131216115733.16a652c0e350453d94c8551a@canb.auug.org.au>
Hi Stephen,
On Mon, 16 Dec 2013 11:57:33 +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the jdelvare-hwmon tree got a conflict in
> drivers/hwmon/lm90.c between commits from Linus' tree and commits from
> the jdelvare-hwmon tree.
>
> It looks like the jdelvare-hwmon patch series has been reset back
> (unintentionally?) to stuff that has already been merged into Linus'
> tree ... so I just used the version from Linus' tree.
Oops. Yes, that was totally unintentional.
I had my ISP change some settings for my web hosting, and all my data
was deleted in the process. I kind of expected that, so I made a
complete backup before asking for the change. Unfortunately I did not
expect them to take so long to acknowledge my request and act upon it,
so when I restored my backup, my web space indeed went back in time by
several weeks.
I manually updated everything I remembered having touched during that
time frame, but as you spotted rightly, I forgot my kernel patch series.
This is all fixed now, sorry for the noise and thanks for letting me
know.
--
Jean Delvare
next prev parent reply other threads:[~2013-12-16 8:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-16 0:57 linux-next: manual merge of the jdelvare-hwmon tree with Linus' tree Stephen Rothwell
2013-12-16 8:45 ` Jean Delvare [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-09-23 1:42 Stephen Rothwell
2009-09-23 8:51 ` 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=20131216094557.3391bb6a@endymion.delvare \
--to=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox