commit 00dd1e433967872f3997a45d5adf35056fdf2f56
tree 234735d17dc912f34a14eefd6299313357bfd5c5
parent dc836b5b6fcde95f750a4790d8200fabaf563dc9
author John McCutchan <ttb@tentacle.dhs.org> Mon, 08 Aug 2005 22:13:05 -0400
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 19:22:42 -0700
[PATCH] fsnotify-cleanups
This removes the now unused fsnotify_unlink & fsnotify_rmdir code.
Compile tested.
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit dc836b5b6fcde95f750a4790d8200fabaf563dc9
tree 893613626de4794a7b13fe6793bdebc79420c433
parent 138b9dd1fd7b44176af4f3b672060c790b0eaf55
author Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 18:46:09 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 18:46:09 -0700
Revert "[PATCH] PCI: restore BAR values..."
Revert commit fec59a711eef002d4ef9eb8de09dd0a26986eb77, which is
breaking sparc64 that doesn't have a working pci_update_resource.
We'll re-do this after 2.6.13 when we'll do it all properly.
commit 138b9dd1fd7b44176af4f3b672060c790b0eaf55
tree aba0bffcaaee3fd29c1e3142a4c10331b4858293
parent 92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98
author Dave Jones <davej@redhat.com> Mon, 08 Aug 2005 16:13:15 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 16:21:32 -0700
[PATCH] icn driver fails to unload when no hardware present
Fix a null dereference in module unload path.
Found by a simple modprobe icn ; rmmod icn
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98
tree 74a41755d00b908b6e6e31a69ba77774558bf26f
parent 03c6b749b364fe7b8e47ed8e1ce26baca167c322
parent ca9334523c853e407da7b3a0bd02f54d0fa59414
author Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 16:06:01 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 16:06:01 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit 03c6b749b364fe7b8e47ed8e1ce26baca167c322
tree e1d84aa44d53f8c67d0ba1e0e633c167d7761a58
parent 5e708484d710bcbb44893400f429579f5728cd7d
author Olaf Hering <olh@suse.de> Mon, 08 Aug 2005 14:49:18 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 15:29:13 -0700
[PATCH] x86_64: add MODULE_ALIAS for aes
modprobe aes does not work on x86_64. i386 has a similar line, this could
be the right fix. Would be nice to have in 2.6.13 final.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5e708484d710bcbb44893400f429579f5728cd7d
tree 8297ba1f5e1e8c9020026afdd67c96d9c4fff29c
parent b612cacb02f0fb58f07a9002c7719a901882718c
author Kumar Gala <galak@freescale.com> Mon, 08 Aug 2005 14:49:17 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 15:29:13 -0700
[PATCH] ppc32: Fix MPC834x USB memory map offsets
The memory mappings for MPC8349 USB MPH and DR modules were reversed.
Signed-off-by: Li Yang <LeoLi@freescale.com>
Signed-off-by: Jiang Bo <Tanya.jiang@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ca9334523c853e407da7b3a0bd02f54d0fa59414
tree 3c4f8050d9bc0e062038c1f7e22722e0e6447bfc
parent 4d479e40e1748a877a24015fc6727b27b77110cd
author Heikki Orsila <heikki.orsila@iki.fi> Mon, 08 Aug 2005 14:26:52 -0700
committer David S. Miller <davem@davemloft.net> Mon, 08 Aug 2005 14:26:52 -0700
[IPV4]: Debug cleanup
Here's a small patch to cleanup NETDEBUG() use in net/ipv4/ for Linux
kernel 2.6.13-rc5. Also weird use of indentation is changed in some
places.
Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4d479e40e1748a877a24015fc6727b27b77110cd
tree 6b6983091e6c7ef6f648282c57ed7a725a2db72d
parent 7d3f4c97723c4ec4e5d85e6e70084b02e6be8788
author David S. Miller <davem@davemloft.net> Mon, 08 Aug 2005 13:48:02 -0700
committer David S. Miller <davem@davemloft.net> Mon, 08 Aug 2005 13:48:02 -0700
[NETLINK]: Allocate and kill some netlink numbers.
NETLINK_ARPD is unused, allocate it to the Open-iSCSI folks.
NETLINK_ROUTE6 and NETLINK_TAPBASE are no longer used, delete
them.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b612cacb02f0fb58f07a9002c7719a901882718c
tree f528e2ee1b39ad3c70336b29469d0b5645bc9e97
parent 7a91bf7f5c22c8407a9991cbd9ce5bb87caa6b4a
parent 71abe99980e6d7ff8aee8acc7da817b3ad7d8a89
author Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 12:19:24 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 12:19:24 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
commit 7a91bf7f5c22c8407a9991cbd9ce5bb87caa6b4a
tree ffd77cfbf621a990052c1277d8a18451b9363dda
parent 1963c907b21e140082d081b1c8f8c2154593c7d7
author John McCutchan <ttb@tentacle.dhs.org> Mon, 08 Aug 2005 13:52:16 -0400
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 11:53:47 -0700
[PATCH] fsnotify_name/inoderemove
The patch below unhooks fsnotify from vfs_unlink & vfs_rmdir. It
introduces two new fsnotify calls, that are hooked in at the dcache
level. This not only more closely matches how the VFS layer works, it
also avoids the problem with locking and inode lifetimes.
The two functions are
- fsnotify_nameremove -- called when a directory entry is going away.
It notifies the PARENT of the deletion. This is called from
d_delete().
- inoderemove -- called when the files inode itself is going away. It
notifies the inode that is being deleted. This is called from
dentry_iput().
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1963c907b21e140082d081b1c8f8c2154593c7d7
tree 71410cd2ad9f4bdab2f2466a6621ba2930f16b5f
parent 66aea23ff84ca81bfaeaf7d63e248b873f5c2616
author Michael Krufky <mkrufky@linuxtv.org> Mon, 08 Aug 2005 09:22:43 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 11:49:57 -0700
[PATCH] dvb: lgdt330x frontend: some bug fixes & add lgdt3303 support
- Structural changes within lgdt330x driver, framework now supports
both chips... tested OK on lgdt3302 and lgdt3303.
- Add LG/TUA6034 dvb_pll_desc for ATSC with LG TDVS-H062F & DViCO FusionHDTV5.
- Fixed LGDT330X signal strength: For now, always set it to 0.
- Corrected LGDT330X boundary condition error in read_snr: dB calculation.
Signed-off-by: Mac Michaels <wmichaels1@earthlink.net>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 66aea23ff84ca81bfaeaf7d63e248b873f5c2616
tree 1dfa4af1f8b33c7d7b069c407d9c37ddd1ecae32
parent 8b83bc77bf77cc8459cb94e52b08e775104c4c48
author Cornelia Huck <cohuck@de.ibm.com> Mon, 08 Aug 2005 09:22:36 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 11:49:57 -0700
[PATCH] s390: use klist in qeth driver
From: Martin Schwidesky <schwidefsky@de.ibm.com>
Convert qeth to the new klist interface and make it compiling again.
Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8b83bc77bf77cc8459cb94e52b08e775104c4c48
tree 89f84bdd6a13763882636913852c6ce2eaea199c
parent 48de5beeb0ee821859c79ba5b9462654604d8bf3
author Harald Welte <laforge@netfilter.org> Mon, 08 Aug 2005 11:50:55 +0200
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 11:48:28 -0700
[PATCH] don't try to do any NAT on untracked connections
With the introduction of 'rustynat' in 2.6.11, the old tricks of preventing
NAT of 'untracked' connections (e.g. NOTRACK target in 'raw' table) are no
longer sufficient.
The ip_conntrack_untracked.status |= IPS_NAT_DONE_MASK effectively
prevents iteration of the 'nat' table, but doesn't prevent nat_packet()
to be executed. Since nr_manips is gone in 'rustynat', nat_packet() now
implicitly thinks that it has to do NAT on the packet.
This patch fixes that problem by explicitly checking for
ip_conntrack_untracked in ip_nat_fn().
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 48de5beeb0ee821859c79ba5b9462654604d8bf3
tree 69ce3026aea31e44a83f23ed8ea0d700d19b4ef5
parent 6d85f29bb54235d2e184e7155dcd4de908324fe6
author James Morris <jmorris@redhat.com> Mon, 08 Aug 2005 10:29:08 -0400
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 11:46:25 -0700
[PATCH] Update contact info for James Morris
commit 6d85f29bb54235d2e184e7155dcd4de908324fe6
tree 1ab80c4bb980fec383047e8e07a0fb8fa77b5994
parent db6778db7eb1d974e1ae0da326530f09c13585ac
author Ivan Kokshaysky <ink@jurassic.park.msu.ru> Mon, 08 Aug 2005 12:55:54 +0400
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 11:46:24 -0700
[PATCH] VIA VT8235 PCI quirk
Like many other southbridges from different manufacturers, VIA VT8235
chip has two non-standard BARs for power management and SMBus registers
(see the datasheet at http://www.via.com.tw).
This new quirk routine fixes boot problem with 2.6.13-rc2/rc6 kernels on
Targa Visionary 811 Athlon64 laptop, as reported by Mikael Pettersson
<mikpe@csd.uu.se>.
Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit db6778db7eb1d974e1ae0da326530f09c13585ac
tree 0e645dfdd902e76c47884c8629b69a4089cca05e
parent 0f0767c67a497173294bdf6725a3d85f7f29e397
author Antonino Daplas <adaplas@pol.net> Mon, 08 Aug 2005 14:22:43 +0800
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 11:46:24 -0700
[PATCH] nvidiafb: Fix initial display corruption on certain laptops
Reported by:Vincent Fortier (Bugzilla Bug 4768)
"At boot time the screen appears moved to the mid right portion of the actual
video pannel making the end of the line appears at the left edge... It simply
looks like moved half way to the right"
His particular hardware has a display with an unusual dimension (1920x1200) but
unfortunately has no EDID block. None of the entries in the global mode
database is correct for this particular display, and it particularly has
difficulty scaling up 640x480 (the default startup mode of nvidiafb) to
1920x1200 which causes the above described problem.
1, Add 1920x1200 to the global mode database.
2. Let nvidiafb base the startup mode from the flatpanel dimensions only if the
EDID block is absent, no boot mode parameter is specified by the user, and
a flatpanel/LCD display is attached.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0f0767c67a497173294bdf6725a3d85f7f29e397
tree 08c11f2a68489598bbd3e6b755b8c2b0a366322c
parent 2c875bbda9303b359af94f671d25639840ce2a59
author Paul Mackerras <paulus@samba.org> Mon, 08 Aug 2005 14:16:43 +1000
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 11:46:24 -0700
[PATCH] ppc64: update defconfigs
Update the default/example configs for ppc64. Pretty boring...
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2c875bbda9303b359af94f671d25639840ce2a59
tree 9c9f5e4413205fd8062fc213af327e74bf7775af
parent 6fc32179de9e14c542e0b1760e412bc670611c53
author Arnd Bergmann <arnd@arndb.de> Mon, 08 Aug 2005 14:12:42 +1000
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 08 Aug 2005 11:46:24 -0700
[PATCH] ppc64: add default config for BPA
This adds a bpa_defconfig file and make target. The config settings
are made for the current version of the Cell Processor Based Blade,
so there are not too many drivers enabled. A few more drivers might
get added in the future though.
Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 71abe99980e6d7ff8aee8acc7da817b3ad7d8a89
tree 73c492d859266b54a556ec92471c76d035c926e9
parent fc1df37e3b195cb73ecb14c30d41b7aace3f844a
author Christoph Hellwig <hch@lst.de> Sun, 07 Aug 2005 14:23:42 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 07 Aug 2005 14:23:42 +0100
[PATCH] ARM: switch fd1772.c from sleep_on to wait_event
Doesn't make the local irq disabling around it less buggy, but at
least we replace the offender with the right kind of primitive.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit fc1df37e3b195cb73ecb14c30d41b7aace3f844a
tree 9180f60ee3a816632b5ff9f8c8d774259af3d686
parent 0d317fb72fe3cf0f611608cf3a3015bbe6cd2a66
author Russell King <rmk@dyn-67.arm.linux.org.uk> Sun, 07 Aug 2005 14:20:26 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 07 Aug 2005 14:20:26 +0100
[PATCH] ARM: Make sa1100fb_display_dma_period() an inline function
This function produces a warning when CPU_FREQ=n. Since it's a very
simple calculation, make it inline instead of adding preprocessor
directives around it.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 7d3f4c97723c4ec4e5d85e6e70084b02e6be8788
tree 790200fcdef86e91224903394023b964a3a52e47
parent 6fc0b4a7a73a81e74d0004732df358f4f9975be2
author David S. Miller <davem@davemloft.net> Sat, 06 Aug 2005 06:35:48 -0700
committer David S. Miller <davem@davemloft.net> Sat, 06 Aug 2005 06:35:48 -0700
[TG3]: Save initial PCI state before registering the netdevice.
Else on SMP systems it is possible for hotplug to execute,
invoke tg3_open(), and end up loading the uninitialized
PCI register save area into the card.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6fc0b4a7a73a81e74d0004732df358f4f9975be2
tree ac2c68e206efbfe378728a50be30ef0bccd0cdff
parent 534afb90a9cd0b9643f62d660c164e1d924f39cf
author Herbert Xu <herbert@gondor.apana.org.au> Sat, 06 Aug 2005 06:33:15 -0700
committer David S. Miller <davem@davemloft.net> Sat, 06 Aug 2005 06:33:15 -0700
[IPSEC]: Restrict socket policy loading to CAP_NET_ADMIN.
The interface needs much redesigning if we wish to allow
normal users to do this in some way.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>