summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | [IPSEC] Fix xfrm to pfkey SA state conversionHerbert Xu2005-06-181-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adjusts the SA state conversion in af_key such that XFRM_STATE_ERROR/XFRM_STATE_DEAD will be converted to SADB_STATE_DEAD instead of SADB_STATE_DYING. According to RFC 2367, SADB_STATE_DYING SAs can be turned into mature ones through updating their lifetime settings. Since SAs which are in the states XFRM_STATE_ERROR/XFRM_STATE_DEAD cannot be resurrected, this value is unsuitable. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| * | | [IPSEC] Kill spurious hard expire messagesHerbert Xu2005-06-183-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch ensures that the hard state/policy expire notifications are only sent when the state/policy is successfully removed from their respective tables. As it is, it's possible for a state/policy to both expire through reaching a hard limit, as well as being deleted by the user. Note that this behaviour isn't actually forbidden by RFC 2367. However, it is a quality of implementation issue. As an added bonus, the restructuring in this patch will help eventually in moving the expire notifications from softirq context into process context, thus improving their reliability. One important side-effect from this change is that SAs reaching their hard byte/packet limits are now deleted immediately, just like SAs that have reached their hard time limits. Previously they were announced immediately but only deleted after 30 seconds. This is bad because it prevents the system from issuing an ACQUIRE command until the existing state was deleted by the user or expires after the time is up. In the scenario where the expire notification was lost this introduces a 30 second delay into the system for no good reason. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| * | | [IPSEC] Add complete xfrm event notificationJamal Hadi Salim2005-06-185-118/+616
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Heres the final patch. What this patch provides - netlink xfrm events - ability to have events generated by netlink propagated to pfkey and vice versa. - fixes the acquire lets-be-happy-with-one-success issue Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| * | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-06-183-123/+190
| |\ \ | | |/
| | * Merge with ../linux-2.6-smpRussell King2005-06-183-123/+190
| | |\
| | | * [PATCH] ARM SMP: Fix vector entryRussell King2005-05-312-85/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current vector entry system does not allow for SMP. In order to work around this, we need to eliminate our reliance on the fixed save areas, which breaks the way we enable alignment traps. This patch changes the way we handle the save areas such that we can have one per CPU. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| | | * [PATCH] ARM SMP: convert alignment enableRussell King2005-05-312-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current vector entry system does not allow for SMP. In order to work around this, we need to eliminate our reliance on the fixed save areas, which breaks the way we enable alignment traps. This patch makes the alignment trap enable code independent of the way we handle the save areas. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| | | * [PATCH] ARM SMP: add IPI supportRussell King2005-05-211-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for inter-processor interrupts to the main IRQ handling code. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| | | * [PATCH] ARM SMP: reallocate main IRQ handler code registersRussell King2005-05-211-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | By changing r9 -> r8 and r8 to 'tsk' (r9) we are able to remove one instruction from the preempt path. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| | | * [PATCH] ARM SMP: consolidate main IRQ handler codeRussell King2005-05-211-14/+15
| | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| * | | Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6Linus Torvalds2005-06-1816-433/+674
| |\ \ \
| * | | | [PATCH] DocBook: MAINTAINER entryMartin Waitz2005-06-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Martin can maintain the DocBook system for us. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | | [PATCH] console blanking oops fixJan Beulich2005-06-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When significant delays happen during boot (e.g. with a kernel debugger, but the problem has also seen in other cases) the timeout for blanking the console may trigger, but the work scheduler may not have been initialized, yet. schedule_work() will oops over the null keventd_wq. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | | Merge 'upstream-2.6.13' branch of ↵Linus Torvalds2005-06-186-38/+152
| |\ \ \ \ | | | | | | | | | | | | | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
| | * \ \ \ Merge /spare/repo/linux-2.6/Jeff Garzik2005-06-18214-1471/+2561
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | [PATCH] sata_svw: bump version numberNarendra Sankar2005-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump sata_svw.c version number to indicate support for BCM5785(HT1000) Southbridge SATA controller. Signed-off-by: Narendra Sankar <nsankar@broadcom.com> diff -uNr linux-2.6.12-rc5/drivers/scsi/sata_svw.c linux-2.6.12-rc5.brcm/drivers/scsi/sata_svw.c
| | * | | | [libata] ahci: finish ATAPI support (hopefully)Jeff Garzik2005-06-041-12/+8
| | | | | |
| | * | | | Merge of /spare/repo/libata-dev branch bridge-detect2005-06-043-2/+35
| | |\ \ \ \
| | | * \ \ \ Automatic merge of /spare/repo/linux-2.6/.git branch HEAD2005-06-03629-14398/+35475
| | | |\ \ \ \
| | | * | | | | [PATCH] libata basic detection and errata for PATA->SATA bridgesBrad Campbell2005-05-123-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch works around an issue with WD drives (and possibly others) over SiL PATA->SATA Bridges on SATA controllers locking up with transfers > 200 sectors. Signed-off-by: Brad Campbell <brad@wasp.net.au>
| | * | | | | | Automatic merge of /spare/repo/libata-dev branch svw2005-06-041-9/+16
| | |\ \ \ \ \ \
| | | * | | | | | [PATCH] sata_svw: Add support for new device IDsNarendra Sankar2005-05-251-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BCM5785 (HT1000) is a new southbridge from Serverworks/Broadcom that incorporates 4 SATA ports in a single PCIX function. Functionally these ports are similar to that in older devices like the Apple K2 and the Frodo4/8. This patch adds support for the new PCI device ID along with a blurb on what the various device IDs mean. Additionally in all devices based on this SATA controller, the SATA ports appear as a single PCI function. This is true for older Frodo8 devices as well. Hence the init function should init all the ports present in the detected controller (which could be 4 or 8). Signed-off-by: Narendra Sankar <nsankar@broadcom.com>
| | * | | | | | | Merge of /spare/repo/libata-dev branch pdc206192005-06-041-1/+25
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Automatic merge of /spare/repo/linux-2.6/.git branch HEAD2005-06-04629-14398/+35475
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | * | | | | | | [libata sata_promise] pdc20619 (PATA) supportTobias Lorenz2005-05-121-1/+25
| | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Automatic merge of /spare/repo/libata-dev branch ahci-msi2005-06-041-13/+67
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | [libata] ahci: minor PCI MSI cleanupJeff Garzik2005-06-041-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'have_msi' variable with a bit in the existing 'flags' variable,. AHCI_FLAG_MSI.
| | | * | | | | | [libata] ahci: Update for recent ->host_stop() API changeJeff Garzik2005-05-311-4/+4
| | | | | | | | |
| | | * | | | | | Automatic merge of ↵2005-05-31184-5078/+16084
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
| | | * \ \ \ \ \ \ Automatic merge of ↵2005-05-26366-7479/+14752
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
| | | * | | | | | | | [libata ahci] support PCI MSI interrupt vectorJeff Garzik2005-05-121-10/+63
| | | | |_|/ / / / / | | | |/| | | | | |
| * | | | | | | | | Clean up subthread execLinus Torvalds2005-06-181-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we re-parent itimers, and use BUG_ON() instead of an explicit conditional BUG().
| * | | | | | | | | [PATCH] Fix typo in drivers/pci/pci-driver.cMika Kukkonen2005-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The git commit 794f5bfa77955c4455f6d72d8b0e2bee25f1ff0c accidentally suffers from a previous typo in that file (',' instead of ';' in end of line). Patch included. Signed-off-by: Mika Kukkonen (mikukkon@iki.fi) Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | | | | | | | Manual merge of ↵Linus Torvalds2005-06-1838-3857/+9416
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git This is a fixed-up version of the broken "upstream-2.6.13" branch, where I re-did the manual merge of drivers/net/r8169.c by hand, and made sure the history is all good.
| | * \ \ \ \ \ \ \ \ Automatic merge of /spare/repo/netdev-2.6 branch skge2005-06-044-0/+6404
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | [PATCH] skge 64bit portabilityAl Viro2005-05-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ptrdiff_t is %td, not %d Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
| | | * | | | | | | | | [PATCH] skge missing includeAl Viro2005-05-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
| | | * | | | | | | | | [netdrvr] new driver skge, for SysKonnect cardsStephen Hemminger2005-05-124-0/+6403
| | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Automatic merge of /spare/repo/netdev-2.6 branch starfire2005-06-042-102/+386
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | [netdrvr starfire] Add GPL'd firmware, remove compat codeJeff Garzik2005-05-122-102/+386
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contributed by Ion Badulescu <ionut@badula.org>, further fixed up by me.
| | * | | | | | | | | Automatic merge of /spare/repo/netdev-2.6 branch smc91x2005-06-042-36/+37
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | [PATCH] smc91x: more tweaks to help with RX overrunsNicolas Pitre2005-05-271-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@cam.org> Index: linux-2.6/drivers/net/smc91x.c ===================================================================
| | | * | | | | | | | | [PATCH] smc91x: improve diagnostic infoNicolas Pitre2005-05-272-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and remove duplicate status defines. Signed-off-by: Nicolas Pitre <nico@cam.org> Index: linux-2.6/drivers/net/smc91x.c ===================================================================
| | | * | | | | | | | | [PATCH] smc91x warning fixNicolas Pitre2005-05-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few IO addr type conversions were missing. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | | * | | | | | | | | [PATCH] smc91x addr config checkNicolas Pitre2005-05-121-1/+1
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PAGE_SIZE mask is indeed confusing. Use the exact mask for this context which has nothing to do with memory pages at all. Also cast to int since the value to compare with is an int. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | | | | | | | Automatic merge of /spare/repo/netdev-2.6 branch remove-drivers2005-06-048-2955/+0
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | [PATCH] remove two obsolete net driversAdrian Bunk2005-05-128-2955/+0
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The options FMV18X and SK_G16 do depend on the non-available CONFIG_OBSOLETE even in kernel 2.4 - IOW, the last time it was able to select them was in kernel 2.2 (or even before). Since it seems noone misses these drivers, this patch removes them. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | | | | | | | Automatic merge of /spare/repo/netdev-2.6 branch iff-running2005-06-047-32/+13
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | [netdrvrs] Use netif_carrier_* instead of IFF_RUNNING2005-05-127-32/+13
| | | |/ / / / / / / /
| | * | | | | | | | | Automatic merge of /spare/repo/netdev-2.6 branch we182005-06-042-5/+352
| | |\ \ \ \ \ \ \ \ \
OpenPOWER on IntegriCloud