From: Jan-Benedict G. <jb...@he...> - 2006-04-26 21:29:12
|
Documentation/filesystems/sysfs.txt | 5 MAINTAINERS | 12 arch/alpha/lib/strncpy.S | 8 arch/i386/kernel/cpu/intel_cacheinfo.c | 2 arch/ia64/kernel/entry.S | 1 arch/ia64/kernel/palinfo.c | 2 arch/ia64/kernel/salinfo.c | 2 arch/ia64/kernel/topology.c | 2 arch/mips/kernel/linux32.c | 64 - arch/parisc/Kconfig | 31 arch/parisc/defconfig | 494 +++++++++------ arch/parisc/kernel/asm-offsets.c | 3 arch/parisc/kernel/cache.c | 4 arch/parisc/kernel/entry.S | 36 - arch/parisc/kernel/head.S | 15 arch/parisc/kernel/init_task.c | 10 arch/parisc/kernel/pacache.S | 25 arch/parisc/kernel/sys_parisc.c | 8 arch/parisc/kernel/syscall.S | 10 arch/parisc/kernel/syscall_table.S | 8 arch/parisc/kernel/vmlinux.lds.S | 54 - arch/parisc/mm/fault.c | 2 arch/parisc/mm/init.c | 28 arch/parisc/mm/ioremap.c | 3 arch/powerpc/configs/g5_defconfig | 58 - arch/powerpc/configs/iseries_defconfig | 43 - arch/powerpc/configs/pseries_defconfig | 54 - arch/powerpc/kernel/iommu.c | 36 - arch/powerpc/kernel/pci_iommu.c | 40 + arch/powerpc/kernel/ppc_ksyms.c | 1 arch/powerpc/kernel/prom.c | 2 arch/powerpc/kernel/sysfs.c | 4 arch/powerpc/kernel/systbl.S | 6 arch/powerpc/kernel/vio.c | 6 arch/powerpc/platforms/cell/spu_callbacks.c | 6 arch/powerpc/platforms/powermac/low_i2c.c | 78 +- arch/powerpc/sysdev/dart_iommu.c | 12 arch/ppc/kernel/asm-offsets.c | 1 arch/ppc/kernel/entry.S | 33 - arch/ppc/kernel/ppc_ksyms.c | 1 arch/s390/appldata/appldata_base.c | 2 arch/x86_64/ia32/Makefile | 4 arch/x86_64/kernel/mce.c | 2 arch/x86_64/kernel/mce_amd.c | 2 arch/x86_64/kernel/pci-gart.c | 4 arch/x86_64/mm/numa.c | 2 block/ll_rw_blk.c | 2 drivers/base/topology.c | 2 drivers/char/drm/drmP.h | 1 drivers/char/drm/drm_agpsupport.c | 2 drivers/char/drm/drm_bufs.c | 5 drivers/char/drm/drm_stub.c | 2 drivers/char/drm/r300_cmdbuf.c | 2 drivers/char/mem.c | 14 drivers/char/snsc.c | 3 drivers/char/tpm/Kconfig | 11 drivers/char/tpm/Makefile | 1 drivers/char/tpm/tpm.c | 786 ++++++++++++++++++++---- drivers/char/tpm/tpm.h | 37 - drivers/char/tpm/tpm_atmel.c | 58 + drivers/char/tpm/tpm_atmel.h | 25 drivers/char/tpm/tpm_bios.c | 52 + drivers/char/tpm/tpm_infineon.c | 61 - drivers/char/tpm/tpm_nsc.c | 49 - drivers/char/tpm/tpm_tis.c | 669 ++++++++++++++++++++ drivers/cpufreq/cpufreq.c | 2 drivers/input/keyboard/hil_kbd.c | 2 drivers/isdn/gigaset/bas-gigaset.c | 599 ++++++++++-------- drivers/isdn/gigaset/common.c | 3 drivers/isdn/gigaset/ev-layer.c | 3 drivers/isdn/gigaset/gigaset.h | 7 drivers/isdn/gigaset/i4l.c | 2 drivers/isdn/gigaset/isocdata.c | 10 drivers/macintosh/therm_adt746x.c | 4 drivers/net/e1000/e1000_main.c | 1 drivers/net/forcedeth.c | 79 ++ drivers/net/gianfar.c | 56 - drivers/net/gianfar.h | 67 +- drivers/net/gianfar_ethtool.c | 20 drivers/net/gianfar_sysfs.c | 24 drivers/net/pcmcia/pcnet_cs.c | 1 drivers/net/sky2.c | 52 + drivers/net/sky2.h | 2 drivers/net/wireless/bcm43xx/bcm43xx_dma.h | 8 drivers/net/wireless/bcm43xx/bcm43xx_pio.c | 92 +- drivers/net/wireless/bcm43xx/bcm43xx_pio.h | 16 drivers/net/wireless/hostap/hostap_ioctl.c | 4 drivers/parisc/pdc_stable.c | 2 drivers/parisc/sba_iommu.c | 43 - drivers/parisc/superio.c | 4 drivers/pcmcia/Kconfig | 2 drivers/pcmcia/ds.c | 16 drivers/pcmcia/pcmcia_resource.c | 18 drivers/usb/gadget/inode.c | 1 fs/cifs/CHANGES | 6 fs/cifs/README | 8 fs/cifs/cifsfs.c | 99 +-- fs/cifs/cifssmb.c | 2 fs/cifs/connect.c | 6 fs/cifs/dir.c | 18 fs/cifs/fcntl.c | 2 fs/cifs/file.c | 34 - fs/cifs/inode.c | 6 fs/cifs/link.c | 6 fs/cifs/ntlmssp.c | 14 fs/cifs/readdir.c | 45 - fs/cifs/xattr.c | 8 fs/compat.c | 4 fs/ext3/ioctl.c | 18 fs/ext3/resize.c | 2 fs/fuse/dev.c | 35 - fs/fuse/fuse_i.h | 12 fs/fuse/inode.c | 40 - fs/reiserfs/xattr_acl.c | 5 fs/splice.c | 355 ++++++++-- include/asm-i386/unistd.h | 3 include/asm-ia64/unistd.h | 3 include/asm-parisc/io.h | 17 include/asm-parisc/page.h | 25 include/asm-parisc/pgtable.h | 63 + include/asm-parisc/unistd.h | 8 include/asm-powerpc/iommu.h | 7 include/asm-powerpc/machdep.h | 6 include/asm-powerpc/unistd.h | 3 include/asm-sparc/unistd.h | 2 include/asm-sparc64/unistd.h | 2 include/asm-x86_64/unistd.h | 4 include/linux/netdevice.h | 18 include/linux/netfilter/x_tables.h | 4 include/linux/pipe_fs_i.h | 17 include/linux/syscalls.h | 3 include/net/ieee80211softmac.h | 5 kernel/hrtimer.c | 4 kernel/profile.c | 2 kernel/rcupdate.c | 4 kernel/sched.c | 2 kernel/softirq.c | 4 kernel/softlockup.c | 4 kernel/timer.c | 4 kernel/workqueue.c | 2 mm/page_alloc.c | 2 mm/shmem.c | 3 mm/slab.c | 2 mm/vmscan.c | 2 net/bridge/br_forward.c | 8 net/ieee80211/softmac/ieee80211softmac_assoc.c | 20 net/ieee80211/softmac/ieee80211softmac_module.c | 2 net/ieee80211/softmac/ieee80211softmac_wx.c | 27 net/ipv4/netfilter/Kconfig | 2 net/ipv6/netfilter/ip6_tables.c | 13 net/netfilter/nf_conntrack_core.c | 15 net/netfilter/nf_conntrack_l3proto_generic.c | 1 net/netfilter/x_tables.c | 2 net/sched/act_ipt.c | 5 sound/oss/ad1889.c | 198 +++--- sound/oss/ad1889.h | 101 +-- sound/oss/dmasound/tas_common.c | 4 sound/ppc/daca.c | 2 sound/ppc/tumbler.c | 2 159 files changed, 3822 insertions(+), 1678 deletions(-) New commits: commit 5cdc4b76543a41105635b3b8f0520bb060956018 Merge: f078d69... 83d722f... Author: Jan-Benedict Glaw <jb...@d2...> Date: Wed Apr 26 23:25:41 2006 +0200 Merge branch 'master' commit 83d722f7e198b034699b1500d98729beff930efd Author: Chandra Seetharaman <sek...@us...> Date: Mon Apr 24 19:35:21 2006 -0700 [PATCH] Remove __devinit and __cpuinit from notifier_call definitions Few of the notifier_chain_register() callers use __init in the definition of notifier_call. It is incorrect as the function definition should be available after the initializations (they do not unregister them during initializations). This patch fixes all such usages to _not_ have the notifier_call __init section. Signed-off-by: Chandra Seetharaman <sek...@us...> Signed-off-by: Linus Torvalds <tor...@os...> commit 649bbaa484bcdce94f40a1b97a6a2ded0549e8a2 Author: Chandra Seetharaman <sek...@us...> Date: Mon Apr 24 19:35:15 2006 -0700 [PATCH] Remove __devinitdata from notifier block definitions Few of the notifier_chain_register() callers use __devinitdata in the definition of notifier_block data structure. It is incorrect as the data structure should be available after the initializations (they do not unregister them during initializations). This was leading to an oops when notifier_chain_register() call is invoked for those callback chains after initialization. This patch fixes all such usages to _not_ have the notifier_block data structure in the init data section. Signed-off-by: Chandra Seetharaman <sek...@us...> Signed-off-by: Linus Torvalds <tor...@os...> commit e7edf9cdeddc0cff125e8e658216efb2ff2b2219 Author: James Morris <jm...@na...> Date: Wed Apr 26 02:45:03 2006 -0400 [PATCH] LSM: add missing hook to do_compat_readv_writev() This patch addresses a flaw in LSM, where there is no mediation of readv() and writev() in for 32-bit compatible apps using a 64-bit kernel. This bug was discovered and fixed initially in the native readv/writev code [1], but was not fixed in the compat code. Thanks to Al for spotting this one. [1] http://lwn.net/Articles/154282/ Signed-off-by: James Morris <jm...@na...> Signed-off-by: Al Viro <vi...@ze...> Signed-off-by: Linus Torvalds <tor...@os...> commit a090d9132c1e53e3517111123680c15afb25c0a4 Author: Al Viro <vi...@ft...> Date: Wed Apr 26 07:32:40 2006 +0100 [PATCH] protect ext3 ioctl modifying append_only, immutable, etc. with i_mutex All modifications of ->i_flags in inodes that might be visible to somebody else must be under ->i_mutex. That patch fixes ext3 ioctl() setting S_APPEND and friends. Signed-off-by: Al Viro <vi...@ze...> Signed-off-by: Linus Torvalds <tor...@os...> commit 6ad0013b316367671ef316cff91ab2d912e309c9 Author: Al Viro <vi...@ft...> Date: Wed Apr 26 07:28:09 2006 +0100 [PATCH] fix mips sys32_p{read,write} Switched to use of sys_pread64()/sys_pwrite64() rather than keep duplicating their guts; among the little things that had been missing there were such as ret = security_file_permission (file, MAY_READ); Gotta love the LSM robustness, right? Signed-off-by: Al Viro <vi...@ze...> Signed-off-by: Linus Torvalds <tor...@os...> commit de0bb97aff6743f71abb8ec581238e2bdae9cdd1 Author: Al Viro <vi...@ft...> Date: Wed Apr 26 07:26:09 2006 +0100 [PATCH] forgotten ->b_data in memcpy() call in ext3/resize.c (oopsable) sbi->s_group_desc is an array of pointers to buffer_head. memcpy() of buffer size from address of buffer_head is a bad idea - it will generate junk in any case, may oops if buffer_head is close to the end of slab page and next page is not mapped and isn't what was intended there. IOW, ->b_data is missing in that call. Fortunately, result doesn't go into the primary on-disk data structures, so only backup ones get crap written to them; that had allowed this bug to remain unnoticed until now. Signed-off-by: Al Viro <vi...@ze...> Signed-off-by: Linus Torvalds <tor...@os...> commit c82ffb07cd1aa356c599999c4f0dc5155a91d318 Author: Al Viro <vi...@ft...> Date: Wed Apr 26 07:20:48 2006 +0100 [PATCH] fix leak in activate_ep_files() Signed-off-by: Al Viro <vi...@ze...> Signed-off-by: Linus Torvalds <tor...@os...> commit 7b97ebfb931887be63bfa29b6c143e9e9da3f5e8 Merge: 07db869... 1ebd32f... Author: Linus Torvalds <tor...@g5...> Date: Wed Apr 26 07:47:55 2006 -0700 Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block * 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] splice: add ->splice_write support for /dev/null [PATCH] splice: rearrange moving to/from pipe helpers [PATCH] Add support for the sys_vmsplice syscall [PATCH] splice: fix offset problems [PATCH] splice: fix min() warning commit 07db8696f5d484485dde77138ff87d19c8628a75 Merge: bd5838b... 86a0f04... Author: Linus Torvalds <tor...@g5...> Date: Wed Apr 26 07:46:19 2006 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] forcedeth: fix initialization [PATCH] sky2: version 1.2 [PATCH] sky2: reset function can be devinit [PATCH] sky2: use ALIGN() macro [PATCH] sky2: add fake idle irq timer [PATCH] sky2: reschedule if irq still pending [PATCH] bcm43xx: make PIO mode usable [PATCH] bcm43xx: add to MAINTAINERS [PATCH] softmac: fix SIOCSIWAP [PATCH] Fix crash on big-endian systems during scan e1000: Update truesize with the length of the packet for packet split [PATCH] Fix locking in gianfar commit bd5838b9ccdde2be18f61886c41ccd131414fb04 Merge: c86d90d... 85ca719... Author: Linus Torvalds <tor...@g5...> Date: Wed Apr 26 07:45:57 2006 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [BRIDGE]: allow full size vlan packets commit 1ebd32fc54bd04de6b3944587f25513c0681f98e Author: Jens Axboe <ax...@su...> Date: Wed Apr 26 14:40:08 2006 +0200 [PATCH] splice: add ->splice_write support for /dev/null Useful for testing. Signed-off-by: Jens Axboe <ax...@su...> commit 00522fb41a2a9bf0f98a007c0e2b516a3873148c Author: Jens Axboe <ax...@su...> Date: Wed Apr 26 14:39:29 2006 +0200 [PATCH] splice: rearrange moving to/from pipe helpers We need these for people writing their own ->splice_read/write hooks. Signed-off-by: Jens Axboe <ax...@su...> commit 86a0f04387bfa814618bf0c2c8b203899c4fa5d2 Author: Ayaz Abdulla <aab...@nv...> Date: Mon Apr 24 18:41:31 2006 -0400 [PATCH] forcedeth: fix initialization This patch fixes the nic initialization. If the nic was in low power mode, it brings it back to normal power. Also, it utilizes a new hardware reset during the init. I am resending based on feedback, I corrected the register size mapping and delay after posted write. Signed-Off-By: Ayaz Abdulla <aab...@nv...> Signed-off-by: Jeff Garzik <je...@ga...> commit bdf9c27d020ba50b42949c383c1956216c9fd522 Author: Stephen Hemminger <she...@os...> Date: Tue Apr 25 10:58:54 2006 -0700 [PATCH] sky2: version 1.2 Update to version 1.2 Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit 98712e5e3325247bf22a175d225526c9d5f8439b Author: Stephen Hemminger <she...@os...> Date: Tue Apr 25 10:58:53 2006 -0700 [PATCH] sky2: reset function can be devinit The sky2_reset function only called from sky2_probe. Maybe the compiler was smart enough to figure this out already. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit 4a15d56f78936ec15a5d747546f25ace8fef9a03 Author: Stephen Hemminger <she...@os...> Date: Tue Apr 25 10:58:52 2006 -0700 [PATCH] sky2: use ALIGN() macro The ALIGN() macro in kernel.h does the same math that the sky2 driver was using for padding. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit d27ed38765d6e01eaab443a7909f53a37f090e99 Author: Stephen Hemminger <she...@os...> Date: Tue Apr 25 10:58:51 2006 -0700 [PATCH] sky2: add fake idle irq timer Add an fake NAPI schedule once a second. This is an attempt to work around for broken configurations with edge-triggered interrupts. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit 734cbc363b159caee158d5a83408c72d98bcacf0 Author: Stephen Hemminger <she...@os...> Date: Tue Apr 25 10:58:50 2006 -0700 [PATCH] sky2: reschedule if irq still pending This is a workaround for the case edge-triggered irq's. Several users seem to have broken configurations sharing edge-triggered irq's. To avoid losing IRQ's, reshedule if more work arrives. The changes to netdevice.h are to extract the part that puts device back in list into separate inline. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit 3b908870b8332dfd40be0e919e187aa4991536fb Merge: 3b85418... 7c241d3... Author: Jeff Garzik <je...@ga...> Date: Wed Apr 26 06:16:50 2006 -0400 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit 3b85418bc998876ce46784fb49f243100b2dd909 Merge: 25f7389... bcb4919... Author: Jeff Garzik <je...@ga...> Date: Wed Apr 26 06:16:05 2006 -0400 Merge branch 'skb_truesize' of git://lost.foo-projects.org/~ahkok/git/linux-2.6 into upstream-fixes commit 25f73891c3059e9ce6ff0a02670aa98baf6cbce9 Merge: fef6108... 4d5c34e... Author: Jeff Garzik <je...@ga...> Date: Wed Apr 26 06:15:27 2006 -0400 Merge branch 'master' into upstream-fixes commit 85ca719e5756d79ea0f10c469e3762462ac45e22 Author: Stephen Hemminger <she...@os...> Date: Wed Apr 26 02:39:19 2006 -0700 [BRIDGE]: allow full size vlan packets Need to allow for VLAN header when bridging. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: David S. Miller <da...@da...> commit 912d35f86781e64d73be1ef358f703c08905ac37 Author: Jens Axboe <ax...@su...> Date: Wed Apr 26 10:59:21 2006 +0200 [PATCH] Add support for the sys_vmsplice syscall sys_splice() moves data to/from pipes with a file input/output. sys_vmsplice() moves data to a pipe, with the input being a user address range instead. This uses an approach suggested by Linus, where we can hold partial ranges inside the pages[] map. Hopefully this will be useful for network receive support as well. Signed-off-by: Jens Axboe <ax...@su...> commit c86d90df2676d9d212c0ab1f3c64e0abdf5b4c09 Author: Miklos Szeredi <mi...@sz...> Date: Wed Apr 26 10:49:26 2006 +0200 [doc] add paragraph about 'fs' subsystem to sysfs.txt Signed-off-by: Miklos Szeredi <mi...@sz...> commit 8aa09a50b5d9dbdf627f79e19d72d82994348089 Author: Miklos Szeredi <mi...@sz...> Date: Wed Apr 26 10:49:16 2006 +0200 [fuse] fix race between checking and setting file->private_data BKL does not protect against races if the task may sleep between checking and setting a value. So move checking of file->private_data near to setting it in fuse_fill_super(). Found by Al Viro. Signed-off-by: Miklos Szeredi <mi...@sz...> commit 6dbbcb120570d747b00783820ee02d1e1bcf63de Author: Miklos Szeredi <mi...@sz...> Date: Wed Apr 26 10:49:06 2006 +0200 [fuse] fix deadlock between fuse_put_super() and request_end(), try #2 A deadlock was possible, when the last reference to the superblock was held due to a background request containing a file reference. Releasing the file would release the vfsmount which in turn would release the superblock. Since sbput_sem is held during the fput() and fuse_put_super() tries to acquire this same semaphore, a deadlock results. The solution is to move the fput() outside the region protected by sbput_sem. Signed-off-by: Miklos Szeredi <mi...@sz...> commit 5a5fb1ea74d8b82ca1461b885a1334fb21e037be Author: Miklos Szeredi <mi...@sz...> Date: Wed Apr 26 10:48:55 2006 +0200 Revert "[fuse] fix deadlock between fuse_put_super() and request_end()" This reverts 73ce8355c243a434524a34c05cc417dd0467996e commit. It was wrong, because it didn't take into account the requirement, that iput() for background requests must be performed synchronously with ->put_super(), otherwise active inodes may remain after unmount. The right solution is to keep the sbput_sem and perform iput() within the locked region, but move fput() outside sbput_sem. Signed-off-by: Miklos Szeredi <mi...@sz...> commit 016b661e2f717168e600f3c85f29e1a49f88e004 Author: Jens Axboe <ax...@su...> Date: Tue Apr 25 15:42:00 2006 +0200 [PATCH] splice: fix offset problems Make the move_from_pipe() actors return number of bytes processed, then move_from_pipe() can decide more cleverly when to move on to the next buffer. This fixes problems with pipe offset and differing file offset. Signed-off-by: Jens Axboe <ax...@su...> commit ba5f5d90c45a30e4e9a1bd136acf1b3973c905c8 Author: Andrew Morton <ak...@os...> Date: Tue Apr 25 15:33:34 2006 +0200 [PATCH] splice: fix min() warning Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Jens Axboe <ax...@su...> commit bcb49197ed9a2e8a0a8d990723dccfccffa7566f Author: Auke Kok <auk...@in...> Date: Tue Apr 25 22:50:04 2006 -0700 e1000: Update truesize with the length of the packet for packet split Update skb with the real packet size. Signed-off-by: Jesse Brandeburg <jes...@in...> Signed-off-by: Auke Kok <auk...@in...> Signed-off-by: John Ronciak <joh...@in...> commit 4d5c34ec7b007cfb0771a36996b009f194acbb2f Author: Ivan Kokshaysky <in...@ju...> Date: Tue Apr 25 13:45:19 2006 +0400 [PATCH] Alpha: strncpy() fix As it turned out after recent SCSI changes, strncpy() was broken - it mixed up the return values from __stxncpy() in registers $24 and $27. Thanks to Mathieu Chouquet-Stringer for tracking down the problem and providing an excellent test case. Signed-off-by: Ivan Kokshaysky <in...@ju...> Signed-off-by: Linus Torvalds <tor...@os...> commit 454ac778459bc70f0a9818a6a8fd974ced11de66 Merge: 18118cd... 301dc3e... Author: Linus Torvalds <tor...@g5...> Date: Mon Apr 24 20:08:08 2006 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable * master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable: [CIFS] Fix compile error when CONFIG_CIFS_EXPERIMENTAL is undefined commit 18118cdbfd1f855e09ee511d764d6c9df3d4f952 Author: Patrick McHardy <ka...@tr...> Date: Mon Apr 24 17:18:59 2006 -0700 [NETFILTER]: ipt action: use xt_check_target for basic verification The targets don't do the basic verification themselves anymore so the ipt action needs to take care of it. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 91536b7ae67710ca888e03ea82c60f0ac073a015 Author: Dmitry Mishin <di...@op...> Date: Mon Apr 24 17:18:25 2006 -0700 [NETFILTER]: x_tables: move table->lock initialization xt_table->lock should be initialized before xt_replace_table() call, which uses it. This patch removes strict requirement that table should define lock before registering. Signed-off-by: Dmitry Mishin <di...@op...> Signed-off-by: Kirill Korotaev <de...@op...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit e4a79ef811505a8bf8d8edfda8602e23cb2fbdb0 Author: Patrick McHardy <ka...@tr...> Date: Mon Apr 24 17:17:49 2006 -0700 [NETFILTER]: ip6_tables: remove broken comefrom debugging The introduction of x_tables broke comefrom debugging, remove it from ip6_tables as well (ip_tables already got removed). Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 2c16b774c7a9b1684b0ff10121915903e9f0cf6c Author: Yasuyuki Kozakai <yas...@to...> Date: Mon Apr 24 17:16:59 2006 -0700 [NETFILTER]: nf_conntrack: kill unused callback init_conntrack Signed-off-by: Yasuyuki Kozakai <yas...@to...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 55fe5866366ae42f259f27ae5962eb267d9ce172 Author: Patrick McHardy <ka...@tr...> Date: Mon Apr 24 17:16:28 2006 -0700 [NETFILTER]: Fix compat_xt_counters alignment for non-x86 Some (?) non-x86 architectures require 8byte alignment for u_int64_t even when compiled for 32bit, using u_int32_t in compat_xt_counters breaks on these architectures, use u_int64_t for everything but x86. Reported by Andreas Schwab <sc...@su...>. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 44adf28f4a27df626d50e54c8d0669df2dd1aa89 Author: Thomas Voegtle <tv...@li...> Date: Mon Apr 24 17:15:54 2006 -0700 [NETFILTER]: ULOG target is not obsolete The backend part is obsoleted, but the target itself is still needed. Signed-off-by: Thomas Voegtle <tv...@li...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit e1bbdebdba615ddd957de81103aa2f7fa0581952 Author: Yasuyuki Kozakai <yas...@to...> Date: Mon Apr 24 17:15:17 2006 -0700 [NETFILTER]: nf_conntrack: Fix module refcount dropping too far If nf_ct_l3proto_find_get() fails to get the refcount of nf_ct_l3proto_generic, nf_ct_l3proto_put() will drop the refcount too far. This gets rid of '.me = THIS_MODULE' of nf_ct_l3proto_generic so that nf_ct_l3proto_find_get() doesn't try to get refcount of it. It's OK because its symbol is usable until nf_conntrack.ko is unloaded. This also kills unnecessary NULL pointer check as well. __nf_ct_proto_find() allways returns non-NULL pointer. Signed-off-by: Yasuyuki Kozakai <yas...@to...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit d8fe3f19203b1f5070358aaa292d33295258b448 Author: OGAWA Hirofumi <hir...@ma...> Date: Mon Apr 24 13:48:51 2006 -0700 [SPARC]: __NR_sys removal __NR_sys_sync_file_range part was lost somewhere... [glibc is already checking __NR_sync_file_range] Signed-off-by: OGAWA Hirofumi <hir...@ma...> Signed-off-by: David S. Miller <da...@da...> commit 7c241d37fe0e6442c5cf3b5d73f7f58f2dc66352 Author: Michael Buesch <mb...@bu...> Date: Sun Apr 23 13:23:10 2006 +0200 [PATCH] bcm43xx: make PIO mode usable This patch fixes PIO mode on the softmac bcm43xx driver. (A dscape patch will follow). It mainly fixes endianess issues. This patch is tested on PowerPC32 and i386. Signed-off-by: Michael Buesch <mb...@bu...> Signed-off-by: John W. Linville <lin...@tu...> commit 9eac8f95d1bb2cec96340505bed2d2387780821f Author: Michael Buesch <mb...@bu...> Date: Sat Apr 22 17:31:27 2006 +0200 [PATCH] bcm43xx: add to MAINTAINERS Signed-off-by: John W. Linville <lin...@tu...> commit 818667f7c40dd0bd14029b5ac1d0f5282e12310e Author: Johannes Berg <joh...@si...> Date: Thu Apr 20 20:02:03 2006 +0200 [PATCH] softmac: fix SIOCSIWAP There are some bugs in the current implementation of the SIOCSIWAP wext, for example that when you do it twice and it fails, it may still try another access point for some reason. This patch fixes this by introducing a new flag that tells the association code that the bssid that is in use was fixed by the user and shouldn't be deviated from. Signed-off-by: Johannes Berg <joh...@si...> Signed-off-by: John W. Linville <lin...@tu...> commit dac322e39a2b82871cf514c9a533f24a1b4c7e19 Author: Pavel Roskin <pr...@gn...> Date: Mon Apr 17 11:36:43 2006 -0400 [PATCH] Fix crash on big-endian systems during scan The original code was doing arithmetics on a little-endian value. Reported by Stelios Koroneos <st...@st...> Signed-off-by: Pavel Roskin <pr...@gn...> Signed-off-by: John W. Linville <lin...@tu...> commit 301dc3e6f6ea83703fa52919c00e60661da5a8fe Author: Steve French <sf...@us...> Date: Mon Apr 24 16:24:54 2006 +0000 [CIFS] Fix compile error when CONFIG_CIFS_EXPERIMENTAL is undefined Signed-off-by: Dave Kleikamp <sh...@au...> Signed-off-by: Steve French <sf...@us...> commit 6b426e785cb81e53dc2fc4dcf997661472b470ef Merge: cb6aef2... 223232d... Author: Linus Torvalds <tor...@g5...> Date: Sun Apr 23 09:44:10 2006 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: [PARISC] MAINTAINERS [PARISC] Make ioremap default to _nocache [PARISC] Add new entries to the syscall table [PARISC] Further work for multiple page sizes [PARISC] Fix up hil_kbd.c mismerge [PARISC] defconfig updates [PARISC] Document that we tolerate "Relaxed Ordering" [PARISC] Misc. janitorial work [PARISC] EISA regions must be mapped NO_CACHE [PARISC] OSS ad1889: Match register names with ALSA driver commit cb6aef2879b769644b35cffe9844c81c63809c8e Merge: 950709a... 48b950f... Author: Linus Torvalds <tor...@g5...> Date: Sun Apr 23 09:43:21 2006 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6: [PATCH] pcmcia/pcmcia_resource.c: fix crash when using Cardbus cards [PATCH] vrc4171: update config [PATCH] pcmcia: fix oops in static mapping case [PATCH] pcmcia: remove unneeded forward declarations [PATCH] pcmcia: do not set dev_node to NULL too early [PATCH] pcmcia: fix comment for pcmcia_load_firmware [PATCH] pcmcia: unload second device first [PATCH] pcmcia: add new ID to pcnet_cs commit 950709a8961e2dde05bc55dca29b2d2e54a6d3ec Merge: 41bc398... 5d23faf... Author: Linus Torvalds <tor...@g5...> Date: Sun Apr 23 09:41:20 2006 -0700 Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: possible cleanups drm: fixup r300 scratch on BE machines commit 41bc3982b99973d93b5c49598ebd1c34a21127af Merge: a580e5b... b66ac3e... Author: Linus Torvalds <tor...@g5...> Date: Sun Apr 23 09:38:09 2006 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable * master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable: [CIFS] Fix typo in previous [CIFS] Readdir fixes to allow search to start at arbitrary position [CIFS] Use the kthread_ API instead of opencoding lots of hairy code for kernel [CIFS] Don't allow a backslash in a path component [CIFS] [CIFS] Do not take rename sem on most path based calls (during commit a580e5b9a5ba7d6db5647c36ee118b8890ba3033 Merge: 93e1b7d... d0e15be... Author: Linus Torvalds <tor...@g5...> Date: Sun Apr 23 09:36:31 2006 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge: powerpc: Fix define_machine so machine_is() works from modules powerpc/ppc: export strncasecmp [PATCH] powerpc: fix oops in alsa powermac driver [PATCH] powerpc: update {g5,iseries,pseries}_defconfigs [PATCH] ppc: Fix powersave code on arch/ppc [PATCH] powerpc/cell: remove BUILD_BUG_ON and add sys_tee to spu_syscall_table [PATCH] powermac: Fix i2c on keywest based chips [PATCH] powerpc: Lower threshold for DART enablement to 1GB [PATCH] powerpc: IOMMU support for honoring dma_mask commit 5d23fafb1bf8ef071738026c2e5071a92186d5f8 Author: Dave Airlie <ai...@li...> Date: Sun Apr 23 18:26:40 2006 +1000 drm: possible cleanups This patch contains the following possible cleanups: - make the following needlessly global function static: - drm_bufs.c: drm_addbufs_fb() - remove the following unused EXPORT_SYMBOL's: - drm_agpsupport.c: drm_agp_bind_memory - drm_bufs.c: drm_rmmap_locked - drm_bufs.c: drm_rmmap - drm_stub.c: drm_get_dev Signed-off-by: Adrian Bunk <bu...@st...> Signed-off-by: Dave Airlie <ai...@li...> commit caa98c41c0db9bfda5bc9a0e680f304283089268 Author: Dave Airlie <ai...@li...> Date: Sun Apr 23 18:14:00 2006 +1000 drm: fixup r300 scratch on BE machines This fixes the r300 scratch stuff to work on PPC, from Ben Herrenschmidt on IRC. Signed-off-by: Dave Airlie <ai...@li...> commit b66ac3ea21f81dea02cdb4e9de66ee6afdc540e4 Author: Steve French <sf...@us...> Date: Sun Apr 23 01:54:50 2006 +0000 [CIFS] Fix typo in previous Signed-off-by: Steve French <sf...@us...> commit d0e15bed84db7a9b0ea85d2ad9707b5e6d2e38da Author: Paul Mackerras <pa...@sa...> Date: Sun Apr 23 10:42:04 2006 +1000 powerpc: Fix define_machine so machine_is() works from modules machine_is() was always returning 0 when used in a module, because we weren't exporting the machine definitions. This was why sound wasn't working on powermacs when CONFIG_SND_POWERMAC=m. Original fix from Ben Herrenschmidt, further fixed by me. Signed-off-by: Paul Mackerras <pa...@sa...> commit 93e1b7d42e1edb4ddde6257e9a02513fef26f715 Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:39:52 2006 -0700 [PATCH] tpm: add HID module parameter I recently found that not all BIOS manufacturers are using the specified generic PNP id in their TPM ACPI table entry. I have added the vendor specific IDs that I know about and added a module parameter that a user can specify another HID to the probe list if their device isn't being found by the default list. Signed-off-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 5713556843aee24f484f445db6540f9fef976439 Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:39:44 2006 -0700 [PATCH] tpm: add interrupt module parameter This patch adds a boolean module parameter that allows the user to turn interrupt support on and off. The default behavior is to attempt to use interrupts. Signed-off-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit cb5354253af2bc30ed449b8be4b3bddf3b3a2746 Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:39:31 2006 -0700 [PATCH] tpm: spacing cleanups 2 Fixes minor spacing issues. Signed-off-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 397c718299d848ff305ecd955838a9bd32f1f881 Author: Randy Dunlap <rd...@xe...> Date: Sat Apr 22 02:39:18 2006 -0700 [PATCH] tpm_infineon section fixup Use __devexit_p() for the exit/remove function to protect against discarding it. WARNING: drivers/char/tpm/tpm_infineon.o - Section mismatch: reference to .exit.text:tpm_inf_pnp_remove from .data between 'tpm_inf_pnp' (at offset 0x20) and 'tpm_inf' Signed-off-by: Randy Dunlap <rd...@xe...> Cc: Kylene Jo Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 8b006db604527c566dc1dd0aebae37714143aaef Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:39:07 2006 -0700 [PATCH] tpm: update bios log code for 1.2 The acpi table which contains the BIOS log events was updated for 1.2. There are now client and server modes as defined in the specifications with slightly different formats. Additionally, the start field was even too small for the 1.1 version but had been working anyway. This patch updates the code to deal with any of the three types of headers probperly (1.1, 1.2 client and 1.2 server). Signed-off-by: Kylie Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit b09d53009db21228adde29b468eb4583e66cbe7c Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:38:55 2006 -0700 [PATCH] tpm: check mem start and len The memory start and length values obtained from the ACPI entry need to be checked and filled in with the default values from the specification if they don't exist. This patch fills in the default values and uses them appropriately. Signed-off-by: Kylie Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit e496f540540f0a0bffcc3f83785f9954dacf1b83 Author: Marcel Selhorst <sel...@cr...> Date: Sat Apr 22 02:38:42 2006 -0700 [PATCH] tpm: tpm_infineon updated to latest interface changes Apply the latest changes in the TPM interface to the Infineon TPM-driver. Signed-off-by: Marcel Selhorst <sel...@cr...> Acked-by: Kylie Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 10685a95301d02fde2b10f6047e405c69d2af82a Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:38:32 2006 -0700 [PATCH] tpm: use clear_bit Use set_bit() and clear_bit() for dev_mask manipulation. Signed-off-by: Kylie Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 36b20020e537036c4f9eb5b69140c88ead5da7dc Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:38:19 2006 -0700 [PATCH] tpm: msecs_to_jiffies cleanups The timeout and duration values used in the tpm driver are not exposed to userspace. This patch converts the storage units to jiffies with msecs_to_jiffies. They were always being used in jiffies so this simplifies things removing the need for calculation all over the place. The change necessitated a type change in the tpm_chip struct to hold jiffies. Signed-off-by: Kylie Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 27084efee0c3dc0eb15b5ed750aa9f1adb3983c3 Author: Leendert van Doorn <lee...@wa...> Date: Sat Apr 22 02:38:03 2006 -0700 [PATCH] tpm: driver for next generation TPM chips The driver for the next generation of TPM chips version 1.2 including support for interrupts. The Trusted Computing Group has written the TPM Interface Specification (TIS) which defines a common interface for all manufacturer's 1.2 TPM's thus the name tpm_tis. Signed-off-by: Leendert van Doorn <lee...@wa...> Signed-off-by: Kylene Hall <kj...@us...> Cc: Greg KH <gr...@kr...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 08e96e486dd1345ae0ad70247387d0d4fd346889 Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:37:50 2006 -0700 [PATCH] tpm: new 1.2 sysfs files Many of the sysfs files were calling the TPM_GetCapability command with array. Since for 1.2 more sysfs files of this type are coming I am generalizing the array so there can be one array and the unique parts can be filled in just before the command is called. This updated version of the patch breaks the multi-value sysfs file into separate files pointed out by Greg. It also addresses the code redundancy and ugliness in the tpm_show_* functions pointed out on another patch by Dave Hansen. Signed-off-by: Kylene Hall <kj...@us...> Cc: Greg KH <gr...@kr...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 9e18ee19179a7742999d0e2d4bfcba75b5562439 Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:37:38 2006 -0700 [PATCH] tpm: command duration update With the TPM 1.2 Specification, each command is classified as short, medium or long and the chip tells you the maximum amount of time for a response to each class of command. This patch provides and array of the classifications and a function to determine how long the response should be waited for. Also, it uses that information in the command processing to determine how long to poll for. The function is exported so the 1.2 driver can use the functionality to determine how long to wait for a DataAvailable interrupt if interrupts are being used. Signed-off-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit e0dd03caf20d040a0a86b6bd74028ec9bda545f5 Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:37:26 2006 -0700 [PATCH] tpm: return chip from tpm_register_hardware Changes in the 1.2 TPM Specification make it necessary to update some fields of the chip structure in the initialization function after it is registered with tpm.c thus tpm_register_hardware was modified to return a pointer to the structure. This patch makes that change and the associated changes in tpm_atmel and tpm_nsc. The changes to tpm_infineon will be coming in a patch from Marcel Selhorst. Signed-off-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 90dda520c1962d55a0e1d2571deed0d75fd6d6f1 Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:37:15 2006 -0700 [PATCH] tpm: chip struct update To assist with chip management and better support the possibility of having multiple TPMs in the system of the same kind, the struct tpm_vendor_specific member of the tpm_chip was changed from a pointer to an instance. This patch changes that declaration and fixes up all accesses to the structure member except in tpm_infineon which is coming in a patch from Marcel Selhorst. Signed-off-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit beed53a1aaeaae4eb93297c23f1598a726716adf Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:37:05 2006 -0700 [PATCH] tpm: reorganize sysfs files Many of the sysfs files were calling the TPM_GetCapability command with array. Since for 1.2 more sysfs files of this type are coming I am generalizing the array so there can be one array and the unique parts can be filled in just before the command is called. Signed-off-by: Kylene Hall <kj...@us...> Cc: Greg KH <gr...@kr...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 3c2f606a098b07f053904ec8b8f4d0e101c28b35 Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:36:56 2006 -0700 [PATCH] tpm: spacing cleanups The following patch set contains numerous changes to the base tpm driver (tpm.c) to support the next generation of TPM chips. The changes include new sysfs files because of more relevant data being available, a function to access the timeout and duration values for the chip, and changes to make use of those duration values. Duration in the TPM specification is defined as the maximum amount of time the chip could take to return the results. Commands are in one of three categories short, medium and long. Also included are cleanups of how the commands for the sysfs files are composed to reduce a bunch of redundant arrays. This patch: Fix minor spacing issues. Signed-off-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 7c69a47f1badf40dfa2febac71df98d32b1b56d7 Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:36:46 2006 -0700 [PATCH] tpm: fix missing string A string corresponding to the tcpa_pc_event_id POST_CONTENTS was missing causing an overflow bug when access was attempted in the get_event_name function. This bug was found by Coverity. Signed-off-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 59e89f3a091d5cf93f4b176aedcfded61ece5252 Author: Kylene Jo Hall <kj...@us...> Date: Sat Apr 22 02:36:35 2006 -0700 [PATCH] tpm: fix memory leak The eventname was kmalloc'd and not freed in the *_show functions. This bug was found by Coverity. Signed-off-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit b9251b823b5e921c894eb135cb6c64abf483f50e Author: Jan Kara <ja...@su...> Date: Sat Apr 22 02:36:24 2006 -0700 [PATCH] Fix reiserfs deadlock reiserfs_cache_default_acl() should return whether we successfully found the acl or not. We have to return correct value even if reiserfs_get_acl() returns error code and not just 0. Otherwise callers such as reiserfs_mkdir() can unnecessarily lock the xattrs and later functions such as reiserfs_new_inode() fail to notice that we have already taken the lock and try to take it again with obvious consequences. Signed-off-by: Jan Kara <ja...@su...> Cc: <rei...@na...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 8c4335a87c9785d2102ab23f09393038e1663314 Author: ak...@os... <ak...@os...> Date: Sat Apr 22 02:36:15 2006 -0700 [PATCH] Altix snsc: duplicate kobject fix from: Greg Howard <gh...@sg...> Fix Altix system controller (snsc) device names to include the slot number of the blade whose associated system controller is the target of the device interface. Including the slot number avoids a problem we're currently having where slots within the same enclosure are attempting to create multiple kobjects with identical names. Signed-off-by: Greg Howard <gh...@sg...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 5b20192727ef2c047343a043ee4fbda67e2beef4 Author: Mike Waychison <mi...@go...> Date: Sat Apr 22 02:36:06 2006 -0700 [PATCH] x86_64: Fix a race in the free_iommu path We do this by removing a micro-optimization that tries to avoid grabbing the iommu_bitmap_lock spinlock and using a bus-locked operation. This still races with other simultaneous alloc_iommu or free_iommu(size > 1) which both use bus-unlocked operations. The end result of this race is eventually ending up with an iommu_gart_bitmap that has bits errornously set all over, making large contiguous iommu space allocations fail with 'PCI-DMA: Out of IOMMU space'. Signed-off-by: Mike Waychison <mi...@go...> Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit ddbe3eec596fc2c6a513717168217bd19c901880 Author: Andi Kleen <ak...@su...> Date: Sat Apr 22 02:35:57 2006 -0700 [PATCH] x86_64: Pass -32 to the assembler when compiling the 32bit vsyscall pages This quietens warnings and actually fixes a bug. The unwind tables would come out wrong without -32, causing pthread cancellation during them to crash in the gcc runtime. The problem seems to only happen with newer binutils (it doesn't happen with 2.16.91.0.2 but happens wit 2.16.91.0.5) Thanks to David Altobelli <dav...@hp...> and Brian Baker <Br...@hp...> for test case and initial analysis. Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 304dbdb7a4fbb7f40a6ad5c5836fdd456c233c63 Author: Lee Schermerhorn <Lee...@hp...> Date: Sat Apr 22 02:35:48 2006 -0700 [PATCH] add migratepage address space op to shmem Basic problem: pages of a shared memory segment can only be migrated once. In 2.6.16 through 2.6.17-rc1, shared memory mappings do not have a migratepage address space op. Therefore, migrate_pages() falls back to default processing. In this path, it will try to pageout() dirty pages. Once a shared memory page has been migrated it becomes dirty, so migrate_pages() will try to page it out. However, because the page count is 3 [cache + current + pte], pageout() will return PAGE_KEEP because is_page_cache_freeable() returns false. This will abort all subsequent migrations. This patch adds a migratepage address space op to shared memory segments to avoid taking the default path. We use the "migrate_page()" function because it knows how to migrate dirty pages. This allows shared memory segment pages to migrate, subject to other conditions such as # pte's referencing the page [page_mapcount(page)], when requested. I think this is safe. If we're migrating a shared memory page, then we found the page via a page table, so it must be in memory. Can be verified with memtoy and the shmem-mbind-test script, both available at: http://free.linux.hp.com/~lts/Tools/ Signed-off-by: Lee Schermerhorn <lee...@hp...> Acked-by: Christoph Lameter <cla...@sg...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 3b5fd59fdd2e656dd4d10f2cedb41a7519b131b2 Author: Andy Whitcroft <ap...@sh...> Date: Sat Apr 22 02:35:41 2006 -0700 [PATCH] x86_64: sparsemem does not need node_mem_map Seems we are trying to init the node_mem_map when we don't need to, for example when SPARSEMEM is enabled. This causes the error below during compilation. Use CONFIG_FLAT_NODE_MEM_MAP to gate allocation and init. arch/x86_64/mm/numa.c: In function `setup_node_zones': arch/x86_64/mm/numa.c:191: error: structure has no member named `node_mem_map' Signed-off-by: Andy Whitcroft <ap...@sh...> Acked-by: Andi Kleen <ak...@mu...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 73a88814542d3f5b8973f3db9d7f380bd29957c4 Author: Tilman Schmidt <ti...@im...> Date: Sat Apr 22 02:35:30 2006 -0700 [PATCH] isdn4linux: Siemens Gigaset base driver: fix disconnect handling Fix a possible Oops in the Siemens Gigaset base driver when the device is unplugged while an ISDN connection is still active, and makes sure that the isdn4linux link level (LL) is properly informed if a connection is broken by the USB cable being unplugged. - Avoid unsafe checks of URB status fields outside the URB completion handlers, keep track of in-use URBs myself instead. - If an isochronous transfer URB completes with status==0, also check the status of the frame descriptors. - Verify length of interrupt messages received from the device. - Align the length limit on transmitted AT commands with the device documentation. - In case of AT response receive overrun, keep newly arrived instead of old unread data. - Remove redundant check of device ID in the USB probe function. - Correct and improve some comments and formatting. Signed-off-by: Tilman Schmidt <ti...@im...> Acked-by: Hansjoerg Lipp <hj...@we...> Cc: Karsten Keil <kk...@su...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 60808233f374aebba26488d06a5f25443f6763c3 Author: Steve French <sf...@us...> Date: Sat Apr 22 15:53:05 2006 +0000 [CIFS] Readdir fixes to allow search to start at arbitrary position in directory Also includes first part of fix to compensate for servers which forget to return . and .. as well as updates to changelog and cifs readme. Signed-off-by: Steve French <sf...@us...> commit 7c8ce71b092425f1e938285cab2a679c09444d9b Merge: 4d6c588... 12df755... Author: Paul Mackerras <pa...@sa...> Date: Sat Apr 22 19:19:06 2006 +1000 Merge branch 'misc' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge commit 45af7a0f2ebad1304cab956e15f0b37318226fcd Author: Steve French <sf...@us...> Date: Fri Apr 21 22:52:25 2006 +0000 [CIFS] Use the kthread_ API instead of opencoding lots of hairy code for kernel thread creation and teardown. It does not move the cifsd thread handling to kthread due to problems found in testing with wakeup of threads blocked in the socket peek api, but the other cifs kernel threads now use kthread. Also cleanup cifs_init to properly unwind when thread creation fails. Signed-off-by: Christoph Hellwig <hc...@ls...> Signed-off-by: Steve French <sf...@us...> commit 48b950ff241fca03a6969a5eb6a42a02722678d4 Author: Daniel Ritz <dan...@sw...> Date: Fri Apr 14 17:42:13 2006 +0200 [PATCH] pcmcia/pcmcia_resource.c: fix crash when using Cardbus cards Using the old ioctl interface together with cardbus card gives a NULL pointer dereference since cardbus devices don't have a struct pcmcia_device. also s->io[0].res can be NULL as well. Fix is to move the pcmcia code after the cardbus code and to check for a null pointer. Signed-off-by: Daniel Ritz <dan...@gm...> Signed-off-by: Dominik Brodowski <li...@do...> commit daaeb72bdf22873e6fa6497550c9e1d9a8825fea Author: Yoichi Yuasa <yoi...@tr...> Date: Thu Apr 6 15:08:29 2006 +0900 [PATCH] vrc4171: update config This patch updates "depends on" for PCMCIA_VRC4171. CONFIG_VRC4171 has been removed, so replace it with CPU_VR41XX && ISA. Signed-off-by: Yoichi Yuasa <yoi...@tr...> Signed-off-by: Dominik Brodowski <li...@do...> commit 2aff541c691b28cecb95ce710c367d16c0a84d8c Author: Dominik Brodowski <li...@do...> Date: Thu Apr 13 19:06:49 2006 +0200 [PATCH] pcmcia: fix oops in static mapping case As static maps do not have IO resources, this setting oopses. However, as we do not ever read this value, we can safely remove it. Signed-off-by: Dominik Brodowski <li...@do...> commit 80a55e923c76e022de298929e0c09bcca5c247d9 Author: Andrew Morton <ak...@os...> Date: Mon Apr 10 23:24:57 2006 -0700 [PATCH] pcmcia: remove unneeded forward declarations Also remove a couple of unneeded typecasts. Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit a0aab14322a74ab5665704c6155bf48fbc38f445 Author: Dominik Brodowski <li...@do...> Date: Tue Apr 4 11:09:26 2006 +0200 [PATCH] pcmcia: do not set dev_node to NULL too early If we set dev_node to NULL too early, some drivers which used this to determine whether unregister_netdev() needs to be called fail when removing a PCMCIA card. Signed-off-by: Dominik Brodowski <li...@do...> commit 90ff87008df12da7f2486178d0dee13745c1de6b Author: Komuro <kom...@ni...> Date: Sun Mar 12 11:32:07 2006 +0900 [PATCH] pcmcia: fix comment for pcmcia_load_firmware The comment of "pcmcia_load_firmware" is wrong: the firmware(*.cis) files reside in /lib/firmware/ _not_ /lib/firmware/cis/ . Signed-off-by: kom...@ni... Signed-off-by: Dominik Brodowski <li...@do...> commit 6171b88b436ceb91d602ca570e63a0dcdd56648e Author: Komuro <kom...@ni...> Date: Sun Apr 2 17:39:27 2006 +0900 [PATCH] pcmcia: unload second device first Use list_add instead of list_add_tail for pcmcia_device_add so that second device of multi-function-card will be unloaded first. Signed-off-by: kom...@ni... Signed-off-by: Dominik Brodowski <li...@do...> commit 6542729809baa3674b16a76a68346f449266c6dd Author: Dominik Brodowski <li...@do...> Date: Tue Apr 4 10:17:52 2006 +0200 [PATCH] pcmcia: add new ID to pcnet_cs This adds a new ID to pcnet_cs, as noted by Kuro Moji. Signed-off-by: Dominik Brodowski <li...@do...> commit 223232de068593b40d267e340f24c017d31c018a Author: Kyle McMartin <ky...@pa...> Date: Fri Apr 21 16:54:23 2006 -0400 [PARISC] MAINTAINERS Add myself to maintainers and add the parisc trees. Acked-by: Matthew Wilcox <wi...@pa...> Signed-off-by: Kyle McMartin <ky...@pa...> commit 1b52d7c2210b9... [truncated message content] |