Linus Torvalds
5f3d2f2e1a
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
...
Pull powerpc updates from Benjamin Herrenschmidt:
"Some highlights in addition to the usual batch of fixes:
- 64TB address space support for 64-bit processes by Aneesh Kumar
- Gavin Shan did a major cleanup & re-organization of our EEH support
code (IBM fancy PCI error handling & recovery infrastructure) which
paves the way for supporting different platform backends, along
with some rework of the PCIe code for the PowerNV platform in order
to remove home made resource allocations and instead use the
generic code (which is possible after some small improvements to it
done by Gavin).
- Uprobes support by Ananth N Mavinakayanahalli
- A pile of embedded updates from Freescale folks, including new SoC
and board supports, more KVM stuff including preparing for 64-bit
BookE KVM support, ePAPR 1.1 updates, etc..."
Fixup trivial conflicts in drivers/scsi/ipr.c
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (146 commits)
powerpc/iommu: Fix multiple issues with IOMMU pools code
powerpc: Fix VMX fix for memcpy case
driver/mtd:IFC NAND:Initialise internal SRAM before any write
powerpc/fsl-pci: use 'Header Type' to identify PCIE mode
powerpc/eeh: Don't release eeh_mutex in eeh_phb_pe_get
powerpc: Remove tlb batching hack for nighthawk
powerpc: Set paca->data_offset = 0 for boot cpu
powerpc/perf: Sample only if SIAR-Valid bit is set in P7+
powerpc/fsl-pci: fix warning when CONFIG_SWIOTLB is disabled
powerpc/mpc85xx: Update interrupt handling for IFC controller
powerpc/85xx: Enable USB support in p1023rds_defconfig
powerpc/smp: Do not disable IPI interrupts during suspend
powerpc/eeh: Fix crash on converting OF node to edev
powerpc/eeh: Lock module while handling EEH event
powerpc/kprobe: Don't emulate store when kprobe stwu r1
powerpc/kprobe: Complete kprobe and migrate exception frame
powerpc/kprobe: Introduce a new thread flag
powerpc: Remove unused __get_user64() and __put_user64()
powerpc/eeh: Global mutex to protect PE tree
powerpc/eeh: Remove EEH PE for normal PCI hotplug
...
2012-10-06 03:16:12 +09:00
..
aacraid
sections: fix section conflicts in drivers/scsi
2012-10-06 03:04:44 +09:00
aic7xxx
scsi: fix various printk and comment typos
2012-09-01 08:24:35 -07:00
aic7xxx_old
aic94xx
sections: fix section conflicts in drivers/scsi
2012-10-06 03:04:44 +09:00
arcmsr
workqueue: deprecate flush[_delayed]_work_sync()
2012-08-20 14:51:24 -07:00
arm
scsi: eesox: use __iomem pointers for MMIO
2012-09-19 15:37:14 +02:00
be2iscsi
[SCSI] be2iscsi: Bump the driver version.
2012-09-14 17:59:28 +01:00
bfa
SCSI for-linus on 20121002
2012-10-02 19:01:32 -07:00
bnx2fc
SCSI for-linus on 20121002
2012-10-02 19:01:32 -07:00
bnx2i
[SCSI] bnx2i: Fixed NULL ptr deference for 1G bnx2 Linux iSCSI offload
2012-09-17 13:40:32 +01:00
cxgbi
SCSI misc on 20120724
2012-07-24 18:11:22 -07:00
device_handler
[SCSI] scsi_dh_alua: Enable STPG for unavailable ports
2012-09-24 12:21:56 +04:00
dpt
fcoe
[SCSI] fcoe: Cleanup locking on fcoe_percpu_receive_thread
2012-07-20 08:58:55 +01:00
fnic
ibmvscsi
[SCSI] ibmvscsi: Fix host config length field overflow
2012-09-24 12:11:09 +04:00
isci
SCSI for-linus on 20121002
2012-10-02 19:01:32 -07:00
libfc
[SCSI] libfc: fix sending REC after FCP_RESP is received
2012-07-20 08:58:56 +01:00
libsas
[SCSI] libsas, ipr: cleanup ata_host flags initialization via ata_host_init
2012-08-24 13:10:24 +04:00
lpfc
SCSI for-linus on 20121002
2012-10-02 19:01:32 -07:00
megaraid
Merge SCSI misc branch into isci-for-3.6 tag
2012-10-02 08:55:12 +01:00
mpt2sas
SCSI for-linus on 20121002
2012-10-02 19:01:32 -07:00
mvsas
[SCSI] mvsas: Fix oops when ata commond timeout.
2012-09-14 14:48:32 +01:00
osd
[SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576
2012-02-25 08:25:09 -06:00
pcmcia
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
pm8001
[SCSI] libsas: trim sas_task of slow path infrastructure
2012-07-20 08:58:54 +01:00
qla2xxx
SCSI for-linus on 20121002
2012-10-02 19:01:32 -07:00
qla4xxx
SCSI for-linus on 20121002
2012-10-02 19:01:32 -07:00
sym53c8xx_2
scsi: make pci error handlers const
2012-09-07 16:35:00 -06:00
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.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
53c700.h
53c700.scr
53c700_d.h_shipped
a100u2w.c
a100u2w.h
a2091.c
scsi: Fix up files implicitly depending on module.h inclusion
2011-10-31 19:31:24 -04:00
a2091.h
a3000.c
scsi: Fix up files implicitly depending on module.h inclusion
2011-10-31 19:31:24 -04:00
a3000.h
a4000t.c
advansys.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
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
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
aha1740.h
aic7xxx_old.c
atari_NCR5380.c
atari_scsi.c
scsi/atari: Make more functions static
2012-04-22 20:16:49 +02:00
atari_scsi.h
scsi/atari: Make more functions static
2012-04-22 20:16:49 +02:00
atp870u.c
drivers/scsi/atp870u.c: fix bad use of udelay
2012-10-06 03:04:37 +09:00
atp870u.h
BusLogic.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
BusLogic.h
bvme6000_scsi.c
ch.c
constants.c
[SCSI] add DID_TARGET_FAILURE and DID_NEXUS_FAILURE to hostbyte_table in constants.c
2012-09-14 11:58:53 +01:00
dc395x.c
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
dc395x.h
dmx3191d.c
dpt_i2o.c
dpti.h
dtc.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
dtc.h
eata.c
eata_generic.h
eata_pio.c
eata_pio.h
esp_scsi.c
scsi: Use vsprintf extention %pf with builtin_return_address
2012-04-05 17:09:40 -07:00
esp_scsi.h
fdomain.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
fdomain.h
FlashPoint.c
g_NCR5380.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
g_NCR5380.h
g_NCR5380_mmio.c
gdth.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
gdth.h
gdt: remove unnecessary #defines
2012-09-01 08:43:34 -07:00
gdth_ioctl.h
gdth_proc.c
gdth_proc.h
gvp11.c
scsi: Fix up files implicitly depending on module.h inclusion
2011-10-31 19:31:24 -04:00
gvp11.h
hosts.c
[SCSI] Fix device removal NULL pointer dereference
2012-07-20 08:58:40 +01:00
hpsa.c
SCSI for-linus on 20121002
2012-10-02 19:01:32 -07:00
hpsa.h
[SCSI] hpsa: dial down lockup detection during firmware flash
2012-05-10 09:19:39 +01:00
hpsa_cmd.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
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
in2000.h
initio.c
initio.h
ipr.c
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
ipr.h
[SCSI] ipr: Driver version 2.5.4
2012-08-24 13:10:28 +04:00
ips.c
scsi: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:19 +08:00
ips.h
iscsi_boot_sysfs.c
switch ->is_visible() to returning umode_t
2012-01-03 22:54:55 -05:00
iscsi_tcp.c
[SCSI] iscsi_tcp: increase max_lun to ~0, don't care
2012-09-24 12:10:55 +04:00
iscsi_tcp.h
jazz_esp.c
misc latin1 to utf8 conversions
2012-01-02 13:04:55 +01:00
Kconfig
[SCSI] aha152x: Allow use on 64bit systems
2012-07-20 08:59:04 +01:00
lasi700.c
libiscsi.c
[SCSI] libiscsi: fix cmd timeout/completion race
2012-02-19 08:09:00 -06:00
libiscsi_tcp.c
SCSI updates on 20120319
2012-03-22 12:55:29 -07:00
libsrp.c
scsi: Fix up files implicitly depending on module.h inclusion
2011-10-31 19:31:24 -04:00
mac53c94.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
mac53c94.h
mac_esp.c
mac_esp: rename irq
2012-01-22 14:50:03 +01:00
mac_scsi.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
mac_scsi.h
Makefile
[SCSI] Remove scsi_wait_scan module
2012-07-20 08:58:13 +01:00
megaraid.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-10-01 09:06:36 -07:00
megaraid.h
megaraid: remove unnecessary #defines
2012-09-01 08:42:43 -07:00
mesh.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
mesh.h
mvme16x_scsi.c
mvme147.c
mvme147.h
mvumi.c
scsi: fix various printk and comment typos
2012-09-01 08:24:35 -07:00
mvumi.h
ncr53c8xx.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
ncr53c8xx.h
NCR53c406a.c
NCR5380.c
NCR5380.h
NCR_D700.c
NCR_D700.h
NCR_Q720.c
NCR_Q720.h
nsp32.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
nsp32.h
nsp32_debug.c
nsp32_io.h
osst.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
osst.h
osst_detect.h
osst_options.h
pas16.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
pas16.h
pmcraid.c
workqueue: deprecate flush[_delayed]_work_sync()
2012-08-20 14:51:24 -07:00
pmcraid.h
scsi: Fix typo in pmcraid.h
2012-02-21 11:40:37 +01:00
ppa.c
ppa.h
ps3rom.c
scsi: Fix up files implicitly depending on module.h inclusion
2011-10-31 19:31:24 -04:00
qla1280.c
qla1280: Remove redundant NULL check before release_firmware() call
2012-04-30 13:25:43 +02:00
qla1280.h
qlogicfas.c
qlogicfas408.c
qlogicfas408.h
qlogicpti.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
qlogicpti.h
raid_class.c
script_asm.pl
scsi.c
[SCSI] async: make async_synchronize_full() flush all work regardless of domain
2012-07-20 09:07:37 +01:00
scsi.h
scsi_debug.c
[SCSI] scsi_debug: Add "removable" parameter
2012-09-24 12:11:05 +04:00
scsi_devinfo.c
[SCSI] Disable DIF on Hitachi Ultrastar 15K300
2012-09-24 12:11:00 +04:00
scsi_error.c
[SCSI] Fix 'Device not ready' issue on mpt2sas
2012-08-22 09:42:54 +04:00
scsi_ioctl.c
scsi_lib.c
Merge SCSI misc branch into isci-for-3.6 tag
2012-10-02 08:55:12 +01:00
scsi_lib_dma.c
scsi: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required
2011-10-31 19:31:23 -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
Merge SCSI misc branch into isci-for-3.6 tag
2012-10-02 08:55:12 +01:00
scsi_sysctl.c
scsi_sysfs.c
[SCSI] scsi_remove_target: fix softlockup regression on hot remove
2012-09-24 12:17:49 +04:00
scsi_tgt_if.c
scsi: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required
2011-10-31 19:31:23 -04:00
scsi_tgt_lib.c
scsi_tgt_priv.h
scsi_trace.c
scsi_transport_api.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_fc_internal.h
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] scsi_transport_sas: 'enable' phys on reset
2012-02-29 15:43:54 -06:00
scsi_transport_spi.c
[SCSI] scsi_transport_spi: fix for unbalanced reference counting
2012-05-10 09:06:12 +01:00
scsi_transport_srp.c
scsi_transport_srp_internal.h
scsi_typedefs.h
scsicam.c
fs: move code out of buffer.c
2012-01-03 22:54:07 -05:00
sd.c
[SCSI] sd: Ensure we correctly disable devices with unknown protection type
2012-09-24 13:01:24 +04:00
sd.h
[SCSI] sd: Avoid remapping bad reference tags
2012-09-24 12:10:59 +04:00
sd_dif.c
[SCSI] sd: Avoid remapping bad reference tags
2012-09-24 12:10:59 +04:00
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
misc latin1 to utf8 conversions
2012-01-02 13:04:55 +01:00
sr.c
sr.h
sr_ioctl.c
scsi: Fix up files implicitly depending on module.h inclusion
2011-10-31 19:31:24 -04:00
sr_vendor.c
st.c
[SCSI] st: remove st_mutex
2012-09-24 13:07:02 +04:00
st.h
[SCSI] st: raise device limit
2012-09-14 17:59:29 +01:00
st_options.h
stex.c
storvsc_drv.c
[SCSI] storvsc: Properly handle errors from the host
2012-04-25 09:51:43 +01:00
sun3_NCR5380.c
sun3_scsi.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
sun3_scsi.h
sun3_scsi_vme.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
sun3x_esp.c
sun_esp.c
sym53c416.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
sym53c416.h
t128.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
t128.h
tmscsim.c
tmscsim.h
u14-34f.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
ultrastor.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
ultrastor.h
virtio_scsi.c
[SCSI] scsi: virtio-scsi: Fix address translation failure of HighMem pages used by sg list
2012-09-14 15:47:01 +01:00
vmw_pvscsi.c
scsi: fix various printk and comment typos
2012-09-01 08:24:35 -07:00
vmw_pvscsi.h
[SCSI] vmw_pvscsi: Try setting host->max_id as suggested by the device.
2012-03-27 08:26:36 +01:00
wd33c93.c
wd33c93.h
wd7000.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
zalon.c
zorro7xx.c