David S. Miller 6e0895c2ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be_main.c drivers/net/ethernet/intel/igb/igb_main.c drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c include/net/scm.h net/batman-adv/routing.c net/ipv4/tcp_input.c The e{uid,gid} --> {uid,gid} credentials fix conflicted with the cleanup in net-next to now pass cred structs around. The be2net driver had a bug fix in 'net' that overlapped with the VLAN interface changes by Patrick McHardy in net-next. An IGB conflict existed because in 'net' the build_skb() support was reverted, and in 'net-next' there was a comment style fix within that code. Several batman-adv conflicts were resolved by making sure that all calls to batadv_is_my_mac() are changed to have a new bat_priv first argument. Eric Dumazet's TS ECR fix in TCP in 'net' conflicted with the F-RTO rewrite in 'net-next', mostly overlapping changes. Thanks to Stephen Rothwell and Antonio Quartulli for help with several of these merge resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-22 20:32:51 -04:00
..
aacraid	[SCSI] aacraid: suppress two GCC warnings	2013-02-24 09:38:10 +00:00
aic7xxx	…
aic7xxx_old	…
aic94xx	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
arcmsr	…
arm	drivers/scsi/arm: remove depends on CONFIG_EXPERIMENTAL	2013-01-21 14:52:45 -08:00
be2iscsi	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
bfa	SCSI misc on 20130222	2013-02-28 12:43:43 -08:00
bnx2fc	libfc, fcoe, bnx2fc: Split fc_disc_init into fc_disc_{init, config}	2013-03-25 16:03:03 -07:00
bnx2i	[SCSI] bnx2i: fix the bit manipulation when setting the error mask	2013-01-29 14:15:34 +11:00
csiostor	csiostor: Cleanup chip specific operations.	2013-03-14 11:36:00 -04:00
cxgbi	[SCSI] cxgb4i: Remove the scsi host device when removing device	2013-01-30 11:58:06 +11:00
device_handler	drivers/scsi/device_handler: remove depends on CONFIG_EXPERIMENTAL	2013-01-21 14:52:45 -08:00
dpt	…
fcoe	net: vlan: rename NETIF_F_HW_VLAN_* feature flags to NETIF_F_HW_VLAN_CTAG_*	2013-04-19 14:45:26 -04:00
fnic	[SCSI] fnic: Fnic Trace Utility	2013-02-22 17:32:07 +00:00
ibmvscsi	[SCSI] ibmvscsi: Fix slave_configure deadlock	2013-04-06 11:35:51 +01:00
isci	efi: Make 'efi_enabled' a function to query EFI facilities	2013-01-30 11:51:59 -08:00
libfc	libfc, fcoe, bnx2fc: Split fc_disc_init into fc_disc_{init, config}	2013-03-25 16:03:03 -07:00
libsas	[SCSI] libsas: fix handling vacant phy in sas_set_ex_phy()	2013-04-06 11:36:54 +01:00
lpfc	[SCSI] lpfc: fix potential NULL pointer dereference in lpfc_sli4_rq_put()	2013-04-11 14:17:15 -07:00
megaraid	[SCSI] megaraid_sas: Version and Changelog update	2013-02-22 15:37:15 +00:00
mpt2sas	[SCSI] mpt2sas: Add support for OEM specific controller	2013-02-24 08:48:15 +00:00
mpt3sas	[SCSI] mpt3sas: remove unused variables	2013-01-29 14:15:35 +11:00
mvsas	[SCSI] mvsas: fixed timeout issue when removing module	2013-02-22 11:18:33 +00:00
osd	SCSI for-linus on 20130301	2013-03-02 11:42:16 -08:00
pcmcia	…
pm8001	[SCSI] pm80xx: fix for memory region free	2013-02-22 15:44:40 +00:00
qla2xxx	[SCSI] qla2xxx: Update the driver version to 8.04.00.13-k.	2013-04-06 11:32:32 +01:00
qla4xxx	[SCSI] qla4xxx: don't free NULL dma pool	2013-02-22 11:24:22 +00:00
sym53c8xx_2	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
ufs	[SCSI] ufs: Separate PCI code into glue driver	2013-02-25 16:56:32 +00:00
.gitignore	…
3w-9xxx.c	new helper: file_inode(file)	2013-02-22 23:31:31 -05:00
3w-9xxx.h	…
3w-sas.c	new helper: file_inode(file)	2013-02-22 23:31:31 -05:00
3w-sas.h	…
3w-xxxx.c	new helper: file_inode(file)	2013-02-22 23:31:31 -05:00
3w-xxxx.h	…
53c700.c	…
53c700.h	…
53c700.scr	…
53c700_d.h_shipped	…
BusLogic.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
BusLogic.h	…
FlashPoint.c	…
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-02-21 17:40:58 -08:00
Makefile	…
NCR53c406a.c	…
NCR5380.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
NCR5380.h	…
NCR_D700.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
NCR_D700.h	…
NCR_Q720.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
NCR_Q720.h	…
a100u2w.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
a100u2w.h	…
a2091.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
a2091.h	…
a3000.c	…
a3000.h	…
a4000t.c	…
advansys.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
aha152x.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
aha152x.h	…
aha1542.c	…
aha1542.h	…
aha1740.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
aha1740.h	…
aic7xxx_old.c	…
atari_NCR5380.c	…
atari_scsi.c	…
atari_scsi.h	…
atp870u.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
atp870u.h	…
bvme6000_scsi.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
ch.c	scsi: convert to idr_alloc()	2013-02-27 19:10:18 -08:00
constants.c	…
dc395x.c	[SCSI] dc395x: uninitialized variable in device_alloc()	2013-02-24 09:29:34 +00:00
dc395x.h	…
dmx3191d.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
dpt_i2o.c	new helper: file_inode(file)	2013-02-22 23:31:31 -05:00
dpti.h	…
dtc.c	…
dtc.h	…
eata.c	…
eata_generic.h	…
eata_pio.c	…
eata_pio.h	…
esp_scsi.c	…
esp_scsi.h	…
fdomain.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
fdomain.h	…
g_NCR5380.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
g_NCR5380.h	…
g_NCR5380_mmio.c	…
gdth.c	[SCSI] gdth: Remove buggy ROM handling	2013-01-29 13:55:06 +11:00
gdth.h	…
gdth_ioctl.h	…
gdth_proc.c	…
gdth_proc.h	…
gvp11.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
gvp11.h	…
hosts.c	driver-core: constify data for class_find_device()	2013-02-06 12:18:56 -08:00
hpsa.c	[SCSI] hpsa: check for dma_mapping_error in hpsa_passthru ioctls	2013-02-24 09:36:58 +00:00
hpsa.h	…
hpsa_cmd.h	…
hptiop.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
hptiop.h	…
imm.c	…
imm.h	…
in2000.c	…
in2000.h	…
initio.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
initio.h	…
ipr.c	[SCSI] ipr: dlpar failed when adding an adapter back	2013-04-06 11:25:37 +01:00
ipr.h	[SCSI] ipr: Fix oops while resetting an ipr adapter	2013-02-24 08:24:48 +00:00
ips.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
ips.h	…
iscsi_boot_sysfs.c	…
iscsi_tcp.c	…
iscsi_tcp.h	…
jazz_esp.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
lasi700.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
libiscsi.c	…
libiscsi_tcp.c	…
libsrp.c	…
mac53c94.c	…
mac53c94.h	…
mac_esp.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
mac_scsi.c	…
mac_scsi.h	…
megaraid.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
megaraid.h	…
mesh.c	…
mesh.h	…
mvme16x_scsi.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
mvme147.c	…
mvme147.h	…
mvumi.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
mvumi.h	…
ncr53c8xx.c	…
ncr53c8xx.h	…
nsp32.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
nsp32.h	…
nsp32_debug.c	…
nsp32_io.h	…
osst.c	…
osst.h	…
osst_detect.h	…
osst_options.h	…
pas16.c	…
pas16.h	…
pmcraid.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
pmcraid.h	…
ppa.c	…
ppa.h	…
ps3rom.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
qla1280.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
qla1280.h	…
qlogicfas.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
qlogicfas408.c	…
qlogicfas408.h	…
qlogicpti.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
qlogicpti.h	…
raid_class.c	…
script_asm.pl	…
scsi.c	…
scsi.h	…
scsi_debug.c	…
scsi_devinfo.c	…
scsi_error.c	…
scsi_ioctl.c	…
scsi_lib.c	ACPI / glue: Add .match() callback to struct acpi_bus_type	2013-03-04 14:23:40 +01:00
scsi_lib_dma.c	…
scsi_logging.h	…
scsi_module.c	…
scsi_netlink.c	scsi: replace obsolete NLMSG_* with type safe nlmsg_*	2013-03-28 14:27:24 -04:00
scsi_pm.c	…
scsi_priv.h	…
scsi_proc.c	…
scsi_sas_internal.h	…
scsi_scan.c	…
scsi_sysctl.c	…
scsi_sysfs.c	…
scsi_tgt_if.c	…
scsi_tgt_lib.c	…
scsi_tgt_priv.h	…
scsi_trace.c	…
scsi_transport_api.h	…
scsi_transport_fc.c	scsi: replace obsolete NLMSG_* with type safe nlmsg_*	2013-03-28 14:27:24 -04:00
scsi_transport_fc_internal.h	…
scsi_transport_iscsi.c	scsi: replace obsolete NLMSG_* with type safe nlmsg_*	2013-03-28 14:27:24 -04:00
scsi_transport_sas.c	…
scsi_transport_spi.c	…
scsi_transport_srp.c	…
scsi_transport_srp_internal.h	…
scsi_typedefs.h	…
scsicam.c	…
sd.c	…
sd.h	…
sd_dif.c	…
ses.c	…
sg.c	scsi: convert to idr_alloc()	2013-02-27 19:10:18 -08:00
sgiwd93.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
sim710.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
sni_53c710.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
sr.c	[libata] scsi: no poll when ODD is powered off	2013-01-25 15:36:43 -05:00
sr.h	…
sr_ioctl.c	…
sr_vendor.c	…
st.c	[SCSI] st: Take additional queue ref in st_probe	2013-04-06 11:14:20 +01:00
st.h	…
st_options.h	…
stex.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
storvsc_drv.c	SCSI for-linus on 20130301	2013-03-02 11:42:16 -08:00
sun3_NCR5380.c	…
sun3_scsi.c	…
sun3_scsi.h	…
sun3_scsi_vme.c	…
sun3x_esp.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
sun_esp.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
sym53c416.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
sym53c416.h	…
t128.c	…
t128.h	…
tmscsim.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
tmscsim.h	…
u14-34f.c	…
ultrastor.c	…
ultrastor.h	…
virtio_scsi.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
vmw_pvscsi.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
vmw_pvscsi.h	…
wd33c93.c	…
wd33c93.h	…
wd7000.c	…
zalon.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
zorro7xx.c	Drivers: scsi: remove __dev* attributes.	2013-01-03 15:57:01 -08:00