linux-kernel - Re: linux-next: manual merge of the staging tree with the trivial 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: <alpine.LNX.2.00.1107201201020.7300@pobox.suse.cz>
Date:	Wed, 20 Jul 2011 12:01:27 +0200 (CEST)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Greg KH <greg@...ah.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Joe Perches <joe@...ches.com>
Subject: Re: linux-next: manual merge of the staging tree with the trivial
 tree

On Sun, 17 Jul 2011, Greg KH wrote:

> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/staging/generic_serial/ser_a2232.c between commit 28f65c11f2ff
> > ("treewide: Convert uses of struct resource to resource_size(ptr)") from
> > the trivial tree and commit bb2a97e9ccd5 ("Staging: delete generic_serial
> > drivers") from the staging tree.
> > 
> > The latter removes the file, so I did that.
> 
> Thank you, that is the correct fix :)

I have dropped the conflicting hunks now (and the same for the other 
trivial/staging conflict).

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/