linux-kernel - Re: linux-next: manual merge of the staging tree with the staging.current 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: <b269f4dd-8e11-4803-a4cb-72c392dfae55@email.android.com>
Date:	Mon, 23 Sep 2013 06:52:26 +0100
From:	Jonathan Cameron <jic23@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>, Greg KH <greg@...ah.com>
CC:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Yann Droneaud <ydroneaud@...eya.com>,
	Lars-Peter Clausen <lars@...afoo.de>
Subject: Re: linux-next: manual merge of the staging tree with the staging.current tree

Thanks Stephen.

Sorry Greg, I meant to mention these two would occur but clean forgot when sending that pull request.

Both are are correctly merged by Stephen.

Jonathan



Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>Hi Greg,
>
>Today's linux-next merge of the staging tree got a conflict in
>drivers/iio/industrialio-event.c between commit cadc2125e140 ("iio:
>fix:
>Keep a reference to the IIO device for open file descriptors") from the
>staging.current tree and commit a646fbf0fd11 ("iio: use
>anon_inode_getfd
>() with O_CLOEXEC flag") from the staging tree.
>
>I fixed it up (see below) and can carry the fix as necessary (no action
>is required).

-- 
Sent from my Android phone with K-9 Mail. Please excuse my brevity.
--
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/