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
..
aty
sections: fix section conflicts in drivers/video
2012-10-06 03:04:44 +09:00
backlight
Merge branch 'akpm' (Andrew's patch-bomb)
2012-10-06 03:09:16 +09:00
console
fbcon: Fix bit_putcs() call to kmalloc(s, GFP_KERNEL)
2012-08-23 12:29:32 +00:00
exynos
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-10-01 09:06:36 -07:00
geode
sections: fix section conflicts in drivers/video
2012-10-06 03:04:44 +09:00
i810
sections: fix section conflicts in drivers/video
2012-10-06 03:04:44 +09:00
intelfb
drivers/video/intelfb/intelfbdrv.c: add missing agp_backend_release
2012-05-13 13:05:24 +00:00
kyro
kyrofb: fix on x86_64
2012-04-08 14:27:08 +00:00
logo
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
matrox
i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING
2012-05-30 10:55:34 +02:00
mb862xx
video: mb862xxfb: prevent divide by zero bug
2012-08-23 12:34:00 +00:00
mbx
drivers/video: use correct __devexit_p annotation
2012-06-09 12:51:11 +00:00
msm
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
nvidia
drivers/video/nvidia/nvidia.c: fix warning
2012-01-12 20:13:03 -08:00
omap
ARM: OMAP1: Move board-ams-delta.h from plat to mach
2012-09-20 15:02:19 -07:00
omap2
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
pnx4008
video: pnx4008: convert drivers/video/pnx4008/* to use module_platform_driver()
2011-12-19 20:21:43 +00:00
riva
riva/fbdev: fix several -Wuninitialized
2012-02-13 02:59:14 +00:00
savage
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-07-24 13:34:56 -07:00
sis
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-07-24 13:34:56 -07:00
vermilion
via
video/via: Convert to kstrtou8_from_user
2012-05-08 17:00:12 +00:00
68328fb.c
acornfb.c
acornfb.h
amba-clcd.c
fbdev: amba: Enable module alias autogeneration for AMBA drivers
2011-11-22 10:58:33 +00:00
amifb.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
arcfb.c
video: Fix typo in drivers/video
2012-07-24 12:58:15 +02:00
arkfb.c
asiliantfb.c
atafb.c
atafb.h
atafb_iplan2p2.c
atafb_iplan2p4.c
atafb_iplan2p8.c
atafb_mfb.c
atafb_utils.h
atmel_lcdfb.c
video: Fix typo in drivers/video
2012-07-24 12:58:15 +02:00
au1100fb.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
au1100fb.h
au1200fb.c
fbdev: fix au1*fb builds
2012-04-08 14:27:09 +00:00
au1200fb.h
auo_k190x.c
drivers/video/auo_k190x.c: drop kfree of devm_kzalloc's data
2012-08-23 12:32:09 +00:00
auo_k190x.h
video: auo_k190x: add code shared by controller drivers
2012-04-29 19:35:35 +00:00
auo_k1900fb.c
video: auo_k190x: add driver for AUO-K1900 variant
2012-04-29 19:35:40 +00:00
auo_k1901fb.c
video: auo_k190x: add driver for AUO-K1901 variant
2012-04-29 19:35:42 +00:00
bf54x-lq043fb.c
video: use gpio_request_one
2012-01-28 20:50:11 +00:00
bf537-lq035.c
video: use gpio_request_one
2012-01-28 20:50:11 +00:00
bfin-lq035q1-fb.c
blackfin: fix compile error in bfin-lq035q1-fb.c
2012-04-26 14:46:51 -04:00
bfin-t350mcqb-fb.c
treewide: Fix comment and string typo 'bufer'
2011-12-06 09:53:40 +01:00
bfin_adv7393fb.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-07-24 13:34:56 -07:00
bfin_adv7393fb.h
broadsheetfb.c
drivers/video: use correct __devexit_p annotation
2012-06-09 12:51:11 +00:00
bt431.h
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
bt455.h
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
bw2.c
c2p.h
c2p_core.h
c2p_iplan2.c
c2p_planar.c
carminefb.c
video: Add module.h to drivers/video files who really use it.
2011-10-31 19:31:33 -04:00
carminefb.h
carminefb_regs.h
cfbcopyarea.c
cfbfillrect.c
cfbimgblt.c
cg3.c
cg6.c
cg14.c
chipsfb.c
cirrusfb.c
video: Fix typo in drivers/video
2012-07-24 12:58:15 +02:00
clps711xfb.c
ARM: clps711x: Using a single definition for the PHYS and VIRT registers offset
2012-05-11 16:18:01 +02:00
cobalt_lcdfb.c
cobalt_lcdfb: LCD panel framebuffer support for SEAD-3 platform.
2012-04-29 19:34:05 +00:00
controlfb.c
Drivers: video: controlfb: fixed a brace coding style issue
2011-11-22 01:00:16 +00:00
controlfb.h
cyber2000fb.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
cyber2000fb.h
da8xx-fb.c
video: da8xx-fb: use __iomem pointers for MMIO
2012-09-19 15:37:15 +02:00
dnfb.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
edid.h
efifb.c
efifb: Skip DMI checks if the bootloader knows what it's doing
2012-09-17 13:29:23 +01:00
ep93xx-fb.c
ARM: ep93xx: move platform_data definitions
2012-09-14 11:16:55 +02:00
fb-puv3.c
fb_ddc.c
video: Add module.h to drivers/video files who really use it.
2011-10-31 19:31:33 -04:00
fb_defio.c
fb_defio: Push file_update_time() into fb_deferred_io_mkwrite()
2012-07-31 01:02:44 +04:00
fb_draw.h
fbdev: Make pixel_to_pat() failure mode more friendly
2012-07-29 12:25:06 +00:00
fb_notify.c
video: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/video
2011-10-31 19:31:33 -04:00
fb_sys_fops.c
fbcmap.c
fbcvt.c
fbmem.c
fbdev: add events for early fb event support
2012-05-29 16:22:28 -07:00
fbmon.c
fbsysfs.c
fb: handle NULL pointers in framebuffer release
2012-05-29 13:00:03 +00:00
ffb.c
fm2fb.c
fsl-diu-fb.c
drivers/video: fsl-diu-fb: don't initialize the THRESHOLDS registers
2012-05-13 13:08:56 +00:00
g364fb.c
gbefb.c
grvga.c
grvga: Fix error handling issues
2012-07-08 14:03:17 +00:00
gxt4500.c
sections: fix section conflicts in drivers/video
2012-10-06 03:04:44 +09:00
hecubafb.c
hgafb.c
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
hitfb.c
hpfb.c
i740_reg.h
Resurrect Intel740 driver: i740fb
2012-02-15 04:31:21 +00:00
i740fb.c
video: Fix typo in drivers/video
2012-07-24 12:58:15 +02:00
igafb.c
imsttfb.c
imxfb.c
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
jz4740_fb.c
sections: fix section conflicts in drivers/video
2012-10-06 03:04:44 +09:00
Kconfig
ARM: soc: cleanups, part 2
2012-10-01 18:32:45 -07:00
leo.c
macfb.c
macfb: fix black and white modes
2012-01-22 14:50:02 +01:00
macmodes.c
macmodes.h
Makefile
ARM: clps711x: Remove board support for CEIVA
2012-09-28 21:14:08 +02:00
maxinefb.c
metronomefb.c
modedb.c
mx3fb.c
ARM: imx: move platform_data definitions
2012-09-14 11:17:21 +02:00
mxsfb.c
video: mxsfb: add simple device tree probe
2012-07-03 13:22:37 +08:00
n411.c
neofb.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
nuc900fb.c
ARM: w90x900: move platform_data definitions
2012-09-14 11:18:59 +02:00
nuc900fb.h
ARM: w90x900: move platform_data definitions
2012-09-14 11:18:59 +02:00
offb.c
offb: Fix setting of the pseudo-palette for >8bpp
2012-01-03 12:09:25 +11:00
output.c
p9100.c
platinumfb.c
platinumfb.h
pm2fb.c
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
pm3fb.c
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
pmag-aa-fb.c
pmag-ba-fb.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
pmagb-b-fb.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
ps3fb.c
powerpc/ps3: Replace virt_to_abs() with __pa()
2012-09-05 15:19:31 +10:00
pvr2fb.c
drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible
2012-03-13 23:17:31 +00:00
pxa3xx-gcu.c
video: pxa3xx-gcu: Simplify the logic to exit while loop in pxa3xx_gcu_wait_idle
2012-04-09 16:18:15 +00:00
pxa3xx-gcu.h
pxa168fb.c
drivers/video/pxa168fb.c: use devm_ functions
2012-02-24 00:49:59 +00:00
pxa168fb.h
pxafb.c
ARM: pxa: move platform_data definitions
2012-09-14 11:18:10 +02:00
pxafb.h
q40fb.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
s1d13xxxfb.c
s3c-fb.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-07-24 13:34:56 -07:00
s3c2410fb.c
video: s3c2410: fix checkpatch error and warnings
2011-12-03 22:10:43 +00:00
s3c2410fb.h
s3fb.c
s3fb: Add Virge/MX (86C260)
2012-07-08 14:03:50 +00:00
sa1100fb.c
FB: sa11x0: convert to use platform resource and ioremap()
2012-02-24 09:39:59 +00:00
sa1100fb.h
FB: sa11x0: convert to use platform resource and ioremap()
2012-02-24 09:39:59 +00:00
sbuslib.c
Drivers: video: sbuslib: fixed a brace coding style issue
2011-11-22 01:00:24 +00:00
sbuslib.h
sgivwfb.c
sh7760fb.c
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
sh_mipi_dsi.c
fbdev: sh_mipi_dsi: fix a section mismatch
2012-06-20 10:02:53 +02:00
sh_mobile_hdmi.c
fbdev: sh_mobile_hdmi: add HDMI Control Register support
2012-05-13 13:07:59 +00:00
sh_mobile_lcdcfb.c
fbdev: sh_mobile_lcdc: Fix vertical panning step
2012-07-29 01:17:07 +00:00
sh_mobile_lcdcfb.h
fbdev: sh_mobile_lcdc: Fix pan offset computation in YUV mode
2012-07-19 12:15:26 +02:00
sh_mobile_meram.c
sh_mobile_meram: Add direct MERAM allocation API
2012-07-19 02:05:22 +02:00
skeletonfb.c
skeletonfb: fixed module exit function typo.
2012-04-15 21:44:02 +00:00
sm501fb.c
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00
smscufx.c
fbdev updates for 3.6
2012-08-01 10:45:12 -07:00
sstfb.c
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
sticore.h
stifb.c
sunxvr500.c
video: Fix typo in drivers/video
2012-07-24 12:58:15 +02:00
sunxvr1000.c
sunxvr2500.c
svgalib.c
syscopyarea.c
sysfillrect.c
sysimgblt.c
tcx.c
tdfxfb.c
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
tgafb.c
tmiofb.c
tmiofb: missing NULL pointer checks
2012-09-01 08:51:03 -07:00
tridentfb.c
udlfb.c
fbdev updates for 3.5
2012-06-01 16:57:51 -07:00
uvesafb.c
connector/userns: replace netlink uses of cap_raised() with capable()
2012-05-10 23:21:39 -04:00
valkyriefb.c
valkyriefb.h
vesafb.c
vfb.c
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
vga16fb.c
vgastate.c
vt8500lcdfb.c
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
vt8500lcdfb.h
vt8623fb.c
w100fb.c
video: w100fb: Reduce sleep mode battery discharge
2012-07-08 14:03:02 +00:00
w100fb.h
wm8505fb.c
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
wm8505fb_regs.h
wmt_ge_rops.c
video: vt8500: Add devicetree support for vt8500-fb and wm8505-fb
2012-09-21 19:23:56 +12:00
wmt_ge_rops.h
xen-fbfront.c
drivers/video/xen-fbfront.c: add missing cleanup code
2012-05-07 06:41:56 -04:00
xilinxfb.c
video: convert drivers/video/* to use module_platform_driver()
2011-12-03 22:08:42 +00:00