Home » Mailing list archives » linux-kernel » 2008 » May » 20

Re: [PATCH 18/57] iTCO: unlocked_ioctl, coding style and cleanup

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Andrew Morton <akpm@...>
To: Alan Cox <alan@...>
Cc: <linux-kernel@...>, <wim@...>, Rusty Russell <rusty@...>
Subject: Re: [PATCH 18/57] iTCO: unlocked_ioctl, coding style and cleanup
Date: Tuesday, May 20, 2008 - 4:26 am

On Mon, 19 May 2008 14:06:25 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:


This runs afoul of git-watchdog and/or itco_wdt-ich9do-support.patch

Hunk #1 succeeded at 66 (offset 1 line).
Hunk #3 FAILED at 139.
Hunk #4 FAILED at 158.
Hunk #5 FAILED at 201.
Hunk #6 FAILED at 222.
Hunk #7 FAILED at 246.
Hunk #8 succeeded at 374 (offset 12 lines).
Hunk #9 FAILED at 429.
Hunk #10 FAILED at 458.
Hunk #11 FAILED at 472.
Hunk #12 FAILED at 480.
Hunk #13 FAILED at 489.
Hunk #14 FAILED at 518.
Hunk #15 FAILED at 534.
Hunk #16 FAILED at 588.
Hunk #17 succeeded at 454 (offset -140 lines).
Hunk #18 FAILED at 475.
Hunk #19 succeeded at 669 (offset 27 lines).
Hunk #20 succeeded at 512 (offset -140 lines).
Hunk #21 FAILED at 534.
Hunk #22 succeeded at 814 (offset 29 lines).
15 out of 22 hunks FAILED -- saving rejects to file drivers/watchdog/iTCO_wdt.c.rej

so I ducked this one.

booke-watchdog-clean-up-and-unlocked_ioctl gets 8-out-of-ten against
watchdog-fix-booke_wdtc-on-mpc85xx-smp-system.patch so I ducked that one too.

w83697hf_wdt-cleanup-coding-style-and-switch-to-unlocked_ioctl gets
4-of-17 against git-watchdog - also ducked.


The rest applied, although about half of them needed fixes because
Rusty has been running around fiddling with other peoples stuff
renaming down_trylock to down_nowait all over the tree.

This means that the watchdog patches now have a Rusty dependency so I
NEED TO KNOW if those patches aren't for 2.6.27 or if they get nacked
or something.

It also means that the patches which I queued cannot go into Wim's tree
as-is.  If Wim queues the originals then it means that Stephen and/or
myself get to fix all the rejects again, and there'll be a
decent-sized smashup during the merge window.  There are lessons
here...

And if Wim decides to merge these patches prior to merging

itco_wdt-ich9do-support.patch
watchdog-fix-booke_wdtc-on-mpc85xx-smp-system.patch

