James Morris f3a5c54701 Merge branch 'master' into next ...

Conflicts:
	fs/cifs/misc.c

Merge to resolve above, per the patch below.

Signed-off-by: James Morris <jmorris@namei.org>

diff --cc fs/cifs/misc.c
index ec36410,addd1dc..0000000
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@@ -347,13 -338,13 +338,13 @@@ header_assemble(struct smb_hdr *buffer
  		/*  BB Add support for establishing new tCon and SMB Session  */
  		/*      with userid/password pairs found on the smb session   */
  		/*	for other target tcp/ip addresses 		BB    */
 -				if (current->fsuid != treeCon->ses->linux_uid) {
 +				if (current_fsuid() != treeCon->ses->linux_uid) {
  					cFYI(1, ("Multiuser mode and UID "
  						 "did not match tcon uid"));
- 					read_lock(&GlobalSMBSeslock);
- 					list_for_each(temp_item, &GlobalSMBSessionList) {
- 						ses = list_entry(temp_item, struct cifsSesInfo, cifsSessionList);
+ 					read_lock(&cifs_tcp_ses_lock);
+ 					list_for_each(temp_item, &treeCon->ses->server->smb_ses_list) {
+ 						ses = list_entry(temp_item, struct cifsSesInfo, smb_ses_list);
 -						if (ses->linux_uid == current->fsuid) {
 +						if (ses->linux_uid == current_fsuid()) {
  							if (ses->server == treeCon->ses->server) {
  								cFYI(1, ("found matching uid substitute right smb_uid"));
  								buffer->Uid = ses->Suid;

2008-11-18 18:52:37 +11:00

..

datagram.c

net: Rationalise email address: Network Specific Parts

2008-10-13 19:01:08 -07:00

dev_mcast.c

net: Rationalise email address: Network Specific Parts

2008-10-13 19:01:08 -07:00

dev.c

Merge branch 'master' into next

2008-11-14 11:29:12 +11:00

dst.c

net: fix scheduling of dst_gc_task by __dst_free

2008-09-12 16:16:37 -07:00

ethtool.c

netdev: Add support for rx flow hash configuration, using ethtool.

2008-07-02 03:47:41 -07:00

fib_rules.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-07-05 23:08:07 -07:00

filter.c

net: Tyop of sk_filter() comment

2008-07-01 19:55:40 -07:00

flow.c

smp_call_function: get rid of the unused nonatomic/retry argument

2008-06-26 11:24:35 +02:00

gen_estimator.c

Revert "pkt_sched: Protect gen estimators under est_lock."

2008-08-18 22:32:10 -07:00

gen_stats.c

[NET_SCHED]: Convert packet schedulers from rtnetlink to new netlink API

2008-01-28 15:11:10 -08:00

iovec.c

net: Use standard structures for generic socket address structures.

2008-07-19 22:35:47 -07:00

kmap_skb.h

[PATCH] severing skbuff.h -> highmem.h

2006-12-04 02:00:29 -05:00

link_watch.c

net: Clean up explicit ->tx_queue references in link watch.

2008-07-08 23:01:06 -07:00

Makefile

net: Add SKB DMA mapping helper functions.

2008-09-11 04:51:14 -07:00

neighbour.c

neigh: Remove by-hand SKB queue handling.

2008-09-23 01:11:18 -07:00

net_namespace.c

netns: add register_pernet_gen_subsys/unregister_pernet_gen_subsys

2008-10-30 23:55:16 -07:00

net-sysfs.c

net: network device name ifalias support

2008-09-22 21:28:11 -07:00

net-sysfs.h

netns: Fix device renaming for sysfs

2008-05-02 17:00:58 -07:00

netevent.c

[NET]: net/core/netevent.c should #include <net/netevent.h>

2007-07-05 17:40:27 -07:00

netpoll.c

netdev: Fix lockdep warnings in multiqueue configurations.

2008-07-31 16:58:50 -07:00

pktgen.c

pktgen: fix multiple queue warning

2008-10-28 13:21:51 -07:00

request_sock.c

net: convert BUG_TRAP to generic WARN_ON

2008-07-25 21:43:18 -07:00

rtnetlink.c

rtnetlink: propagate error from dev_change_flags in do_setlink()

2008-11-16 23:20:31 -08:00

scm.c

Merge branch 'master' into next

2008-11-18 18:52:37 +11:00

skb_dma_map.c

net: Fix off-by-one in skb_dma_map

2008-10-12 21:07:34 -07:00

skbuff.c

net: fix setting of skb->tail in skb_recycle_check()

2008-11-10 21:45:05 -08:00

sock.c

lockdep: include/linux/lockdep.h - fix warning in net/bluetooth/af_bluetooth.c

2008-11-13 23:19:10 -08:00

stream.c

net: Rationalise email address: Network Specific Parts

2008-10-13 19:01:08 -07:00

sysctl_net_core.c

printk ratelimiting rewrite

2008-07-25 10:53:29 -07:00

user_dma.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-07-26 20:17:56 -07:00

utils.c

printk ratelimiting rewrite

2008-07-25 10:53:29 -07:00