linux-kernel - Re: [PATCH 2/2 v2] HID: leds: Use attribute-groups in MSI GT683R driver

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LNX.2.00.1406301330240.28307@pobox.suse.cz>
Date:	Mon, 30 Jun 2014 13:33:19 +0200 (CEST)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Johan Hovold <johan@...nel.org>
cc:	Bryan Wu <cooloney@...il.com>,
	Janne Kanniainen <janne.kanniainen@...il.com>,
	Greg Kroah-Hartman <greg@...ah.com>,
	Bjørn Mork <bjorn@...k.no>,
	lkml <linux-kernel@...r.kernel.org>,
	Linux LED Subsystem <linux-leds@...r.kernel.org>,
	linux-usb@...r.kernel.org, linux-input@...r.kernel.org
Subject: Re: [PATCH 2/2 v2] HID: leds: Use attribute-groups in MSI GT683R
 driver

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/