On Thu, Jun 20, 2013 at 12:36 AM, Greg KH <[email protected]> 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 <[email protected]> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
