From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tina Ruchandani <ruchandani.tina@gmail.com>
Subject: linux-next: manual merge of the staging tree with the vfs tree
Date: Mon, 3 Nov 2014 13:39:53 +1100 [thread overview]
Message-ID: <20141103133953.3da4c209@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1293 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/lustre/lustre/llite/namei.c between commits 8da673df2d77
("ll_get_child_fid(): callers already have the child") and ("kill
ll_unlink_generic()") from the vfs tree and commit 2a80f844158b
("Staging: lustre: llite: Declare ptr args correctly") 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@canb.auug.org.au
diff --cc drivers/staging/lustre/lustre/llite/namei.c
index 8e926b385a60,2971a26370be..000000000000
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@@ -974,7 -1103,8 +974,7 @@@ out
* Instead, ll_ddelete() and ll_d_iput() will update it based upon if there
* is any lock existing. They will recycle dentries and inodes based upon locks
* too. b=20433 */
- static int ll_unlink(struct inode * dir, struct dentry *dentry)
-static int ll_unlink_generic(struct inode *dir, struct dentry *dparent,
- struct dentry *dchild, struct qstr *name)
++static int ll_unlink(struct inode *dir, struct dentry *dentry)
{
struct ptlrpc_request *request = NULL;
struct md_op_data *op_data;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-03 2:40 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-03 2:39 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-12 5:16 linux-next: manual merge of the staging tree with the vfs tree Stephen Rothwell
2020-03-12 7:36 ` Greg KH
2018-10-09 4:59 Stephen Rothwell
2018-10-09 9:18 ` Greg KH
2018-03-13 4:22 Stephen Rothwell
2018-03-13 8:47 ` Greg KH
2017-12-04 2:06 Stephen Rothwell
2017-12-04 9:10 ` Greg KH
2017-12-04 1:58 Stephen Rothwell
2017-12-04 9:09 ` Greg KH
2017-11-09 4:01 Stephen Rothwell
2017-11-09 8:34 ` Greg KH
2016-12-12 4:21 Stephen Rothwell
2016-09-20 5:03 Stephen Rothwell
2016-09-20 11:14 ` Greg KH
2016-05-03 6:44 Stephen Rothwell
2016-05-03 18:19 ` Greg KH
2014-12-15 4:06 Stephen Rothwell
2014-11-27 9:11 Stephen Rothwell
2014-11-27 9:31 ` Stephen Rothwell
2014-11-27 16:20 ` Greg KH
2014-11-03 2:31 Stephen Rothwell
2014-11-03 2:29 Stephen Rothwell
2014-11-03 23:57 ` Greg KH
2013-04-10 5:54 Stephen Rothwell
2013-04-10 14:57 ` Greg KH
2013-04-04 4:43 Stephen Rothwell
2013-04-05 1:44 ` Greg KH
2013-04-04 4:40 Stephen Rothwell
2013-04-05 1:45 ` Greg KH
2013-04-04 4:34 Stephen Rothwell
2013-04-05 1:45 ` Greg KH
2012-09-24 7:07 Stephen Rothwell
2012-09-25 22:38 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141103133953.3da4c209@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ruchandani.tina@gmail.com \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).