linux-kernel - Re: linux-next: manual merge of the staging tree with the usb 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] [day] [month] [year] [list]

Message-ID: <20130618160333.GC28961@kroah.com>
Date:	Tue, 18 Jun 2013 09:03:33 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bernd Bassimir <bassimir.kernel@....de>,
	Nico Doerr <nico.doerr@...o.net>
Subject: Re: linux-next: manual merge of the staging tree with the usb tree

On Tue, Jun 18, 2013 at 02:55:59PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/serqt_usb2/serqt_usb2.c between commit 1143832eca8f
> ("USB: serial: ports: add minor and port number") from the usb tree and
> commit d68edc2881b1 ("staging: serqt_usb2: Fixed coding style
> CamelCases") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Fix looks fine, thanks.

greg k-h
--
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/