Jens Axboe b28bc9b38c Merge tag 'v3.13-rc6' into for-3.14/core ...

Needed to bring blk-mq uptodate, since changes have been going in
since for-3.14/core was established.

Fixup merge issues related to the immutable biovec changes.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Conflicts:
	block/blk-flush.c
	fs/btrfs/check-integrity.c
	fs/btrfs/extent_io.c
	fs/btrfs/scrub.c
	fs/logfs/dev_bdev.c

2013-12-31 09:51:02 -07:00

..

ge

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2012-03-21 18:55:10 -07:00

qe_lib

powerpc/qe: Fix Kconfig enablement of QE_USB support

2013-03-15 11:14:15 -05:00

xics

powerpc/powernv: Fix endian issues in OPAL ICS backend

2013-10-11 16:48:46 +11:00

6xx-suspend.S

powerpc: Use CURRENT_THREAD_INFO instead of open coded assembly

2012-07-11 14:18:22 +10:00

axonram.c

block: Convert bio_for_each_segment() to bvec_iter

2013-11-23 22:33:49 -08:00

cpm1.c

powerpc: Mark low level irq handlers NO_THREAD

2013-06-20 16:55:08 +10:00

cpm2_pic.c

powerpc/irqdomain: Fix broken NR_IRQ references

2012-04-30 10:45:26 +10:00

cpm2_pic.h

powerpc/cpm2: Checkpatch cleanup

2010-03-04 10:43:58 -06:00

cpm2.c

powerpc/fsl-cpm: Configure clock correctly for SCC

2010-04-19 23:13:03 -05:00

cpm_common.c

powerpc: add explicit OF includes

2013-10-09 20:04:11 -05:00

dart_iommu.c

powerpc/iommu: Fix multiple issues with IOMMU pools code

2012-10-04 18:03:20 +10:00

dart.h

[POWERPC] Use 4kB iommu pages even on 64kB-page systems

2006-11-01 14:52:48 +11:00

dcr-low.S

powerpc/4xx: Extended DCR support v2

2008-12-21 14:21:15 +11:00

dcr.c

powerpc: add export.h to files making use of EXPORT_SYMBOL

2011-10-31 19:30:37 -04:00

ehv_pic.c

powerpc: add missing explicit OF includes for ppc

2013-11-11 09:10:50 -06:00

fsl_85xx_cache_ctlr.h

powerpc/85xx: Fix sram_offset parameter type

2012-07-26 13:24:32 -05:00

fsl_85xx_cache_sram.c

powerpc/85xx: Fix compiler error with THIS_MODULE and related

2012-03-16 14:50:25 -05:00

fsl_85xx_l2ctlr.c

powerpc/85xx: l2sram - Add compatible string for BSC9131 platform

2013-02-19 11:01:54 -06:00

fsl_gtm.c

Merge remote-tracking branch 'grant/devicetree/next' into for-next

2013-11-07 10:34:46 -06:00

fsl_ifc.c

powerpc/fsl: ifc: sparse fixes

2013-02-12 11:05:21 -06:00

fsl_lbc.c

powerpc/fsl: lbc: sparse fixes

2013-02-12 11:05:18 -06:00

fsl_mpic_err.c

powerpc/mpic: FSL MPIC error interrupt support.

2012-09-12 14:57:10 -05:00

fsl_mpic_timer_wakeup.c

powerpc/fsl: add MPIC timer wakeup support

2013-07-01 18:38:42 -05:00

fsl_msi.c

powerpc/fsl_msi: add MSIIR1 support for MPIC v4.3

2013-08-07 18:38:05 -05:00

fsl_msi.h

powerpc/fsl_msi: add MSIIR1 support for MPIC v4.3

2013-08-07 18:38:05 -05:00

fsl_pci.c

Merge tag 'pci-v3.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2013-11-14 14:02:00 +09:00

fsl_pci.h

Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2013-09-12 11:29:26 -07:00

fsl_pmc.c

powerpc: add explicit OF includes

2013-10-09 20:04:11 -05:00

fsl_rio.c

powerpc: add explicit OF includes

2013-10-09 20:04:11 -05:00

fsl_rio.h

fsl-rio: Add two ports and rapidio message units support

2011-11-24 02:01:34 -06:00

fsl_rmu.c

powerpc: add explicit OF includes

2013-10-09 20:04:11 -05:00

fsl_soc.c

powerpc/fsl: fsl_soc: sparse fixes

2013-02-12 11:05:20 -06:00

fsl_soc.h

powerpc/mpc512x: remove unnecessary #if

2013-10-30 22:56:10 +01:00

grackle.c

powerpc: rename ppc_pci_*_flags to pci_*_flags

2011-07-12 09:28:04 -05:00

i8259.c

irq_domain: Add support for base irq and hwirq in legacy mappings

2012-02-16 06:11:23 -07:00

indirect_pci.c

powerpc/fsl-pci Make PCIe hotplug work with Freescale PCIe controllers

2013-04-10 10:15:28 -05:00

