David S. Miller b48b63a1f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/netfilter/nfnetlink_log.c net/netfilter/xt_LOG.c Rather easy conflict resolution, the 'net' tree had bug fixes to make sure we checked if a socket is a time-wait one or not and elide the logging code if so. Whereas on the 'net-next' side we are calculating the UID and GID from the creds using different interfaces due to the user namespace changes from Eric Biederman. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-15 11:43:53 -04:00
..
aacraid	[SCSI] aacraid: Series 7 Async. (performance) mode support	2012-07-20 08:59:04 +01:00
aic7xxx
aic7xxx_old
aic94xx	[SCSI] libsas: fix taskfile corruption in sas_ata_qc_fill_rtf	2012-07-08 09:49:14 +01:00
arcmsr	[SCSI] arcmsr: fix misuse of | instead of &	2012-07-20 08:58:31 +01:00
arm
be2iscsi	[SCSI] be2iscsi: fix dma free size mismatch regression	2012-05-30 13:34:22 +04:00
bfa	[SCSI] bfa: Fix to set correct return error codes and misc cleanup.	2012-07-20 08:59:05 +01:00
bnx2fc	SCSI misc on 20120724	2012-07-24 18:11:22 -07:00
bnx2i	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-19 11:17:30 -07:00
cxgbi	SCSI misc on 20120724	2012-07-24 18:11:22 -07:00
device_handler	[SCSI] scsi_dh: add scsi_dh_attached_handler_name	2012-07-20 08:58:42 +01:00
dpt
fcoe	[SCSI] fcoe: Cleanup locking on fcoe_percpu_receive_thread	2012-07-20 08:58:55 +01:00
fnic
ibmvscsi
isci	[SCSI] isci: use sas eh strategy handlers	2012-07-20 08:58:51 +01:00
libfc	[SCSI] libfc: fix sending REC after FCP_RESP is received	2012-07-20 08:58:56 +01:00
libsas	[SCSI] async: introduce 'async_domain' type	2012-07-20 09:05:54 +01:00
lpfc	[SCSI] lpfc: fix problems with -Werror	2012-07-20 08:58:54 +01:00
megaraid	[SCSI] megaraid_sas: Move poll_aen_lock initializer	2012-08-22 09:39:25 +04:00
mpt2sas	[SCSI] mpt2sas: Fix for Driver oops, when loading driver with max_queue_depth command line option to a very small value	2012-08-22 09:38:49 +04:00
mvsas	[SCSI] mvsas: remove unused variable in mvs_task_exec()	2012-07-20 08:58:54 +01:00
osd
pcmcia
pm8001	[SCSI] libsas: trim sas_task of slow path infrastructure	2012-07-20 08:58:54 +01:00
qla2xxx	SCSI misc on 20120724	2012-07-24 18:11:22 -07:00
qla4xxx	[SCSI] qla4xxx: remove unnecessary read of PCI_CAP_ID_EXP	2012-07-20 08:59:02 +01:00
sym53c8xx_2
ufs	[SCSI] ufs: fix incorrect return value about SUCCESS and FAILED	2012-07-20 08:59:02 +01:00
.gitignore
3w-9xxx.c
3w-9xxx.h
3w-sas.c
3w-sas.h
3w-xxxx.c
3w-xxxx.h
53c700_d.h_shipped
53c700.c
53c700.h
53c700.scr
a100u2w.c
a100u2w.h
a2091.c
a2091.h
a3000.c
a3000.h
a4000t.c
advansys.c
aha152x.c	scsi: aha152x: Fix sparse warning and make printing pointer address more portable.	2012-07-20 10:19:25 +02:00
aha152x.h
aha1542.c	treewide: Put a space between #include and FILE	2012-06-28 11:44:36 +02:00
aha1542.h
aha1740.c
aha1740.h
aic7xxx_old.c
atari_NCR5380.c
atari_scsi.c
atari_scsi.h
atp870u.c
atp870u.h
BusLogic.c
BusLogic.h
bvme6000_scsi.c
ch.c
constants.c
dc395x.c
dc395x.h
dmx3191d.c
dpt_i2o.c
dpti.h
dtc.c
dtc.h
eata_generic.h
eata_pio.c
eata_pio.h
eata.c
esp_scsi.c
esp_scsi.h
fdomain.c
fdomain.h
FlashPoint.c
g_NCR5380_mmio.c
g_NCR5380.c
g_NCR5380.h
gdth_ioctl.h
gdth_proc.c
gdth_proc.h
gdth.c
gdth.h
gvp11.c
gvp11.h
hosts.c	[SCSI] Fix device removal NULL pointer dereference	2012-07-20 08:58:40 +01:00
hpsa_cmd.h	[SCSI] hpsa: dial down lockup detection during firmware flash	2012-05-10 09:19:39 +01:00
hpsa.c	[SCSI] hpsa: dial down lockup detection during firmware flash	2012-05-10 09:19:39 +01:00
hpsa.h	[SCSI] hpsa: dial down lockup detection during firmware flash	2012-05-10 09:19:39 +01:00
hptiop.c	[SCSI] hptiop: fix RR312x in hosts with >12GB	2012-07-20 08:58:30 +01:00
hptiop.h	[SCSI] hptiop: fix RR312x in hosts with >12GB	2012-07-20 08:58:30 +01:00
imm.c
imm.h
in2000.c
in2000.h
initio.c
initio.h
ipr.c
ipr.h
ips.c
ips.h
iscsi_boot_sysfs.c
iscsi_tcp.c
iscsi_tcp.h
jazz_esp.c
Kconfig	[SCSI] aha152x: Allow use on 64bit systems	2012-07-20 08:59:04 +01:00
lasi700.c
libiscsi_tcp.c
libiscsi.c
libsrp.c
mac53c94.c
mac53c94.h
mac_esp.c
mac_scsi.c
mac_scsi.h
Makefile	[SCSI] Remove scsi_wait_scan module	2012-07-20 08:58:13 +01:00
megaraid.c	[SCSI] megaraid: cleanup type issue in mega_build_cmd()	2012-07-20 08:58:38 +01:00
megaraid.h
mesh.c
mesh.h
mvme16x_scsi.c
mvme147.c
mvme147.h
mvumi.c
mvumi.h
ncr53c8xx.c
ncr53c8xx.h
NCR53c406a.c
NCR5380.c
NCR5380.h
NCR_D700.c
NCR_D700.h
NCR_Q720.c
NCR_Q720.h
nsp32_debug.c
nsp32_io.h
nsp32.c
nsp32.h
osst_detect.h
osst_options.h
osst.c
osst.h
pas16.c
pas16.h
pmcraid.c
pmcraid.h
ppa.c
ppa.h
ps3rom.c
qla1280.c
qla1280.h
qlogicfas408.c
qlogicfas408.h
qlogicfas.c
qlogicpti.c
qlogicpti.h
raid_class.c
script_asm.pl
scsi_debug.c
scsi_devinfo.c
scsi_error.c	[SCSI] Fix 'Device not ready' issue on mpt2sas	2012-08-22 09:42:54 +04:00
scsi_ioctl.c
scsi_lib_dma.c
scsi_lib.c	[SCSI] scsi_lib: fix scsi_io_completion's SG_IO error propagation	2012-08-22 09:42:31 +04:00
scsi_logging.h
scsi_module.c
scsi_netlink.c	scsi_netlink: Remove dead and buggy code	2012-09-13 16:26:39 -04:00
scsi_pm.c	[SCSI] scsi_pm: set device runtime state before parent suspended	2012-07-20 08:58:55 +01:00
scsi_priv.h	[SCSI] async: introduce 'async_domain' type	2012-07-20 09:05:54 +01:00
scsi_proc.c
scsi_sas_internal.h
scsi_scan.c	[SCSI] Fix 'Device not ready' issue on mpt2sas	2012-08-22 09:42:54 +04:00
scsi_sysctl.c
scsi_sysfs.c	[SCSI] fix hot unplug vs async scan race	2012-07-20 08:58:45 +01:00
scsi_tgt_if.c
scsi_tgt_lib.c
scsi_tgt_priv.h
scsi_trace.c
scsi_transport_api.h
scsi_transport_fc_internal.h
scsi_transport_fc.c	Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block	2012-08-01 09:02:41 -07:00
scsi_transport_iscsi.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
scsi_transport_sas.c
scsi_transport_spi.c	[SCSI] scsi_transport_spi: fix for unbalanced reference counting	2012-05-10 09:06:12 +01:00
scsi_transport_srp_internal.h
scsi_transport_srp.c
scsi_typedefs.h
scsi.c	[SCSI] async: make async_synchronize_full() flush all work regardless of domain	2012-07-20 09:07:37 +01:00
scsi.h
scsicam.c
sd_dif.c
sd.c	[SCSI] set to WCE if usb cache quirk is present.	2012-07-20 08:59:00 +01:00
sd.h
ses.c
sg.c	[SCSI] sg: constify sg_proc_leaf_arr	2012-05-17 10:08:57 +01:00
sgiwd93.c
sim710.c	scsi: delete the MCA specific drivers and driver code	2012-05-17 19:03:54 -04:00
sni_53c710.c
sr_ioctl.c
sr_vendor.c
sr.c
sr.h
st_options.h
st.c
st.h	[SCSI] st: fix memory leak with >1MB tape I/O	2012-05-10 08:32:34 +01:00
stex.c
storvsc_drv.c
sun3_NCR5380.c
sun3_scsi_vme.c
sun3_scsi.c
sun3_scsi.h
sun3x_esp.c
sun_esp.c
sym53c416.c
sym53c416.h
t128.c
t128.h
tmscsim.c
tmscsim.h
u14-34f.c
ultrastor.c
ultrastor.h
virtio_scsi.c	[SCSI] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning	2012-07-20 08:59:03 +01:00
vmw_pvscsi.c
vmw_pvscsi.h
wd33c93.c
wd33c93.h
wd7000.c
zalon.c
zorro7xx.c