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] [day] [month] [year] [list]

Message-ID: <alpine.LNX.2.00.1008110938100.2702@pobox.suse.cz>
Date:	Wed, 11 Aug 2010 09:38:33 +0200 (CEST)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Boaz Harrosh <bharrosh@...asas.com>
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 Tue, 10 Aug 2010, Boaz Harrosh wrote:

> > 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 for notification, I have pulled Linus' branch now into 'for-next', 
so the conflict for linux-next should be gone.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
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/