ipic.c

irq_domain/powerpc: Replace custom xlate functions with library functions

2012-02-16 06:11:24 -07:00

ipic.h

irq_domain/powerpc: Use common irq_domain structure instead of irq_host

2012-02-14 14:06:50 -07:00

Kconfig

powerpc/scom: CONFIG_SCOM_DEBUGFS should depend on CONFIG_DEBUG_FS

2013-10-11 16:53:49 +11:00

Makefile

powerpc/fsl: add MPIC timer wakeup support

2013-07-01 18:38:42 -05:00

micropatch.c

powerpc/cpm1: Mark micropatch code/data static and __init

2010-07-11 11:04:06 -05:00

mmio_nvram.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

mpc5xxx_clocks.c

powerpc/mpc5xxx: fix sparse warning for non static symbol

2013-02-05 07:40:43 +00:00

mpc8xx_pic.c

powerpc/8xx: Fix NR_IRQ bugs and refactor 8xx interrupt controller

2012-04-30 10:45:25 +10:00

mpc8xx_pic.h

[POWERPC] 8xx: mpc885ads pcmcia support

2007-07-10 00:33:51 -05:00

mpic_msgr.c

of/irq: Use irq_of_parse_and_map()

2013-10-24 11:50:35 +01:00

mpic_msi.c

of/irq: Replace of_irq with of_phandle_args

2013-10-24 11:42:51 +01:00

mpic_pasemi_msi.c

powerpc: Convert to new irq_* function names

2011-03-29 14:48:12 +02:00

mpic_timer.c

powerpc: add explicit OF includes

2013-10-09 20:04:11 -05:00

mpic_u3msi.c

powerpc: Convert to new irq_* function names

2011-03-29 14:48:12 +02:00

mpic.c

Merge tag 'devicetree-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

2013-11-12 16:52:17 +09:00

mpic.h

powerpc/mpic: FSL MPIC error interrupt support.

2012-09-12 14:57:10 -05:00

msi_bitmap.c

Disintegrate asm/system.h for PowerPC

2012-03-28 18:30:02 +01:00

mv64x60_dev.c

powerpc/mv643xx_eth: fix return check in mv64x60_eth_register_shared_pdev()

2013-10-28 21:11:23 -05:00

mv64x60_pci.c

POWERPC: drivers: remove __dev* attributes.

2013-01-03 15:57:04 -08:00

mv64x60_pic.c

irq_domain: Replace irq_alloc_host() with revmap-specific initializers

2012-02-16 06:11:22 -07:00

mv64x60_udbg.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

mv64x60.h

[POWERPC] Add Marvell mv64x60 udbg putc/getc functions

2007-09-22 14:49:21 +10:00

of_rtc.c

powerpc: add explicit OF includes

2013-10-09 20:04:11 -05:00

pmi.c

powerpc/sysdev: Use module_platform_driver macro

2012-11-15 13:00:05 +11:00

ppc4xx_cpm.c

cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem

2011-12-21 14:29:42 -08:00

ppc4xx_gpio.c

of/gpio: add default of_xlate function if device has a node pointer

2010-07-05 16:14:30 -06:00

ppc4xx_msi.c

POWERPC: drivers: remove __dev* attributes.

2013-01-03 15:57:04 -08:00

ppc4xx_ocm.c

powerpc/44x: Fix ocm_block allocation

2013-12-10 11:25:04 +11:00

ppc4xx_pci.c

powerpc/pci: Support per-aperture memory offset

2013-05-06 13:40:40 +10:00

ppc4xx_pci.h

powerpc/476fpe: Add 476fpe SoC code

2011-12-09 07:51:02 -05:00

ppc4xx_soc.c

powerpc: add explicit OF includes

2013-10-09 20:04:11 -05:00

rtc_cmos_setup.c

PTR_RET is now PTR_ERR_OR_ZERO(): Replace most.

2013-07-15 11:25:01 +09:30

scom.c

powerpc/scom: Improve debugfs interface

2013-11-06 14:13:50 +11:00

simple_gpio.c

powerpc: remove non-required uses of include <linux/module.h>

2011-10-31 19:30:44 -04:00

simple_gpio.h

powerpc: Implement GPIO driver for simple memory-mapped banks

2008-12-30 11:13:45 -06:00

tsi108_dev.c

Disintegrate asm/system.h for PowerPC

2012-03-28 18:30:02 +01:00

tsi108_pci.c

irq_domain: Add support for base irq and hwirq in legacy mappings

2012-02-16 06:11:23 -07:00

udbg_memcons.c

powerpc: Add an in memory udbg console

2013-05-08 06:36:49 +10:00

uic.c

irq_domain/powerpc: Replace custom xlate functions with library functions

2012-02-16 06:11:24 -07:00

xilinx_intc.c

powerpc: add missing explicit OF includes for ppc

2013-11-11 09:10:50 -06:00

xilinx_pci.c

powerpc/virtex: Add support for Xilinx PCI host bridge

2009-06-06 10:14:22 -06:00