Date: Mon, 30 Jun 2014 13:33:19 +0200 (CEST)
From: Jiri Kosina <jkosina@suse.cz>
To: Johan Hovold <johan@kernel.org>
cc: Bryan Wu <cooloney@gmail.com>,
        Janne Kanniainen <janne.kanniainen@gmail.com>,
        Greg Kroah-Hartman <greg@kroah.com>,
        =?ISO-8859-15?Q?Bj=F8rn_Mork?= <bjorn@mork.no>,
        lkml <linux-kernel@vger.kernel.org>,
        Linux LED Subsystem <linux-leds@vger.kernel.org>,
        linux-usb@vger.kernel.org, linux-input@vger.kernel.org
Subject: Re: [PATCH 2/2 v2] HID: leds: Use attribute-groups in MSI GT683R
 driver
In-Reply-To: <20140630104744.GB2486@localhost>
Message-ID: <alpine.LNX.2.00.1406301330240.28307@pobox.suse.cz>
References: <20140625115541.GA1409@localhost> <1403711966-13003-1-git-send-email-janne.kanniainen@gmail.com> <20140625174109.GE1409@localhost> <alpine.LNX.2.00.1406252107070.15939@pobox.suse.cz> <CAK5ve-JnqpogKaG1V=mfvKEHMPb8ma4Zeyz9rF4kT-W2Gj=p0A@mail.gmail.com>
 <20140630104744.GB2486@localhost>
User-Agent: Alpine 2.00 (LNX 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org

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.

Thanks,

-- 
Jiri Kosina
SUSE Labs
--
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/