linux-kernel - RE: linux-next: manual merge of the staging tree with the hid tree

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <alpine.LNX.2.00.1112012045540.18207@pobox.suse.cz>
Date:	Thu, 1 Dec 2011 20:46:24 +0100 (CET)
From:	Jiri Kosina <jkosina@...e.cz>
To:	KY Srinivasan <kys@...rosoft.com>
Cc:	Greg KH <greg@...ah.com>, Stephen Rothwell <sfr@...b.auug.org.au>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Thomas Meyer <thomas@...3r.de>
Subject: RE: linux-next: manual merge of the staging tree with the hid tree

On Thu, 1 Dec 2011, KY Srinivasan wrote:

> > Ok, that's fine, Jiri, want me to just delete the driver from my tree
> > now to remove any of these conflicts?
> 
> Yesterday (Nov 30th, 2011) I had sent a patch for the mouse driver to 
> fix a bug that got introduced during the recent cleanup to exit staging. 
> This patch was against the staging tree that Greg is planning to delete. 
> It is a trivial patch; can you pick this up for the hid tree. If you 
> prefer, I could rebase the patch against your tree. Let me know.

I will pick the one you have sent against staging tree, no need for you to 
respin.

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/