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
| ||
|
Date: Mon, 12 Dec 2016 15:21:51 +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, Fan Yong <fan.yong@...el.com>, Li Xi <lixi@....com>, James Simmons <jsimmons@...radead.org> 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/statahead.c between commit: 7126bc2e8d60 ("lustre: switch to use of ->d_init()") from the vfs tree and commit: 3c8fb1b105cd ("staging: lustre: statahead: set sai_index_wait with lli_sa_lock held") from the staging tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/staging/lustre/lustre/llite/statahead.c index 166323fddc44,4769a2230ae1..000000000000 --- a/drivers/staging/lustre/lustre/llite/statahead.c +++ b/drivers/staging/lustre/lustre/llite/statahead.c @@@ -1512,8 -1519,9 +1519,7 @@@ out_unplug * dentry_may_statahead(). */ ldd = ll_d2d(*dentryp); - lli = ll_i2info(dir); - /* ldd can be NULL if llite lookup failed. */ - if (ldd) - ldd->lld_sa_generation = lli->lli_sa_generation; + ldd->lld_sa_generation = lli->lli_sa_generation; sa_put(sai, entry); return rc; }
Powered by blists - more mailing lists