then those two patches will get wrecked.
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/57] watchdog: Giant scrub, Alan Cox, (Mon May 19, 9:04 am)
Re: [PATCH 00/57] watchdog: Giant scrub, Andrew Morton, (Mon May 19, 2:21 pm)
Re: [PATCH 00/57] watchdog: Giant scrub, Wim Van Sebroeck, (Tue May 20, 4:01 am)
Re: [PATCH 00/57] watchdog: Giant scrub, Andrew Morton, (Tue May 20, 4:37 am)
Re: [PATCH 00/57] watchdog: Giant scrub, Wim Van Sebroeck, (Tue May 20, 11:34 am)
Re: [PATCH 00/57] watchdog: Giant scrub, Alan Cox, (Mon May 19, 3:51 pm)
[PATCH 56/57] wdt977: clean up, coding style and switch to u..., Alan Cox, (Mon May 19, 9:09 am)
[PATCH 53/57] wafer5823wdt: Clean up, coding style, switch t..., Alan Cox, (Mon May 19, 9:09 am)
[PATCH 57/57] wdt501/pci: Clean up, coding style and switch ..., Alan Cox, (Mon May 19, 9:10 am)
[PATCH 55/57] wdt285: switch to unlocked_ioctl and tidy up o..., Alan Cox, (Mon May 19, 9:09 am)
[PATCH 54/57] wdrtas: clean up, coding style, switch to unlo..., Alan Cox, (Mon May 19, 9:09 am)
[PATCH 49/57] w83627hf: coding style, clean up and switch to..., Alan Cox, (Mon May 19, 9:09 am)
[PATCH 52/57] w83977f_wdt: clean up, coding style and switch..., Alan Cox, (Mon May 19, 9:09 am)
[PATCH 51/57] w83877f_wdt: clean up code, coding style, swit..., Alan Cox, (Mon May 19, 9:09 am)
[PATCH 50/57] w83697hf_wdt: cleanup, coding style and switch..., Alan Cox, (Mon May 19, 9:09 am)
[PATCH 48/57] txx9: Fix locking, switch to unlocked_ioctl, Alan Cox, (Mon May 19, 9:09 am)
[PATCH 42/57] sc1200_wdt: clean up, fix locking and use unlo..., Alan Cox, (Mon May 19, 9:08 am)
[PATCH 47/57] softdog: clean up, coding style and switch to ..., Alan Cox, (Mon May 19, 9:09 am)
[PATCH 46/57] smsc37b787_wdt: coding style, switch to unlock..., Alan Cox, (Mon May 19, 9:09 am)
[PATCH 45/57] shwdt: coding style, cleanup, switch to unlock..., Alan Cox, (Mon May 19, 9:08 am)
[PATCH 44/57] scx200_wdt: clean up and switch to unlocked_io..., Alan Cox, (Mon May 19, 9:08 am)
[PATCH 43/57] sc520_wdt: Clean up and switch to unlocked_ioctl, Alan Cox, (Mon May 19, 9:08 am)
[PATCH 38/57] stg7240_wdt: unlocked_ioctl, Alan Cox, (Mon May 19, 9:08 am)
[PATCH 41/57] sb_wdog: Clean up and switch to unlocked_ioctl, Alan Cox, (Mon May 19, 9:08 am)
[PATCH 39/57] sbc8360: clean up, Alan Cox, (Mon May 19, 9:08 am)
[PATCH 40/57] sbc_epx_c3_wdt: switch to unlocked_ioctl, Alan Cox, (Mon May 19, 9:08 am)
[PATCH 35/57] s3c2410: watchdog cleanup and switch to unlock..., Alan Cox, (Mon May 19, 9:08 am)
[PATCH 37/57] sbc60xxwdt: clean up and switch to unlocked_io..., Alan Cox, (Mon May 19, 9:08 am)
[PATCH 31/57] pc87413_wdt: clean up, coding style, unlocked_..., Alan Cox, (Mon May 19, 9:07 am)
[PATCH 36/57] sa1100_wdt: Switch to unlocked_ioctl, Alan Cox, (Mon May 19, 9:08 am)
[PATCH 34/57] rm9k_wdt: clean up, Alan Cox, (Mon May 19, 9:07 am)
[PATCH 33/57] pnx4008_wdt: unlocked_ioctl setup, Alan Cox, (Mon May 19, 9:07 am)
[PATCH 32/57] pcwd: clean up, unlocked_ioctl usage, Alan Cox, (Mon May 19, 9:07 am)
[PATCH 30/57] omap_wdt: locking, unlocked_ioctl, tidy, Alan Cox, (Mon May 19, 9:07 am)
[PATCH 24/57] machzwd: clean up, coding style, unlocked_ioctl, Alan Cox, (Mon May 19, 9:06 am)
[PATCH 29/57] mv64x60_wdt: clean up and locking checks, Alan Cox, (Mon May 19, 9:07 am)
[PATCH 28/57] mtx-1_wdt: clean up, coding style, unlocked io..., Alan Cox, (Mon May 19, 9:07 am)
Re: [PATCH 28/57] mtx-1_wdt: clean up, coding style, unlocke..., Florian Fainelli, (Tue May 20, 11:08 am)
[PATCH 27/57] mpcore watchdog: unlocked_ioctl and BKl work, Alan Cox, (Mon May 19, 9:07 am)
[PATCH 26/57] mpc watchdog: clean up and locking, Alan Cox, (Mon May 19, 9:07 am)
[PATCH 25/57] mixcomwd: coding style locking, unlocked_ioctl, Alan Cox, (Mon May 19, 9:07 am)
[PATCH 18/57] iTCO: unlocked_ioctl, coding style and cleanup, Alan Cox, (Mon May 19, 9:06 am)
Re: [PATCH 18/57] iTCO: unlocked_ioctl, coding style and cle..., Andrew Morton, (Tue May 20, 4:26 am)
Re: [PATCH 18/57] iTCO: unlocked_ioctl, coding style and cle..., Rusty Russell, (Wed May 21, 12:26 am)
Re: [PATCH 18/57] iTCO: unlocked_ioctl, coding style and cle..., Alan Cox, (Wed May 21, 5:29 am)
Re: [PATCH 18/57] iTCO: unlocked_ioctl, coding style and cle..., Rusty Russell, (Thu May 22, 1:56 am)
Re: [PATCH 18/57] iTCO: unlocked_ioctl, coding style and cle..., Andrew Morton, (Thu May 22, 2:15 am)
Re: [PATCH 18/57] iTCO: unlocked_ioctl, coding style and cle..., Andrew Morton, (Wed May 21, 12:36 am)
Re: [PATCH 18/57] iTCO: unlocked_ioctl, coding style and cle..., Rusty Russell, (Wed May 21, 12:58 am)
[PATCH 23/57] ks8695_wdt: clean up, coding style, unlocked_i..., Alan Cox, (Mon May 19, 9:06 am)
[PATCH 22/57] ixp4xx_wdt: unlocked_ioctl, Alan Cox, (Mon May 19, 9:06 am)
[PATCH 21/57] ixp2000_wdt: clean up and unlocked_ioctl, Alan Cox, (Mon May 19, 9:06 am)
[PATCH 20/57] booke watchdog: clean up and unlocked_ioctl, Alan Cox, (Mon May 19, 9:06 am)
[PATCH 19/57] bfin: watchdog cleanup and unlocked_ioctl, Alan Cox, (Mon May 19, 9:06 am)
[PATCH 17/57] it8712f: unlocked_ioctl, Alan Cox, (Mon May 19, 9:06 am)
[PATCH 16/57] iop: watchdog switch to unlocked_ioctl, Alan Cox, (Mon May 19, 9:06 am)
[PATCH 14/57] ibmasr: coding style, locking verify, Alan Cox, (Mon May 19, 9:06 am)
Re: [PATCH 14/57] ibmasr: coding style, locking verify, Andrey Panin, (Tue May 20, 1:52 am)
[PATCH 15/57] indydog: Clean up and tidy, Alan Cox, (Mon May 19, 9:06 am)
[PATCH 13/57] i6300esb: Style, unlocked_ioctl, cleanup, Alan Cox, (Mon May 19, 9:05 am)
[PATCH 12/57] ib700wdt: clean up and switch to unlocked_ioctl, Alan Cox, (Mon May 19, 9:05 am)
[PATCH 11/57] hpwdt: couple of include cleanups, Alan Cox, (Mon May 19, 9:05 am)
[PATCH 10/57] eurotechwdt: unlocked_ioctl, code lock check a..., Alan Cox, (Mon May 19, 9:05 am)
[PATCH 09/57] ep93xx_wdt: unlocked_ioctl, Alan Cox, (Mon May 19, 9:05 am)
[PATCH 08/57] davinci_wdt: unlocked_ioctl and check locking, Alan Cox, (Mon May 19, 9:05 am)
[PATCH 07/57] cpu5_wdt: switch to unlocked_ioctl, Alan Cox, (Mon May 19, 9:05 am)
[PATCH 06/57] at91: watchdog to unlocked_ioctl, Alan Cox, (Mon May 19, 9:05 am)
[PATCH 05/57] atp watchdog, Alan Cox, (Mon May 19, 9:05 am)
[PATCH 04/57] AR7 watchdog, Alan Cox, (Mon May 19, 9:05 am)
[PATCH 03/57] ali: watchdog locking and style, Alan Cox, (Mon May 19, 9:04 am)
[PATCH 02/57] clean up and check advantech watchdog, Alan Cox, (Mon May 19, 9:04 am)
[PATCH 01/57] Clean acquirewdt and check for BKL dependancies, Alan Cox, (Mon May 19, 9:04 am)