Linus Torvalds
7a8e9c8088
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
...
Pull s390 patches from Martin Schwidefsky:
"A couple of bug fixes, a debug change for qdio, an update for the
default config, and one small extension.
The watchdog module based on diagnose 0x288 is converted to the
watchdog API and it now works under LPAR as well"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/ccwgroup: use ccwgroup_ungroup wrapper
s390/ccwgroup: fix an uninitialized return code
s390/ccwgroup: obtain extra reference for asynchronous processing
qdio: Keep device-specific dbf entries
s390/compat: correct ucontext layout for high gprs
s390/cio: set device name as early as possible
s390: update default configuration
s390: avoid format strings leaking into names
s390/airq: silence lockdep warning
s390/watchdog: add support for LPAR operation (diag288)
s390/watchdog: use watchdog API
s390/sclp_vt220: Enable ASCII console per default
s390/qdio: replace shift loop by ilog2
s390/cio: silence lockdep warning
s390/uaccess: always load the kernel ASCE after task switch
s390/ap_bus: Make modules parameters visible in sysfs
2014-06-21 06:47:01 -10:00
..
acquirewdt.c
watchdog: acquirewdt: Use platform_driver_probe
2014-03-31 13:34:30 +02:00
advantechwdt.c
watchdog: advantechwdt: Use platform_driver_probe
2014-03-31 13:34:44 +02:00
alim1535_wdt.c
watchdog: remove DEFINE_PCI_DEVICE_TABLE macro
2014-01-28 19:07:07 +01:00
alim7101_wdt.c
watchdog: remove DEFINE_PCI_DEVICE_TABLE macro
2014-01-28 19:07:07 +01:00
ar7_wdt.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
at32ap700x_wdt.c
watchdog: Remove unnecessary OOM messages
2014-03-31 13:23:19 +02:00
at91rm9200_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
at91sam9_wdt.c
watchdog: at91sam9_wdt: increase security margin on watchdog counter reset
2014-01-28 21:34:55 +01:00
at91sam9_wdt.h
ath79_wdt.c
watchdog: ath79_wdt: switch to clk_prepare/clk_disable
2014-06-10 21:41:36 +02:00
bcm47xx_wdt.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
bcm63xx_wdt.c
watchdog: bcm63xx_wdt: Remove unused field from bcm63xx_wdt_device
2014-03-31 13:26:04 +02:00
bcm2835_wdt.c
watchdog: Remove unnecessary OOM messages
2014-03-31 13:23:19 +02:00
bcm_kona_wdt.c
watchdog: bcm281xx: Debugfs support
2014-01-28 21:17:53 +01:00
bfin_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
booke_wdt.c
booke/watchdog: refine and clean up the codes
2014-06-10 21:47:26 +02:00
coh901327_wdt.c
cpu5wdt.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
cpwd.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
da9052_wdt.c
watchdog: Remove unnecessary OOM messages
2014-03-31 13:23:19 +02:00
da9055_wdt.c
watchdog: Remove unnecessary OOM messages
2014-03-31 13:23:19 +02:00
davinci_wdt.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
diag288_wdt.c
s390/watchdog: add support for LPAR operation (diag288)
2014-06-10 10:48:29 +02:00
dw_wdt.c
watchdog: dw_wdt: remove build dependencies
2014-01-28 21:25:46 +01:00
ep93xx_wdt.c
watchdog: fix checkpatch warnings and error
2014-03-31 13:31:06 +02:00
eurotechwdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
f71808e_wdt.c
gef_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
geodewdt.c
watchdog: geodewdt: Use platform_driver_probe
2014-03-31 13:35:05 +02:00
gpio_wdt.c
watchdog: GPIO-controlled watchdog
2014-01-28 21:21:02 +01:00
hpwdt.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
i6300esb.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
ib700wdt.c
watchdog: ib700wdt: Use platform_driver_probe
2014-03-31 13:35:26 +02:00
ibmasr.c
watchdog: fix checkpatch warnings and error
2014-03-31 13:31:06 +02:00
ie6xx_wdt.c
watchdog: Drop unnecessary include of miscdevice.h
2013-12-10 08:48:09 +01:00
imx2_wdt.c
watchdog: imx2_wdt: convert to watchdog core api
2014-06-10 21:42:59 +02:00
indydog.c
watchdog: indydog: Simplify indydog_{start,stop}
2014-03-31 13:26:31 +02:00
intel-mid_wdt.c
watchdog: add Intel MID watchdog driver support
2014-06-10 21:48:16 +02:00
intel_scu_watchdog.c
watchdog: intel_scu_watchdog: Remove unused variable
2014-03-31 13:26:56 +02:00
intel_scu_watchdog.h
iop_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
it87_wdt.c
watchdog: it87_wdt: Work around non-working CIR interrupts
2014-03-31 13:33:55 +02:00
it8712f_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
iTCO_vendor.h
iTCO_vendor_support.c
iTCO_wdt.c
== Changes to existing drivers ==
2014-04-07 10:24:18 -07:00
ixp4xx_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
jz4740_wdt.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
Kconfig
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2014-06-21 06:47:01 -10:00
kempld_wdt.c
watchdog: kempld-wdt: Use the correct value when configuring the prescaler with the watchdog
2014-06-10 21:39:48 +02:00
ks8695_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
lantiq_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
m54xx_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
machzwd.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
Makefile
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2014-06-21 06:47:01 -10:00
max63xx_wdt.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
mena21_wdt.c
mixcomwd.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
moxart_wdt.c
watchdog: mach-moxart: add restart handler
2014-01-28 21:27:32 +01:00
mpc8xxx_wdt.c
watchdog: mpc8xxx_wdt: MPC8xx is HW enabled
2014-03-31 13:21:33 +02:00
mtx-1_wdt.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
mv64x60_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
nuc900_wdt.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
nv_tco.c
watchdog: remove DEFINE_PCI_DEVICE_TABLE macro
2014-01-28 19:07:07 +01:00
nv_tco.h
octeon-wdt-main.c
octeon, watchdog: Fix CPU hotplug callback registration
2014-03-20 13:43:46 +01:00
octeon-wdt-nmi.S
of_xilinx_wdt.c
watchdog: xilinx: Make of_device_id array const
2014-06-10 21:43:21 +02:00
omap_wdt.c
watchdog: omap_wdt: Use devm_ioremap_resource()
2014-03-31 13:24:31 +02:00
omap_wdt.h
orion_wdt.c
watchdog: orion: Add Armada 375/380 SoC support
2014-06-10 21:44:41 +02:00
pc87413_wdt.c
watchdog: fix checkpatch warnings and error
2014-03-31 13:31:06 +02:00
pcwd.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
pcwd_pci.c
watchdog: remove DEFINE_PCI_DEVICE_TABLE macro
2014-01-28 19:07:07 +01:00
pcwd_usb.c
watchdog: Remove unnecessary OOM messages
2014-03-31 13:23:19 +02:00
pika_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
pnx833x_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
pnx4008_wdt.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
rc32434_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
rdc321x_wdt.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
retu_wdt.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
riowd.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
rt2880_wdt.c
watchdog: Drop unnecessary include of miscdevice.h
2013-12-10 08:48:09 +01:00
s3c2410_wdt.c
watchdog: s3c2410_wdt: Check return value of clk_prepare_enable
2014-03-31 13:33:16 +02:00
sa1100_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
sb_wdog.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
sbc60xxwdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
sbc7240_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
sbc8360.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
sbc_epx_c3.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
sbc_fitpc2_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
sc520_wdt.c
watchdog: sc520_wdt: Remove unused variable
2014-03-31 13:27:34 +02:00
sc1200wdt.c
sc1200_wdt: Fix oops
2013-12-10 08:48:15 +01:00
sch311x_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
scx200_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
shwdt.c
watchdog: shwdt: Remove unused platform_set_drvdata()
2014-06-10 21:40:16 +02:00
sirfsoc_wdt.c
watchdog: sirf: Remove redundant of_match_ptr helper
2014-01-28 21:26:31 +01:00
smsc37b787_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
softdog.c
watchdog: fix checkpatch warnings and error
2014-03-31 13:31:06 +02:00
sp805_wdt.c
watchdog: sp805: Set watchdog_device->timeout from ->set_timeout()
2014-06-10 21:47:47 +02:00
sp5100_tco.c
watchdog: remove DEFINE_PCI_DEVICE_TABLE macro
2014-01-28 19:07:07 +01:00
sp5100_tco.h
stmp3xxx_rtc_wdt.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
sunxi_wdt.c
watchdog: sunxi: Fix compilation with C=2
2014-06-10 21:39:26 +02:00
tegra_wdt.c
watchdog: Add tegra watchdog
2014-03-31 13:30:29 +02:00
ts72xx_wdt.c
watchdog: ts72xx_wdt: make 'ts72xx_wdt_pdev' static
2014-03-31 13:23:46 +02:00
twl4030_wdt.c
txx9wdt.c
watchdog: Drop unnecessary include of miscdevice.h
2013-12-10 08:48:09 +01:00
ux500_wdt.c
watchdog: Drop unnecessary include of miscdevice.h
2013-12-10 08:48:09 +01:00
via_wdt.c
watchdog: via_wdt: replace del_timer by del_timer_sync
2014-06-10 21:38:25 +02:00
w83627hf_wdt.c
watchdog: w83627hf_wdt: Add early_disable module parameter
2014-06-10 21:46:07 +02:00
w83877f_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
w83977f_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
wafer5823wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
watchdog_core.c
watchdog: core: Make dt "timeout-sec" property work on drivers w/out min/max
2014-01-28 19:07:56 +01:00
watchdog_core.h
watchdog_dev.c
wd501p.h
wdrtas.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
wdt285.c
watchdog: wdt285: Fix variable type
2014-03-31 13:28:20 +02:00
wdt977.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00
wdt_pci.c
watchdog: delete non-required instances of include <linux/init.h>
2014-03-31 13:22:45 +02:00
wm831x_wdt.c
watchdog: Remove unnecessary OOM messages
2014-03-31 13:23:19 +02:00
wm8350_wdt.c
xen_wdt.c
watchdog: Get rid of MODULE_ALIAS_MISCDEV statements
2013-11-17 19:38:13 +01:00