From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean Delvare Subject: Re: linux-next: manual merge of the jdelvare-hwmon tree with Linus' tree Date: Mon, 16 Dec 2013 09:45:57 +0100 Message-ID: <20131216094557.3391bb6a@endymion.delvare> References: <20131216115733.16a652c0e350453d94c8551a@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from zoneX.GCU-Squad.org ([194.213.125.0]:31156 "EHLO services.gcu-squad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751848Ab3LPIqL (ORCPT ); Mon, 16 Dec 2013 03:46:11 -0500 In-Reply-To: <20131216115733.16a652c0e350453d94c8551a@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org 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