Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753601AbaF3XRf (ORCPT ); Mon, 30 Jun 2014 19:17:35 -0400 Received: from mail-la0-f45.google.com ([209.85.215.45]:44948 "EHLO mail-la0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751539AbaF3XRd (ORCPT ); Mon, 30 Jun 2014 19:17:33 -0400 MIME-Version: 1.0 In-Reply-To: References: <20140625115541.GA1409@localhost> <1403711966-13003-1-git-send-email-janne.kanniainen@gmail.com> <20140625174109.GE1409@localhost> <20140630104744.GB2486@localhost> From: Bryan Wu Date: Mon, 30 Jun 2014 16:17:10 -0700 Message-ID: Subject: Re: [PATCH 2/2 v2] HID: leds: Use attribute-groups in MSI GT683R driver To: Jiri Kosina Cc: Johan Hovold , Janne Kanniainen , Greg Kroah-Hartman , =?UTF-8?Q?Bj=C3=B8rn_Mork?= , lkml , Linux LED Subsystem , linux-usb@vger.kernel.org, linux-input@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 30, 2014 at 4:33 AM, Jiri Kosina wrote: > On Mon, 30 Jun 2014, Johan Hovold wrote: > >> > I think the better place is HID/input tree, since this patch depends >> > on the initial one which is not in my tree. >> > I'm going to merge Johan's whole patchset and this patch probably >> > depends Johan's work too. >> >> Dmitry has ACKed the input-patch and Bryan has applied that one and the >> leds-patches to his tree (of which the first one is a dependency of this >> patch). >> >> Jiri, are you saying that the gt683r-driver should go in through his >> tree as well, that is all three patches including the first that you >> have already applied? I just assumed your for-next branch was immutable, >> but perhaps I was mistaken. > > Well, for-next branch is a collection of all the topic branches I am > queuing for the following merge window. > > I am never really rebasing it, but I can definitely not include > 'for-3.17/hid-gt683r' topic branch in the pile I will be sending to Linus > (all the scheduled branches are getting merged into 'for-linus' only when > merge window open). So the only potential conflict between hid.git and > Bryan's tree would be in linux-next (and probably there will be none, git > can handle duplicate patches nicely). > > So once Bryan confirms he's queued it (please preserve my Signoff from my > tree), then I will just not include for-3.17/hid-gt683r branch in pull > request to Linus and all is fine. > I'm OK to merge Janne's first patch for HID GT683R through my tree with you guys' SOB. I'm also OK to merge this incremental patchset here. Please confirm it if I didn't misunderstand here. Also Janne or someone, can you post the original first patch to me or point me where is it? Thanks, -Bryan -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/