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

Message-ID: <20141103133150.456111d8@canb.auug.org.au>
Date:	Mon, 3 Nov 2014 13:31:50 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tina Johnson <tinajohnson.1234@...il.com>
Subject: linux-next: manual merge of the staging tree with the vfs tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/lustre/lustre/llite/llite_lib.c between commit
94b5670e78ce ("move d_rcu from overlapping d_child to overlapping
d_alias") from the vfs tree and commit cf29a7b6eae8 ("Staging: lustre:
Fix checkpatch warning: Missing blank line") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/staging/lustre/lustre/llite/llite_lib.c
index 7b6b9e2e0102,afb433a33d25..000000000000
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@@ -709,7 -712,8 +710,8 @@@ void lustre_dump_dentry(struct dentry *
  		return;
  
  	list_for_each(tmp, &dentry->d_subdirs) {
 -		struct dentry *d = list_entry(tmp, struct dentry, d_u.d_child);
 +		struct dentry *d = list_entry(tmp, struct dentry, d_child);
+ 
  		lustre_dump_dentry(d, recur - 1);
  	}
  }

Content of type "application/pgp-signature" skipped