From: Jan-Benedict G. <jb...@he...> - 2006-10-30 21:17:24
|
Documentation/DocBook/Makefile | 2 Documentation/DocBook/filesystems.tmpl | 101 +++ Documentation/DocBook/kernel-api.tmpl | 60 - arch/arm/Makefile | 6 arch/arm/configs/realview-smp_defconfig | 994 ++++++++++++++++++++++++++++++++ arch/arm/kernel/smp.c | 20 arch/arm/kernel/time.c | 3 arch/arm/mach-iop32x/n2100.c | 2 arch/arm/mach-sa1100/cpu-sa1110.c | 2 arch/arm/vfp/vfpdouble.c | 2 arch/arm/vfp/vfpmodule.c | 1 arch/cris/arch-v32/drivers/cryptocop.c | 1 arch/i386/kernel/apm.c | 2 arch/m68k/kernel/vmlinux-std.lds | 8 arch/m68k/kernel/vmlinux-sun3.lds | 8 arch/um/Makefile | 21 arch/um/Makefile-i386 | 4 arch/um/Makefile-x86_64 | 4 arch/um/os-Linux/sys-i386/tls.c | 3 arch/um/os-Linux/tls.c | 1 arch/um/sys-i386/unmap.c | 11 arch/um/sys-x86_64/unmap.c | 11 arch/x86_64/ia32/ia32_signal.c | 5 block/cfq-iosched.c | 10 drivers/bluetooth/bluecard_cs.c | 2 drivers/char/watchdog/sc1200wdt.c | 9 drivers/i2c/busses/i2c-pxa.c | 8 drivers/ide/pci/generic.c | 2 drivers/ieee1394/ohci1394.c | 19 drivers/isdn/gigaset/common.c | 2 drivers/md/dm-crypt.c | 11 drivers/message/i2o/exec-osm.c | 2 drivers/net/r8169.c | 38 - drivers/net/wireless/hostap/hostap_cs.c | 7 drivers/pcmcia/at91_cf.c | 28 drivers/pcmcia/au1000_generic.c | 25 drivers/pcmcia/ds.c | 29 drivers/pcmcia/i82092.c | 9 drivers/pcmcia/m8xx_pcmcia.c | 12 drivers/pcmcia/omap_cf.c | 3 drivers/pcmcia/pcmcia_ioctl.c | 11 drivers/pcmcia/pcmcia_resource.c | 2 drivers/pcmcia/pd6729.c | 4 drivers/pcmcia/pxa2xx_base.c | 41 - drivers/pcmcia/pxa2xx_base.h | 2 drivers/pcmcia/pxa2xx_lubbock.c | 2 drivers/pcmcia/soc_common.c | 1 drivers/pcmcia/yenta_socket.c | 22 drivers/scsi/dpt/dpti_i2o.h | 2 drivers/scsi/imm.c | 2 drivers/scsi/lpfc/lpfc_hbadisc.c | 2 drivers/scsi/lpfc/lpfc_sli.c | 4 drivers/scsi/ppa.c | 2 drivers/serial/ioc4_serial.c | 4 drivers/usb/net/usbnet.c | 2 include/asm-arm/uaccess.h | 20 include/linux/mtd/nand.h | 2 include/linux/wait.h | 9 kernel/module.c | 2 kernel/taskstats.c | 6 kernel/tsacct.c | 10 lib/Kconfig.debug | 2 mm/vmalloc.c | 2 net/sunrpc/svcauth.c | 4 net/sunrpc/svcsock.c | 31 65 files changed, 1392 insertions(+), 287 deletions(-) New commits: commit a7aacdf9ea45bf6139cfd750e558a3dcbc6f16c3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a7aacdf9ea45bf6139cfd750e558a3dcbc6f16c3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a7aacdf9ea45bf6139cfd750e558a3dcbc6f16c3 Author: Albert Cahalan <aca...@gm...> Date: Sun Oct 29 22:26:17 2006 -0500 [PATCH] fix i386 regparm=3 RT signal handlers on x86_64 The recent change to make x86_64 support i386 binaries compiled with -mregparm=3 only covered signal handlers without SA_SIGINFO. (the 3-arg "real-time" ones) This is useful for klibc at least. Signed-off-by: Albert Cahalan <aca...@gm...> Signed-off-by: Linus Torvalds <tor...@os...> commit 202dd450246cd658e298a86dddca5592fcb898cd gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=202dd450246cd658e298a86dddca5592fcb898cd gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=202dd450246cd658e298a86dddca5592fcb898cd Author: Andrew Morton <ak...@os...> Date: Sun Oct 29 22:57:57 2006 -0800 [PATCH] fix "sunrpc: fix refcounting problems in rpc servers" - printk should remain dprintk - fix coding-style. Cc: Neil Brown <ne...@su...> Cc: Trond Myklebust <tro...@fy...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 3f4b23e9833f0816b57d07401eac5e184b627fd7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3f4b23e9833f0816b57d07401eac5e184b627fd7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3f4b23e9833f0816b57d07401eac5e184b627fd7 Author: Kristian Mueller <Kri...@Kr...> Date: Sun Oct 29 22:46:46 2006 -0800 [PATCH] APM: URL of APM 1.2 specs has changed APM BIOS Interface Secification can now be found at http://www.microsoft.com/whdc/archive/amp_12.mspx Signed-off-by: Kristian Mueller <Kri...@Kr...> Acked-by: Stephen Rothwell <sf...@ca...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d6740df98e12a8e49ef3a699dcc1e2913f22c51b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d6740df98e12a8e49ef3a699dcc1e2913f22c51b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d6740df98e12a8e49ef3a699dcc1e2913f22c51b Author: Neil Brown <ne...@su...> Date: Sun Oct 29 22:46:45 2006 -0800 [PATCH] sunrpc: fix refcounting problems in rpc servers A recent patch fixed a problem which would occur when the refcount on an auth_domain reached zero. This problem has not been reported in practice despite existing in two major kernel releases because the refcount can never reach zero. This patch fixes the problems that stop the refcount reaching zero. 1/ We were adding to the refcount when inserting in the hash table, but only removing from the hashtable when the refcount reached zero. Obviously it never would. So don't count the implied reference of being in the hash table. 2/ There are two paths on which a socket can be destroyed. One called svcauth_unix_info_release(). The other didn't. So when the other was taken, we can lose a reference to an ip_map which in-turn holds a reference to an auth_domain So unify the exit paths into svc_sock_put. This highlights the fact that svc_delete_socket has slightly odd semantics - it does not drop a reference but probably should. Fixing this need a bit more thought and testing. Signed-off-by: Neil Brown <ne...@su...> Cc: Trond Myklebust <tro...@fy...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 2b52c9590d5ad2fb67b720ec12018dd2cf061480 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2b52c9590d5ad2fb67b720ec12018dd2cf061480 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2b52c9590d5ad2fb67b720ec12018dd2cf061480 Author: Sergey Vlasov <vs...@al...> Date: Sun Oct 29 22:46:44 2006 -0800 [PATCH] drivers/ide/pci/generic.c: add missing newline to the all-generic-ide message Signed-off-by: Sergey Vlasov <vs...@al...> Acked-by: Alan Cox <al...@re...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit f0ec1aaf54caddd21c259aea8b2ecfbde4ee4fb9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f0ec1aaf54caddd21c259aea8b2ecfbde4ee4fb9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f0ec1aaf54caddd21c259aea8b2ecfbde4ee4fb9 Author: Oleg Nesterov <ol...@tv...> Date: Sun Oct 29 22:46:43 2006 -0800 [PATCH] xacct_add_tsk: fix pure theoretical ->mm use-after-free Paranoid fix. The task can free its ->mm after the 'if (p->mm)' check. Signed-off-by: Oleg Nesterov <ol...@tv...> Cc: Shailabh Nagar <na...@wa...> Cc: Balbir Singh <ba...@in...> Cc: Jay Lan <jl...@sg...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d45e44d4be60ef508579001792f33753b5cb6d36 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d45e44d4be60ef508579001792f33753b5cb6d36 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d45e44d4be60ef508579001792f33753b5cb6d36 Author: ak...@os... <ak...@os...> Date: Sun Oct 29 22:46:42 2006 -0800 [PATCH] uml: fix compilation options for USER_OBJS From: Jeff Dike <jd...@ad...>, Paolo Giarrusso <bla...@ya...> Make sure that when compiling USER_OBJS the correct compilation options are passed; since they are compiled with USER_CFLAGS which is derived from CFLAGS, make sure it is a recursively evaluated variable, so that changes to CFLAGS done afterwards the inclusion of arch/$(ARCH)/Makefile are reflected in USER_CFLAGS. For instance, without this patch userspace objects are never compiled with debug info active. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit b428b51ed9a4ff8445ea50769961f948480c1d36 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b428b51ed9a4ff8445ea50769961f948480c1d36 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b428b51ed9a4ff8445ea50769961f948480c1d36 Author: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Date: Sun Oct 29 22:46:41 2006 -0800 [PATCH] Fix "Remove the use of _syscallX macros in UML" Fix commit 5f4c6bc1f369f20807a8e753c2308d1629478c61: it spits out warnings about missing syscall prototype (it is in <unistd.h>) and it does not recognize that two uses of _syscallX are to be resolved against kernel headers in the source tree, not against _syscallX; they in fact do not compile and would not work anyway. If _syscallX macros will be removed from the kernel tree altogether, the only reasonable solution for that piece of code is switching to open-coded inline assembly (it's remapping the whole executable from memory, except the page containing this code). Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit bbb5bbb037812ba36d638014a93134148a568684 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bbb5bbb037812ba36d638014a93134148a568684 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bbb5bbb037812ba36d638014a93134148a568684 Author: Randy Dunlap <ran...@or...> Date: Sun Oct 29 22:46:40 2006 -0800 [PATCH] docbook: make a filesystems book Make a filesystems DocBook book/file by moving all filesystems info from kernel-api.tmpl. Will also merge journal-api.tmpl into it soon (with permission from Roger Gammans). Localizes filesystem info and reduces size of the huge (produced) kernel-api output files. Signed-off-by: Randy Dunlap <ran...@or...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 351edd240d0ba8620789ca9e24f5a38b62157f23 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=351edd240d0ba8620789ca9e24f5a38b62157f23 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=351edd240d0ba8620789ca9e24f5a38b62157f23 Author: Randy Dunlap <ran...@or...> Date: Sun Oct 29 22:46:40 2006 -0800 [PATCH] MTD: fix last kernel-doc warning Fix the last current kernel-doc warning: Warning(/var/linsrc/linux-2619-rc3g5//include/linux/mtd/nand.h:416): No description found for parameter 'write_page' Signed-off-by: Randy Dunlap <ran...@or...> Cc: David Woodhouse <dw...@in...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit f8da1f746588ba997734274b4aadc5ae501fbd88 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f8da1f746588ba997734274b4aadc5ae501fbd88 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f8da1f746588ba997734274b4aadc5ae501fbd88 Author: Alexey Dobriyan <ado...@gm...> Date: Sun Oct 29 22:46:39 2006 -0800 [PATCH] cryptocop: double spin_lock_irqsave() Signed-off-by: Alexey Dobriyan <ado...@gm...> Cc: Mikael Starvik <st...@ax...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 7259f0d05d595b73ef312a082e628627c6414969 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7259f0d05d595b73ef312a082e628627c6414969 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7259f0d05d595b73ef312a082e628627c6414969 Author: Peter Zijlstra <a.p...@ch...> Date: Sun Oct 29 22:46:36 2006 -0800 [PATCH] lockdep: annotate DECLARE_WAIT_QUEUE_HEAD kernel: INFO: trying to register non-static key. kernel: the code is fine but needs lockdep annotation. kernel: turning off the locking correctness validator. kernel: [<c04051ed>] show_trace_log_lvl+0x58/0x16a kernel: [<c04057fa>] show_trace+0xd/0x10 kernel: [<c0405913>] dump_stack+0x19/0x1b kernel: [<c043b1e2>] __lock_acquire+0xf0/0x90d kernel: [<c043bf70>] lock_acquire+0x4b/0x6b kernel: [<c061472f>] _spin_lock_irqsave+0x22/0x32 kernel: [<c04363d3>] prepare_to_wait+0x17/0x4b kernel: [<f89a24b6>] lpfc_do_work+0xdd/0xcc2 [lpfc] kernel: [<c04361b9>] kthread+0xc3/0xf2 kernel: [<c0402005>] kernel_thread_helper+0x5/0xb Another case of non-static lockdep keys; duplicate the paradigm set by DECLARE_COMPLETION_ONSTACK and introduce DECLARE_WAIT_QUEUE_HEAD_ONSTACK. Signed-off-by: Peter Zijlstra <a.p...@ch...> Cc: Greg KH <gr...@su...> Cc: Markus Lidel <mar...@sh...> Acked-by: Ingo Molnar <mi...@el...> Cc: Arjan van de Ven <ar...@in...> Cc: James Bottomley <Jam...@st...> Cc: Marcel Holtmann <ma...@ho...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 70812522b847bdb8fabee963191734f5fa3143f3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=70812522b847bdb8fabee963191734f5fa3143f3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=70812522b847bdb8fabee963191734f5fa3143f3 Author: Akinobu Mita <aki...@gm...> Date: Sun Oct 29 22:46:35 2006 -0800 [PATCH] isdn/gigaset: avoid cs->dev null pointer dereference When gigaset_initbcs() is called, cs->dev is not initialized yet. If dev_alloc_skb() failed in this function, NULL poinster dereference will happen at dev_warn(). Cc: Kai Germaschewski <kai...@gm...> Cc: Hansjoerg Lipp <hj...@we...> Cc: Tilman Schmidt <ti...@im...> Acked-by: Karsten Keil <kk...@su...> Signed-off-by: Akinobu Mita <aki...@gm...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 0e2d57fc6e7dabdbfdd4f26c861e7e6c75d5bdcf gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0e2d57fc6e7dabdbfdd4f26c861e7e6c75d5bdcf gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0e2d57fc6e7dabdbfdd4f26c861e7e6c75d5bdcf Author: Randy Dunlap <ran...@or...> Date: Sun Oct 29 22:46:34 2006 -0800 [PATCH] ndiswrapper: don't set the module->taints flags For ndiswrapper, don't set the module->taints flags, just set the kernel global tainted flag. This should allow ndiswrapper to continue to use GPL symbols. Signed-off-by: Randy Dunlap <ran...@or...> Cc: Florin Malita <fm...@gm...> Cc: Alan Cox <al...@lx...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit a5a89bae0449634fdb7aa7cdb1c5ba154e4a789b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a5a89bae0449634fdb7aa7cdb1c5ba154e4a789b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a5a89bae0449634fdb7aa7cdb1c5ba154e4a789b Author: Andrew Morton <ak...@os...> Date: Sun Oct 29 22:46:33 2006 -0800 [PATCH] ioc4_serial: irq flags fix Use the correct type for the CPU flags. Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 37af6560f7978c60791b5f3df17ce8b3e97f2d6e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=37af6560f7978c60791b5f3df17ce8b3e97f2d6e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=37af6560f7978c60791b5f3df17ce8b3e97f2d6e Author: Christophe Saout <chr...@sa...> Date: Mon Oct 30 20:39:08 2006 +0100 [PATCH] Fix dmsetup table output change Fix dm-crypt after the block cipher API changes to correctly return the backwards compatible cipher-chainmode[-ivmode] format for "dmsetup table". Signed-off-by: Christophe Saout <chr...@sa...> Cc: Alasdair G Kergon <ag...@re...> Cc: Herbert Xu <he...@go...> Signed-off-by: Linus Torvalds <tor...@os...> diff linux-2.6.19-rc3.orig/drivers/md/dm-crypt.c linux-2.6.19-rc3/drivers/md/dm-crypt.c commit c1b707d253fe918b92882cff1dbd926b47e14fd2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c1b707d253fe918b92882cff1dbd926b47e14fd2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c1b707d253fe918b92882cff1dbd926b47e14fd2 Author: Jens Axboe <jen...@or...> Date: Mon Oct 30 19:54:23 2006 +0100 [PATCH] CFQ: bad locking in changed_ioprio() When the ioprio code recently got juggled a bit, a bug was introduced. changed_ioprio() is no longer called with interrupts disabled, so using plain spin_lock() on the queue_lock is a bug. Signed-off-by: Jens Axboe <jen...@or...> Signed-off-by: Linus Torvalds <tor...@os...> commit 0261d6886eb5822867a5310dc1e4479b940a1942 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0261d6886eb5822867a5310dc1e4479b940a1942 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0261d6886eb5822867a5310dc1e4479b940a1942 Author: Jens Axboe <jen...@or...> Date: Mon Oct 30 19:07:48 2006 +0100 [PATCH] CFQ: use irq safe locking in cfq_cic_link() If cfq_set_request() is called for a new process AND a non-fs io request (so that __GFP_WAIT may not be set), cfq_cic_link() may use spin_lock_irq() and spin_unlock_irq() with interrupts already disabled. Fix is to always use irq safe locking in cfq_cic_link() Acked-By: Arjan van de Ven <ar...@li...> Acked-by: Ingo Molnar <mi...@el...> Signed-off-by: Jens Axboe <jen...@or...> Signed-off-by: Linus Torvalds <tor...@os...> commit 209ad53bc19667a128d9c51beba873a5c62bff6e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=209ad53bc19667a128d9c51beba873a5c62bff6e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=209ad53bc19667a128d9c51beba873a5c62bff6e Author: Linus Torvalds <tor...@g5...> Date: Sun Oct 29 17:31:49 2006 -0800 Revert "r8169: mac address change support" This reverts commit a2b98a697fa4e7564f78905b83db122824916cf9. As per Guennadi Liakhovetski, the mac address change support code breaks some normal uses (_without_ any address changes), and until it's all sorted out, we're better off without it. Says Francois: "Go revert it. Despite what I claimed, I can not find a third-party confirmation by email that it works elsewhere. It would probably be enough to remove the call to __rtl8169_set_mac_addr() in rtl8169_hw_start() though." See also http://bugzilla.kernel.org/show_bug.cgi?id=6032 Cc: Guennadi Liakhovetski <g.l...@gm...> Acked-by: Francois Romieu <ro...@fr...> Signed-off-by: Linus Torvalds <tor...@os...> commit 9ca0e5474d11ca044e0aacfa6e78bf17957118d2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9ca0e5474d11ca044e0aacfa6e78bf17957118d2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9ca0e5474d11ca044e0aacfa6e78bf17957118d2 Merge: c0f79c4cb11acca545f9802ee0e14ad3b5cc123d 9f0f9313cec8c76c89bc8a68653f928fa12fab96 Author: Linus Torvalds <tor...@g5...> Date: Sun Oct 29 17:25:48 2006 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3914/1: [Jornada7xx] - Typo Fix in cpu-sa1110.c (b != B) [ARM] 3913/1: n2100: fix IRQ routing for second ethernet port [ARM] Add KBUILD_IMAGE target support [ARM] Fix suspend oops caused by PXA2xx PCMCIA driver [ARM] Fix i2c-pxa slave mode support [ARM] 3900/1: Fix VFP Division by Zero exception handling. [ARM] 3899/1: Fix the normalization of the denormal double precision number. [ARM] 3909/1: Disable UWIND_INFO for ARM (again) [ARM] Add __must_check to uaccess functions [ARM] Add realview SMP default configuration [ARM] Fix SMP irqflags support commit c0f79c4cb11acca545f9802ee0e14ad3b5cc123d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c0f79c4cb11acca545f9802ee0e14ad3b5cc123d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c0f79c4cb11acca545f9802ee0e14ad3b5cc123d Merge: 7a20655bc5316ccec0f036cde46e609ba5571f5e f901b8c46fa9748b9d6836e9b158cf7be89447f1 Author: Linus Torvalds <tor...@g5...> Date: Sun Oct 29 17:21:42 2006 -0800 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: fix __must_check warnings [PATCH] PCMCIA: handle sysfs, PCI errors [PATCH] Export soc_common_drv_pcmcia_remove to allow modular PCMCIA. [PATCH] ioremap balanced with iounmap for drivers/pcmcia [PATCH] pcmcia: au1000_generic fix [PATCH] i82092: wire up errors from pci_register_driver() [PATCH] CONFIG_PM=n slim: drivers/pcmcia/* [PATCH] pcmcia/ds: driver layer error checking [PATCH] pcmcia: update alloc_io_space for conflict checking for multifunction PC card [PATCH] pcmcia: add more IDs to hostap_cs.c [PATCH] pcmcia: at91_cf update commit 7a20655bc5316ccec0f036cde46e609ba5571f5e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7a20655bc5316ccec0f036cde46e609ba5571f5e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7a20655bc5316ccec0f036cde46e609ba5571f5e Merge: e6c9f716ba91c1e065b75949f643383d1888bed5 150ed8ed63b96d7f93ef7e6081797aa0df2b1abd Author: Linus Torvalds <tor...@g5...> Date: Sun Oct 29 13:53:05 2006 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] sc1200wdt.c pnp unregister fix. commit 9f0f9313cec8c76c89bc8a68653f928fa12fab96 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9f0f9313cec8c76c89bc8a68653f928fa12fab96 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9f0f9313cec8c76c89bc8a68653f928fa12fab96 Author: Kristoffer Ericson <Kristoffer_e1@com.rmk.(none)> Date: Sun Oct 29 22:38:08 2006 +0100 [ARM] 3914/1: [Jornada7xx] - Typo Fix in cpu-sa1110.c (b != B) "K4S281632b-1H" should read "K4S281632B-1H" (As it does everywhere else). No more coffe! Signed-off-by: Kristoffer Ericson <Kri...@ho...> Signed-off-by: Russell King <rmk...@ar...> commit e6c9f716ba91c1e065b75949f643383d1888bed5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e6c9f716ba91c1e065b75949f643383d1888bed5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e6c9f716ba91c1e065b75949f643383d1888bed5 Merge: 5fdb51a10f3ab4320c3170b79d66ce34a6e65a67 346f5c7ee7fa4ebee0e4c96415a7e59716bfa1d0 Author: Linus Torvalds <tor...@g5...> Date: Sun Oct 29 13:34:15 2006 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: ohci1394: revert fail on error in suspend commit 150ed8ed63b96d7f93ef7e6081797aa0df2b1abd gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=150ed8ed63b96d7f93ef7e6081797aa0df2b1abd gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=150ed8ed63b96d7f93ef7e6081797aa0df2b1abd Author: Akinobu Mita <aki...@gm...> Date: Sun Oct 29 03:43:19 2006 +0900 [WATCHDOG] sc1200wdt.c pnp unregister fix. If no devices found or invalid parameter is specified, scl200wdt_pnp_driver is left unregistered. It breaks global list of pnp drivers. Signed-off-by: Akinobu Mita <aki...@gm...> Signed-off-by: Wim Van Sebroeck <wi...@ig...> Signed-off-by: Andrew Morton <ak...@os...> commit 5fdb51a10f3ab4320c3170b79d66ce34a6e65a67 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5fdb51a10f3ab4320c3170b79d66ce34a6e65a67 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5fdb51a10f3ab4320c3170b79d66ce34a6e65a67 Author: Geert Uytterhoeven <ge...@li...> Date: Sun Oct 29 11:21:51 2006 +0100 [PATCH] m68k: consolidate initcall sections Commit 61ce1efe6e40233663d27ab8ac9ba9710eebcaad missed the m68k initcall sections. Signed-off-by: Geert Uytterhoeven <ge...@li...> Signed-off-by: Linus Torvalds <tor...@os...> commit 3d8334def5cf831d2ed438aae021696a2faa4ddd gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3d8334def5cf831d2ed438aae021696a2faa4ddd gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3d8334def5cf831d2ed438aae021696a2faa4ddd Author: Oleg Nesterov <ol...@tv...> Date: Sun Oct 29 18:57:16 2006 +0300 [PATCH] taskstats: fix sk_buff size calculation prepare_reply() adds GENL_HDRLEN to the payload (genlmsg_total_size()), but then it does genlmsg_put()->nlmsg_put(). This means we forget to reserve a room for 'struct nlmsghdr'. Signed-off-by: Oleg Nesterov <ol...@tv...> Cc: Thomas Graf <tg...@su...> Cc: Andrew Morton <ak...@os...> Cc: Shailabh Nagar <na...@wa...> Cc: Balbir Singh <ba...@in...> Cc: Jay Lan <jl...@sg...> Signed-off-by: Linus Torvalds <tor...@os...> commit d46a3d0d07ba539aea5b0e1ad30e568f0cb03576 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d46a3d0d07ba539aea5b0e1ad30e568f0cb03576 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d46a3d0d07ba539aea5b0e1ad30e568f0cb03576 Author: Oleg Nesterov <ol...@tv...> Date: Sun Oct 29 16:45:58 2006 +0300 [PATCH] taskstats: fix sk_buff leak 'return genlmsg_cancel()' in taskstats_user_cmd/taskstats_exit_send potentially leaks a skb. Unless we pass 'rep_skb' to the netlink layer we own sk_buff. This means we should always do kfree_skb() on failure. [ Thomas acked and pointed out missing return value in original version ] Signed-off-by: Oleg Nesterov <ol...@tv...> Acked-by: Thomas Graf <tg...@su...> Cc: Andrew Morton <ak...@os...> Cc: Shailabh Nagar <na...@wa...> Cc: Balbir Singh <ba...@in...> Cc: Jay Lan <jl...@sg...> Signed-off-by: Linus Torvalds <tor...@os...> commit 346f5c7ee7fa4ebee0e4c96415a7e59716bfa1d0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=346f5c7ee7fa4ebee0e4c96415a7e59716bfa1d0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=346f5c7ee7fa4ebee0e4c96415a7e59716bfa1d0 Author: Stefan Richter <st...@s5...> Date: Sun Oct 29 19:52:49 2006 +0100 ieee1394: ohci1394: revert fail on error in suspend Some errors during preparation for suspended state can be skipped with a warning instead of a failure of the whole suspend transition, notably an error in pci_set_power_state. Signed-off-by: Stefan Richter <st...@s5...> commit 811c9a4b618ffc7de097490f8dc61b43b8464b9c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=811c9a4b618ffc7de097490f8dc61b43b8464b9c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=811c9a4b618ffc7de097490f8dc61b43b8464b9c Author: Lennert Buytenhek <buytenh@org.rmk.(none)> Date: Sun Oct 29 14:15:10 2006 +0100 [ARM] 3913/1: n2100: fix IRQ routing for second ethernet port The second ethernet port on the Thecus n2100 was incorrectly assigned to XINT1 instead of the correct XINT3 (PCI INTB instead of INTD), which caused that port to be non-functional. Signed-off-by: Lennert Buytenhek <bu...@wa...> Signed-off-by: Russell King <rmk...@ar...> commit 5211e6e6c671f0d4b1e1a1023384d20227d8ee65 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5211e6e6c671f0d4b1e1a1023384d20227d8ee65 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5211e6e6c671f0d4b1e1a1023384d20227d8ee65 Author: Giridhar Pemmasani <pg...@ya...> Date: Sun Oct 29 04:46:55 2006 -0800 [PATCH] Fix GFP_HIGHMEM slab panic As reported by Martin J. Bligh <mb...@go...>, we let through some non-slab bits to slab allocation through __get_vm_area_node when doing a vmalloc. I haven't been able to reproduce this, although I understand why it happens: vmalloc allocates memory with GFP_KERNEL | __GFP_HIGHMEM and commit 52fd24ca1db3a741f144bbc229beefe044202cac resulted in the same flags are passed down to cache_alloc_refill, causing the BUG. The following patch fixes it. Note that when calling kmalloc_node, I am masking off __GFP_HIGHMEM with GFP_LEVEL_MASK, whereas __vmalloc_area_node does the same with ~(__GFP_HIGHMEM | __GFP_ZERO). IMHO, using GFP_LEVEL_MASK is preferable, but either should fix this problem. Signed-off-by: Giridhar Pemmasani (pg...@ya...) Cc: Martin J. Bligh <mb...@go...> Cc: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 51342d7126342e1f1a40cd96a5798a3cfd6136eb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=51342d7126342e1f1a40cd96a5798a3cfd6136eb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=51342d7126342e1f1a40cd96a5798a3cfd6136eb Author: Russell King <rm...@dy...> Date: Sun Oct 29 12:51:05 2006 +0000 [ARM] Add KBUILD_IMAGE target support Add support for KBUILD_IMAGE on ARM. This takes the usual target specifiers (zImage/Image/etc) in the same way that powerpc does (iow, without the arch/arm/boot prefix). Signed-off-by: Russell King <rmk...@ar...> commit 9468613b2bb0a386af563953b613efc6c77bd8c1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9468613b2bb0a386af563953b613efc6c77bd8c1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9468613b2bb0a386af563953b613efc6c77bd8c1 Author: Russell King <rm...@dy...> Date: Sat Oct 28 22:42:56 2006 +0100 [ARM] Fix suspend oops caused by PXA2xx PCMCIA driver The PXA2xx PCMCIA driver was registering a device_driver with the platform_bus_type. Unfortunately, this causes data outside the device_driver structure to be dereferenced as if it were a platform_driver structure, causing an oops. Convert the PXA2xx core driver to use the proper platform_driver structure. Signed-off-by: Russell King <rmk...@ar...> commit 84b5abe69ff600a559e1a1fa29f1edad707d4e2f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=84b5abe69ff600a559e1a1fa29f1edad707d4e2f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=84b5abe69ff600a559e1a1fa29f1edad707d4e2f Author: Russell King <rm...@dy...> Date: Sat Oct 28 22:30:17 2006 +0100 [ARM] Fix i2c-pxa slave mode support i2c-pxa times out when trying to enable slave mode due to an incorrect test. Also, check that i2c->slave is non-NULL before dereferencing it. Signed-off-by: Russell King <rmk...@ar...> commit e0f205d9c656da9dad6340f75e33a96014b7d23f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e0f205d9c656da9dad6340f75e33a96014b7d23f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e0f205d9c656da9dad6340f75e33a96014b7d23f Author: Takashi Ohmasa <ohmasa.takashi@com.rmk.(none)> Date: Mon Oct 23 11:19:40 2006 +0100 [ARM] 3900/1: Fix VFP Division by Zero exception handling. The SIGFPE signal should be generated if Division by Zero exception is detected. Signed-off-by: Takashi Ohmasa <ohm...@jp...> Signed-off-by: Russell King <rmk...@ar...> commit e816d71a50a714b532e3965364f3f53c23a53d42 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e816d71a50a714b532e3965364f3f53c23a53d42 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e816d71a50a714b532e3965364f3f53c23a53d42 Author: Takashi Ohmasa <ohmasa.takashi@com.rmk.(none)> Date: Mon Oct 23 08:30:35 2006 +0100 [ARM] 3899/1: Fix the normalization of the denormal double precision number. The significand should be shifted until the value of bit [62] is 1 to normalize the denormal double number. Signed-off-by: Takashi Ohmasa <ohm...@jp...> Signed-off-by: Russell King <rmk...@ar...> commit 75e31aaaf43b53517fd2b36cedc08bd4e4af14d5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=75e31aaaf43b53517fd2b36cedc08bd4e4af14d5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=75e31aaaf43b53517fd2b36cedc08bd4e4af14d5 Author: Kevin Hilman <khilman@com.rmk.(none)> Date: Wed Oct 25 23:07:50 2006 +0100 [ARM] 3909/1: Disable UWIND_INFO for ARM (again) According to Daniel Jacobowitz, UNWIND_INFO is not useful on ARM, and in fact doesn't even compile. This patch disables the option for ARM. Signed-off-by: Kevin Hilman <kh...@mv...> Signed-off-by: Russell King <rmk...@ar...> commit 9957329800b8b554b1af669bcc6878282338c34e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9957329800b8b554b1af669bcc6878282338c34e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9957329800b8b554b1af669bcc6878282338c34e Author: Russell King <rm...@dy...> Date: Thu Oct 26 10:27:42 2006 +0100 [ARM] Add __must_check to uaccess functions Signed-off-by: Russell King <rmk...@ar...> commit a233bf9ee819c726c581af48010e0c0f1cdde245 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a233bf9ee819c726c581af48010e0c0f1cdde245 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a233bf9ee819c726c581af48010e0c0f1cdde245 Author: Russell King <rm...@dy...> Date: Wed Oct 25 14:25:52 2006 +0100 [ARM] Add realview SMP default configuration Signed-off-by: Russell King <rmk...@ar...> commit c97d4869a23c439d2bc23cb26c1147c099f9ff78 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c97d4869a23c439d2bc23cb26c1147c099f9ff78 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c97d4869a23c439d2bc23cb26c1147c099f9ff78 Author: Russell King <rm...@dy...> Date: Wed Oct 25 13:59:16 2006 +0100 [ARM] Fix SMP irqflags support The IRQ changes a while back broke the build for SMP machines. Fix up the SMP code to use set_irq_regs/get_irq_regs as appropriate. Also, fix a warning in arch/arm/kernel/time.c where 'regs' becomes unused for SMP builds. Signed-off-by: Russell King <rmk...@ar...> commit f901b8c46fa9748b9d6836e9b158cf7be89447f1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f901b8c46fa9748b9d6836e9b158cf7be89447f1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f901b8c46fa9748b9d6836e9b158cf7be89447f1 Author: Dominik Brodowski <li...@do...> Date: Wed Oct 25 19:56:55 2006 -0400 [PATCH] PCMCIA: fix __must_check warnings Fix the remaining __must_check warnings in the PCMCIA core. Signed-off-by: Dominik Brodowski <li...@do...> commit 4deb7c1ed2b622b565c5330b475adc5a6cea30da gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4deb7c1ed2b622b565c5330b475adc5a6cea30da gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4deb7c1ed2b622b565c5330b475adc5a6cea30da Author: Jeff Garzik <je...@ga...> Date: Fri Oct 20 14:44:23 2006 -0700 [PATCH] PCMCIA: handle sysfs, PCI errors Handle sysfs and PCI errors correctly. Signed-off-by: Jeff Garzik <je...@ga...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit 26aaa3c202fb3bec8d6c6619122442d476f55658 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=26aaa3c202fb3bec8d6c6619122442d476f55658 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=26aaa3c202fb3bec8d6c6619122442d476f55658 Author: Jonathan McDowell <no...@ea...> Date: Fri Oct 20 14:44:19 2006 -0700 [PATCH] Export soc_common_drv_pcmcia_remove to allow modular PCMCIA. Allow a modular sa1100_cs. Signed-off-by: Jonathan McDowell <no...@ea...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit 3efa9970bd0ac731302224ab9243693e91bc4bea gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3efa9970bd0ac731302224ab9243693e91bc4bea gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3efa9970bd0ac731302224ab9243693e91bc4bea Author: Amol Lad <am...@ve...> Date: Fri Oct 20 14:44:18 2006 -0700 [PATCH] ioremap balanced with iounmap for drivers/pcmcia ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Signed-off-by: Amol Lad <am...@ve...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit a230a6785dd5af84b8b043a64d8df8adc81f3724 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a230a6785dd5af84b8b043a64d8df8adc81f3724 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a230a6785dd5af84b8b043a64d8df8adc81f3724 Author: Om Narasimhan <om....@gm...> Date: Fri Oct 20 14:44:15 2006 -0700 [PATCH] pcmcia: au1000_generic fix The previous code did something like, if (error) goto out_err; .... do { struct au1000_pcmcia_socket *skt = PCMCIA_SOCKET(i); del_timer_sync(&skt->poll_timer); pcmcia_unregister_socket(&skt->socket); out_err: flush_scheduled_work(); ops->hw_shutdown(skt); i--; } while (i > 0) ..... - On the error path, skt would not contain a valid value for the first iteration (skt is masked by uninitialized automatic skt) - Does not do hw_shutdown() for 0th element of PCMCIA_SOCKET Signed-off-by: Om Narasimhan <om....@gm...> Cc: "Yoichi Yuasa" <yoi...@tr...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit f465ce176fb2f1778a04fc3fcb2b8aa564901419 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f465ce176fb2f1778a04fc3fcb2b8aa564901419 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f465ce176fb2f1778a04fc3fcb2b8aa564901419 Author: Alexey Dobriyan <ado...@gm...> Date: Fri Oct 20 14:44:13 2006 -0700 [PATCH] i82092: wire up errors from pci_register_driver() debugging goo removed to not leave assymetry in it after possible "leave" removal. Signed-off-by: Alexey Dobriyan <ado...@gm...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit f237de58b13bf65ba2f7fab896daacb92ae7ddef gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f237de58b13bf65ba2f7fab896daacb92ae7ddef gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f237de58b13bf65ba2f7fab896daacb92ae7ddef Author: Alexey Dobriyan <ado...@gm...> Date: Fri Oct 20 14:44:13 2006 -0700 [PATCH] CONFIG_PM=n slim: drivers/pcmcia/* Remove some code which is unneeded if CONFIG_PM=n. Signed-off-by: Alexey Dobriyan <ado...@gm...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit ace7d4772cf056d9b13b51bd496a8be968774592 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ace7d4772cf056d9b13b51bd496a8be968774592 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ace7d4772cf056d9b13b51bd496a8be968774592 Author: Randy Dunlap <rd...@xe...> Date: Fri Oct 20 14:44:12 2006 -0700 [PATCH] pcmcia/ds: driver layer error checking Check driver layer return values in pcmcia/ds.c Signed-off-by: Randy Dunlap <rd...@xe...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit 4708b5faf7c53bb4128d34267bdfe4b8c74b488a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4708b5faf7c53bb4128d34267bdfe4b8c74b488a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4708b5faf7c53bb4128d34267bdfe4b8c74b488a Author: Kaustav Majumdar <kau...@wi...> Date: Fri Oct 20 14:44:09 2006 -0700 [PATCH] pcmcia: update alloc_io_space for conflict checking for multifunction PC card Some PCMCIA cards do not mention specific IO addresses in the CIS. In that case, inside the alloc_io_space function, conflicts are detected (the function returns 1) for the second function of a multifunction card unless the length of IO address range required is greater than 0x100. The following patch will remove this conflict checking for a PCMCIA function which had not mentioned any specific IO address to be mapped from. The patch is tested for Linux kernel 2.6.15.4 and works fine in the above case and is as suggested by Dave Hinds. Signed-off-by: Kaustav Majumdar <kau...@wi...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit 01918d16c837485ceba92d48fb734cf520e61144 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=01918d16c837485ceba92d48fb734cf520e61144 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=01918d16c837485ceba92d48fb734cf520e61144 Author: Dominik Brodowski <li...@do...> Date: Sun Jul 2 21:21:51 2006 +0200 [PATCH] pcmcia: add more IDs to hostap_cs.c As a replacement for the broad manufactor/card ID match we commented out because of conflicts with pcnet_cs, add two product ID matches. Signed-off-by: Dominik Brodowski <li...@do...> commit 1fbece150a230d0ab447cfb2fc4df10fb89f0d8c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1fbece150a230d0ab447cfb2fc4df10fb89f0d8c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1fbece150a230d0ab447cfb2fc4df10fb89f0d8c Author: David Brownell <da...@pa...> Date: Sat Jul 1 13:39:55 2006 -0700 [PATCH] pcmcia: at91_cf update More correct AT91 CF wakeup logic ... only enable/disable the IRQ wakeup capability, not the IRQ itself. That way the we know that the IRQ will be disabled correctly, in suspend/resume logic instead of ARM IRQ code. Most of the pin multiplexing setup has moved to the devices.c setup code. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Andrew Victor <an...@sa...> Signed-off-by: Dominik Brodowski <li...@do...> |