linux-kernel - linux-next: manual merge of the workqueues tree with the cifs 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: <20100723144604.fe57e4bd.sfr@canb.auug.org.au>
Date:	Fri, 23 Jul 2010 14:46:04 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Suresh Jayaraman <sjayaraman@...e.de>,
	Steve French <smfrench@...il.com>, <linux-cifs@...r.kernel.org>
Subject: linux-next: manual merge of the workqueues tree with the cifs tree

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@...b.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 */
--
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/