linux-kernel - Re: linux-next: manual merge of the trivial tree with the vfs 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: <4C61D055.4090909@panasas.com>
Date:	Tue, 10 Aug 2010 18:19:01 -0400
From:	Boaz Harrosh <bharrosh@...asas.com>
To:	Jiri Kosina <jkosina@...e.cz>
CC:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Paul Bolle <pebolle@...cali.nl>,
	Al Viro <viro@...IV.linux.org.uk>
Subject: Re: linux-next: manual merge of the trivial tree with the vfs tree

On 08/09/2010 10:19 PM, Stephen Rothwell wrote:
> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> fs/exofs/inode.c between commit 21883a7d05d4c1e97943fa1a587aa2c2a3b09e8c
> ("exofs: New truncate sequence") from the vfs tree and commit
> 426d31071ac476ea62c62656b242930c17b58c00 ("fix printk typo 'faild'") from
> the trivial tree.
> 
> Just context changes.  I fixed it up (see below) and can carry it for a
> while.

The "exofs: New truncate sequence" is now in the Kernel. So perhaps
fix printk typo 'faild'" could be rebased.

Or you can send the patch to me and I'll push it. Which ever you
prefer

Thanks
Boaz

--
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/