From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Suresh Jayaraman <sjayaraman@suse•de>,
Steve French <smfrench@gmail•com>,
linux-cifs@vger•kernel.org
Subject: linux-next: manual merge of the workqueues tree with the cifs tree
Date: Fri, 23 Jul 2010 14:46:04 +1000 [thread overview]
Message-ID: <20100723144604.fe57e4bd.sfr@canb.auug.org.au> (raw)
Hi Tejun,
Today's linux-next merge of the workqueues tree got a conflict in
fs/cifs/cifsglob.h between commit
1626bccfc79b354aa47cbfc5c8d39f7be8823eb4 ("cifs: guard cifsglob.h against
multiple inclusion") from the cifs tree and commit
9b646972467fb5fdc677f9e4251875db20bdbb64 ("cifs: use workqueue instead of
slow-work") from the workqueues tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc fs/cifs/cifsglob.h
index 9b7cf9a,f5a1f9b..0000000
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@@ -727,6 -732,6 +727,8 @@@ GLOBAL_EXTERN unsigned int cifs_min_rcv
GLOBAL_EXTERN unsigned int cifs_min_small; /* min size of small buf pool */
GLOBAL_EXTERN unsigned int cifs_max_pending; /* MAX requests at once to server*/
- extern const struct slow_work_ops cifs_oplock_break_ops;
+ void cifs_oplock_break(struct work_struct *work);
+ void cifs_oplock_break_get(struct cifsFileInfo *cfile);
+ void cifs_oplock_break_put(struct cifsFileInfo *cfile);
+
+#endif /* _CIFS_GLOB_H */
next reply other threads:[~2010-07-23 4:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 4:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-07-23 4:46 linux-next: manual merge of the workqueues tree with the cifs tree Stephen Rothwell
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=20100723144604.fe57e4bd.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-cifs@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sjayaraman@suse$(echo .)de \
--cc=smfrench@gmail$(echo .)com \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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