From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935409Ab3FTAXe (ORCPT ); Wed, 19 Jun 2013 20:23:34 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:38778 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934375Ab3FTAXc (ORCPT ); Wed, 19 Jun 2013 20:23:32 -0400 MIME-Version: 1.0 In-Reply-To: <20130619163628.GA28672@kroah.com> References: <20130619153225.9ff68f0984bfa54333c4df10@canb.auug.org.au> <20130619143918.GC8413@kroah.com> <20130619163628.GA28672@kroah.com> Date: Thu, 20 Jun 2013 08:23:30 +0800 Message-ID: Subject: Re: linux-next: manual merge of the driver-core tree with the driver-core.current tree From: Ming Lei To: Greg KH Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Takashi Iwai Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 20, 2013 at 12:36 AM, Greg KH wrote: > > Can you merge the two branches together (driver-core-next and > driver-core-linus) and send me the proper merge patch that I should be > applying when doing that? Then I can push that out through the Yes, I already merged the two branches together in my local repository, and there is one merge commit, but I don't know how to generate/format patch for this merge commit only: commit e4b00d75ee3ed3af9fac83970d21e27d1ad4aa8d Merge: bb07b00 8759793 Author: Ming Lei Date: Wed Jun 19 23:56:05 2013 +0800 firmware loader: fix conflict driver-core-linus and driver-core-next Conflicts: drivers/base/firmware_class.c Anyone who knows, please let me know, thanks. Thanks, -- Ming Lei