From: Jan-Benedict G. <jb...@he...> - 2006-05-06 23:00:31
|
CREDITS | 10 Documentation/sound/alsa/Audiophile-Usb.txt | 81 +- Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 4 arch/arm/Kconfig | 2 arch/arm/boot/compressed/misc.c | 4 arch/arm/kernel/asm-offsets.c | 6 arch/arm/kernel/head-nommu.S | 4 arch/arm/kernel/head.S | 8 arch/arm/mach-imx/generic.c | 52 - arch/arm/mach-imx/mx1ads.c | 74 + arch/arm/mach-ixp4xx/Kconfig | 15 arch/arm/mach-ixp4xx/Makefile | 3 arch/arm/mach-pxa/dma.c | 17 arch/arm/vfp/vfpmodule.c | 2 arch/i386/kernel/acpi/boot.c | 5 arch/i386/kernel/apic.c | 4 arch/i386/kernel/ptrace.c | 7 arch/i386/kernel/setup.c | 4 arch/i386/kernel/timers/timer_tsc.c | 4 arch/i386/kernel/vm86.c | 2 arch/ia64/kernel/ptrace.c | 4 arch/mips/kernel/ptrace.c | 4 arch/powerpc/kernel/kprobes.c | 14 arch/powerpc/kernel/prom.c | 70 + arch/powerpc/kernel/ptrace.c | 5 arch/powerpc/kernel/sysfs.c | 18 arch/powerpc/mm/numa.c | 32 arch/powerpc/platforms/cell/Kconfig | 3 arch/powerpc/platforms/cell/setup.c | 78 -- arch/powerpc/platforms/cell/spu_base.c | 91 +- arch/powerpc/platforms/pseries/eeh_event.c | 8 arch/ppc/platforms/mpc866ads_setup.c | 2 arch/s390/kernel/ptrace.c | 5 arch/s390/kernel/signal.c | 5 arch/sparc/kernel/systbls.S | 2 arch/sparc64/kernel/ptrace.c | 5 arch/sparc64/kernel/sys32.S | 1 arch/sparc64/kernel/systbls.S | 4 arch/sparc64/mm/tlb.c | 5 arch/um/Kconfig | 14 arch/um/Kconfig.i386 | 19 arch/um/Makefile | 19 arch/um/defconfig | 240 ++++-- arch/um/drivers/cow_user.c | 2 arch/um/kernel/irq.c | 93 +- arch/um/kernel/physmem.c | 2 arch/um/kernel/ptrace.c | 6 arch/um/kernel/skas/Makefile | 10 arch/um/kernel/time_kern.c | 2 arch/um/os-Linux/file.c | 2 arch/um/os-Linux/irq.c | 47 - arch/um/os-Linux/main.c | 30 arch/um/os-Linux/process.c | 17 arch/um/os-Linux/skas/process.c | 6 arch/um/os-Linux/sys-i386/registers.c | 4 arch/um/os-Linux/sys-x86_64/registers.c | 4 arch/um/os-Linux/umid.c | 4 arch/um/os-Linux/user_syms.c | 7 arch/um/scripts/Makefile.rules | 12 arch/um/sys-i386/Makefile | 13 arch/um/sys-x86_64/Makefile | 13 arch/x86_64/ia32/ia32entry.S | 1 arch/x86_64/kernel/ptrace.c | 6 arch/x86_64/kernel/setup.c | 19 block/genhd.c | 2 drivers/char/genrtc.c | 8 drivers/char/keyboard.c | 38 - drivers/edac/e752x_edac.c | 17 drivers/infiniband/hw/ipath/ipath_debug.h | 15 drivers/infiniband/hw/ipath/ipath_diag.c | 3 drivers/infiniband/hw/ipath/ipath_driver.c | 18 drivers/infiniband/hw/ipath/ipath_init_chip.c | 36 drivers/infiniband/hw/ipath/ipath_intr.c | 21 drivers/infiniband/hw/ipath/ipath_kernel.h | 10 drivers/infiniband/hw/ipath/ipath_layer.c | 6 drivers/infiniband/hw/ipath/ipath_pe800.c | 4 drivers/infiniband/hw/ipath/ipath_registers.h | 31 drivers/infiniband/hw/ipath/ipath_ruc.c | 15 drivers/infiniband/hw/ipath/ipath_sysfs.c | 14 drivers/infiniband/hw/ipath/ipath_ud.c | 6 drivers/infiniband/hw/ipath/ipath_verbs.c | 39 - drivers/infiniband/hw/ipath/ipath_verbs.h | 3 drivers/infiniband/hw/ipath/ips_common.h | 2 drivers/infiniband/hw/mthca/mthca_provider.c | 2 drivers/input/evdev.c | 21 drivers/input/input.c | 11 drivers/input/keyboard/spitzkbd.c | 4 drivers/input/misc/wistron_btns.c | 30 drivers/input/mouse/psmouse-base.c | 4 drivers/input/touchscreen/ads7846.c | 414 ++++++++--- drivers/input/touchscreen/corgi_ts.c | 2 drivers/md/raid1.c | 29 drivers/md/raid10.c | 46 - drivers/media/video/cx88/cx88-alsa.c | 2 drivers/mmc/at91_mci.c | 3 drivers/mmc/au1xmmc.c | 4 drivers/mmc/imxmmc.c | 60 + drivers/mmc/mmc.c | 62 + drivers/mmc/mmc_block.c | 6 drivers/mmc/mmci.c | 3 drivers/mmc/pxamci.c | 13 drivers/mmc/sdhci.c | 4 drivers/mmc/wbsd.c | 4 drivers/net/forcedeth.c | 312 ++++++-- drivers/net/hamradio/dmascc.c | 1 drivers/net/hamradio/scc.c | 1 drivers/net/hamradio/yam.c | 1 drivers/net/mv643xx_eth.c | 2 drivers/net/tg3.c | 82 +- drivers/net/tg3.h | 1 drivers/net/via-rhine.c | 6 drivers/rtc/rtc-dev.c | 17 drivers/s390/net/qeth_main.c | 1 drivers/s390/s390mach.c | 3 drivers/serial/cpm_uart/cpm_uart.h | 19 drivers/serial/cpm_uart/cpm_uart_core.c | 37 drivers/serial/cpm_uart/cpm_uart_cpm1.c | 2 drivers/serial/cpm_uart/cpm_uart_cpm2.c | 2 drivers/serial/imx.c | 40 - drivers/sn/ioc3.c | 2 drivers/sn/ioc4.c | 2 fs/block_dev.c | 2 fs/compat.c | 20 fs/ext3/inode.c | 13 fs/pipe.c | 190 +++-- fs/splice.c | 207 ++--- include/asm-arm/arch-imx/imx-uart.h | 10 include/asm-arm/arch-ixp4xx/io.h | 7 include/asm-arm/arch-ixp4xx/memory.h | 2 include/asm-arm/arch-pxa/dma.h | 26 include/asm-arm/bug.h | 1 include/asm-arm/unistd.h | 23 include/asm-powerpc/spu.h | 1 include/asm-powerpc/topology.h | 24 include/asm-powerpc/uaccess.h | 19 include/asm-ppc/commproc.h | 1 include/asm-ppc/cpm2.h | 2 include/asm-sparc/unistd.h | 2 include/asm-sparc64/tlbflush.h | 2 include/asm-sparc64/unistd.h | 2 include/linux/audit.h | 22 include/linux/fs_uart_pd.h | 60 + include/linux/input.h | 109 +- include/linux/list.h | 2 include/linux/mmc/card.h | 1 include/linux/mod_devicetable.h | 48 + include/linux/netfilter/x_tables.h | 8 include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h | 2 include/linux/netlink.h | 1 include/linux/pipe_fs_i.h | 30 include/linux/security.h | 16 include/linux/selinux.h | 177 ++++ include/linux/spi/ads7846.h | 7 include/net/ax25.h | 10 include/net/inet_timewait_sock.h | 2 include/net/netrom.h | 8 include/net/rose.h | 14 include/net/sctp/structs.h | 1 include/net/sock.h | 2 include/sound/pcm.h | 6 include/sound/pcm_oss.h | 2 init/main.c | 2 ipc/msg.c | 11 ipc/sem.c | 11 ipc/shm.c | 19 ipc/util.c | 7 kernel/audit.c | 160 +++- kernel/audit.h | 10 kernel/auditfilter.c | 289 ++++++- kernel/auditsc.c | 269 +++---- kernel/exit.c | 3 kernel/fork.c | 2 mm/memory_hotplug.c | 6 mm/migrate.c | 11 mm/sparse.c | 9 net/ax25/af_ax25.c | 93 +- net/ax25/ax25_addr.c | 9 net/ax25/ax25_ds_timer.c | 3 net/ax25/ax25_iface.c | 13 net/ax25/ax25_ip.c | 3 net/ax25/ax25_out.c | 3 net/ax25/ax25_route.c | 2 net/ax25/ax25_timer.c | 3 net/ax25/ax25_uid.c | 4 net/ax25/sysctl_net_ax25.c | 10 net/bridge/br_input.c | 1 net/dccp/proto.c | 13 net/decnet/dn_neigh.c | 5 net/ipv4/af_inet.c | 2 net/ipv4/netfilter/ip_conntrack_helper_h323.c | 2 net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c | 10 net/ipv4/netfilter/ip_conntrack_proto_sctp.c | 11 net/ipv4/netfilter/ip_nat_standalone.c | 2 net/ipv4/netfilter/ip_tables.c | 39 - net/ipv4/tcp.c | 13 net/ipv4/tcp_highspeed.c | 2 net/ipv4/tcp_output.c | 2 net/ipv4/xfrm4_output.c | 2 net/ipv6/route.c | 5 net/netfilter/nf_conntrack_proto_sctp.c | 11 net/netfilter/x_tables.c | 4 net/netlink/af_netlink.c | 3 net/netrom/af_netrom.c | 18 net/netrom/nr_dev.c | 1 net/rose/af_rose.c | 13 net/rose/rose_dev.c | 1 net/rose/rose_link.c | 6 net/rose/rose_route.c | 7 net/sched/sch_netem.c | 2 net/sctp/inqueue.c | 1 net/sctp/sm_statefuns.c | 59 + net/sctp/sm_statetable.c | 10 net/sctp/ulpqueue.c | 27 net/socket.c | 2 net/x25/x25_timer.c | 4 net/xfrm/xfrm_policy.c | 16 net/xfrm/xfrm_state.c | 8 scripts/mod/file2alias.c | 36 security/dummy.c | 6 security/selinux/Makefile | 2 security/selinux/avc.c | 13 security/selinux/exports.c | 74 + security/selinux/hooks.c | 11 security/selinux/include/security.h | 5 security/selinux/ss/mls.c | 30 security/selinux/ss/mls.h | 4 security/selinux/ss/services.c | 235 ++++++ sound/core/Kconfig | 12 sound/core/oss/pcm_oss.c | 8 sound/core/pcm.c | 12 sound/core/pcm_lib.c | 6 sound/core/pcm_memory.c | 8 sound/drivers/dummy.c | 14 sound/drivers/mpu401/mpu401.c | 14 sound/drivers/serial-u16550.c | 14 sound/drivers/virmidi.c | 14 sound/isa/opti9xx/miro.c | 3 sound/pci/ad1889.c | 3 sound/pci/ali5451/ali5451.c | 2 sound/pci/als300.c | 2 sound/pci/als4000.c | 2 sound/pci/atiixp.c | 2 sound/pci/atiixp_modem.c | 2 sound/pci/au88x0/au8810.c | 2 sound/pci/au88x0/au8820.c | 2 sound/pci/au88x0/au8830.c | 2 sound/pci/azt3328.c | 2 sound/pci/bt87x.c | 4 sound/pci/ca0106/ca0106_main.c | 2 sound/pci/cmipci.c | 2 sound/pci/cs4281.c | 2 sound/pci/cs46xx/cs46xx.c | 2 sound/pci/cs5535audio/cs5535audio.c | 2 sound/pci/emu10k1/emu10k1.c | 2 sound/pci/emu10k1/emu10k1x.c | 3 sound/pci/ens1370.c | 2 sound/pci/es1938.c | 2 sound/pci/es1968.c | 3 sound/pci/fm801.c | 2 sound/pci/hda/hda_intel.c | 2 sound/pci/hda/patch_analog.c | 13 sound/pci/hda/patch_realtek.c | 1 sound/pci/hda/patch_sigmatel.c | 4 sound/pci/ice1712/ice1712.c | 3 sound/pci/ice1712/ice1724.c | 2 sound/pci/intel8x0.c | 8 sound/pci/intel8x0m.c | 2 sound/pci/korg1212/korg1212.c | 2 sound/pci/maestro3.c | 3 sound/pci/mixart/mixart.c | 3 sound/pci/nm256/nm256.c | 2 sound/pci/pcxhr/pcxhr.c | 3 sound/pci/pcxhr/pcxhr_hwdep.c | 4 sound/pci/riptide/riptide.c | 4 sound/pci/rme32.c | 2 sound/pci/rme96.c | 2 sound/pci/rme9652/hdsp.c | 2 sound/pci/rme9652/hdspm.c | 2 sound/pci/rme9652/rme9652.c | 2 sound/pci/sonicvibes.c | 2 sound/pci/trident/trident.c | 2 sound/pci/via82xx.c | 18 sound/pci/via82xx_modem.c | 2 sound/pci/vx222/vx222.c | 2 sound/pci/ymfpci/ymfpci.c | 2 sound/pcmcia/Kconfig | 4 sound/usb/usbquirks.h | 9 287 files changed, 4044 insertions(+), 1768 deletions(-) New commits: commit 6e58f448601ac13f68932a66ce0cba5843e70ec6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6e58f448601ac13f68932a66ce0cba5843e70ec6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6e58f448601ac13f68932a66ce0cba5843e70ec6 Merge: abbf542... 5528e56... Author: Jan-Benedict Glaw <jb...@d2...> Date: Sun May 7 00:54:51 2006 +0200 Merge branch 'master' commit 5528e568a760442e0ec8fd2dea1f0791875a066b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5528e568a760442e0ec8fd2dea1f0791875a066b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5528e568a760442e0ec8fd2dea1f0791875a066b Author: John Heffner <jhe...@ps...> Date: Fri May 5 17:41:44 2006 -0700 [TCP]: Fix snd_cwnd adjustments in tcp_highspeed.c Xiaoliang (David) Wei wrote: > Hi gurus, > > I am reading the code of tcp_highspeed.c in the kernel and have a > question on the hstcp_cong_avoid function, specifically the following > AI part (line 136~143 in net/ipv4/tcp_highspeed.c ): > > /* Do additive increase */ > if (tp->snd_cwnd < tp->snd_cwnd_clamp) { > tp->snd_cwnd_cnt += ca->ai; > if (tp->snd_cwnd_cnt >= tp->snd_cwnd) { > tp->snd_cwnd++; > tp->snd_cwnd_cnt -= tp->snd_cwnd; > } > } > > In this part, when (tp->snd_cwnd_cnt == tp->snd_cwnd), > snd_cwnd_cnt will be -1... snd_cwnd_cnt is defined as u16, will this > small chance of getting -1 becomes a problem? > Shall we change it by reversing the order of the cwnd++ and cwnd_cnt -= > cwnd? Absolutely correct. Thanks. Signed-off-by: John Heffner <jhe...@ps...> Signed-off-by: David S. Miller <da...@da...> commit f530937b2cccdb131cb459977943c98421ab09b3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f530937b2cccdb131cb459977943c98421ab09b3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f530937b2cccdb131cb459977943c98421ab09b3 Author: Ralf Baechle <ra...@li...> Date: Fri May 5 17:19:26 2006 -0700 [NETROM/ROSE]: Kill module init version kernel log messages. There are out of date and don't tell the user anything useful. The similar messages which IPV4 and the core networking used to output were killed a long time ago. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 134af34632a7b3b0a98a79a2e56bf9cc927e0eac gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=134af34632a7b3b0a98a79a2e56bf9cc927e0eac gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=134af34632a7b3b0a98a79a2e56bf9cc927e0eac Author: Herbert Xu <he...@go...> Date: Fri May 5 17:09:13 2006 -0700 [DCCP]: Fix sock_orphan dead lock Calling sock_orphan inside bh_lock_sock in dccp_close can lead to dead locks. For example, the inet_diag code holds sk_callback_lock without disabling BH. If an inbound packet arrives during that admittedly tiny window, it will cause a dead lock on bh_lock_sock. Another possible path would be through sock_wfree if the network device driver frees the tx skb in process context with BH enabled. We can fix this by moving sock_orphan out of bh_lock_sock. The tricky bit is to work out when we need to destroy the socket ourselves and when it has already been destroyed by someone else. By moving sock_orphan before the release_sock we can solve this problem. This is because as long as we own the socket lock its state cannot change. So we simply record the socket state before the release_sock and then check the state again after we regain the socket lock. If the socket state has transitioned to DCCP_CLOSED in the time being, we know that the socket has been destroyed. Otherwise the socket is still ours to keep. This problem was discoverd by Ingo Molnar using his lock validator. Signed-off-by: Herbert Xu <he...@go...> Signed-off-by: David S. Miller <da...@da...> commit 1c29fc4989bc2a3838b2837adc12b8aeb0feeede gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1c29fc4989bc2a3838b2837adc12b8aeb0feeede gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1c29fc4989bc2a3838b2837adc12b8aeb0feeede Author: Stephen Hemminger <she...@os...> Date: Fri May 5 17:07:13 2006 -0700 [BRIDGE]: keep track of received multicast packets It makes sense to add this simple statistic to keep track of received multicast packets. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: David S. Miller <da...@da...> commit 35d63edb1c807bc5317e49592260e84637bc432e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=35d63edb1c807bc5317e49592260e84637bc432e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=35d63edb1c807bc5317e49592260e84637bc432e Author: Sridhar Samudrala <sr...@us...> Date: Fri May 5 17:05:23 2006 -0700 [SCTP]: Fix state table entries for chunks received in CLOSED state. Discard an unexpected chunk in CLOSED state rather can calling BUG(). Signed-off-by: Sridhar Samudrala <sr...@us...> Signed-off-by: David S. Miller <da...@da...> commit 62b08083ec3dbfd7e533c8d230dd1d8191a6e813 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=62b08083ec3dbfd7e533c8d230dd1d8191a6e813 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=62b08083ec3dbfd7e533c8d230dd1d8191a6e813 Author: Sridhar Samudrala <sr...@us...> Date: Fri May 5 17:04:43 2006 -0700 [SCTP]: Fix panic's when receiving fragmented SCTP control chunks. Use pskb_pull() to handle incoming COOKIE_ECHO and HEARTBEAT chunks that are received as skb's with fragment list. Signed-off-by: Sridhar Samudrala <sr...@us...> Signed-off-by: David S. Miller <da...@da...> commit 672e7cca17ed6036a1756ed34cf20dbd72d5e5f6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=672e7cca17ed6036a1756ed34cf20dbd72d5e5f6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=672e7cca17ed6036a1756ed34cf20dbd72d5e5f6 Author: Vladislav Yasevich <vla...@hp...> Date: Fri May 5 17:03:49 2006 -0700 [SCTP]: Prevent possible infinite recursion with multiple bundled DATA. There is a rare situation that causes lksctp to go into infinite recursion and crash the system. The trigger is a packet that contains at least the first two DATA fragments of a message bundled together. The recursion is triggered when the user data buffer is smaller that the full data message. The problem is that we clone the skb for every fragment in the message. When reassembling the full message, we try to link skbs from the "first fragment" clone using the frag_list. However, since the frag_list is shared between two clones in this rare situation, we end up setting the frag_list pointer of the second fragment to point to itself. This causes sctp_skb_pull() to potentially recurse indefinitely. Proposed solution is to make a copy of the skb when attempting to link things using frag_list. Signed-off-by: Vladislav Yasevich <vla...@hp...> Signed-off-by: Sridhar Samudrala <sr...@us...> Signed-off-by: David S. Miller <da...@da...> commit 7c3ceb4fb9667f34f1599a062efecf4cdc4a4ce5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7c3ceb4fb9667f34f1599a062efecf4cdc4a4ce5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7c3ceb4fb9667f34f1599a062efecf4cdc4a4ce5 Author: Neil Horman <nh...@tu...> Date: Fri May 5 17:02:09 2006 -0700 [SCTP]: Allow spillover of receive buffer to avoid deadlock. This patch fixes a deadlock situation in the receive path by allowing temporary spillover of the receive buffer. - If the chunk we receive has a tsn that immediately follows the ctsn, accept it even if we run out of receive buffer space and renege data with higher TSNs. - Once we accept one chunk in a packet, accept all the remaining chunks even if we run out of receive buffer space. Signed-off-by: Neil Horman <nh...@tu...> Acked-by: Mark Butler <bu...@mi...> Acked-by: Vlad Yasevich <vla...@hp...> Signed-off-by: Sridhar Samudrala <sr...@us...> Signed-off-by: David S. Miller <da...@da...> commit 91ef5d2d6e934762db9c3e0d9e5b2862e40ea429 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=91ef5d2d6e934762db9c3e0d9e5b2862e40ea429 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=91ef5d2d6e934762db9c3e0d9e5b2862e40ea429 Merge: 568cb09... 56cf650... Author: Linus Torvalds <tor...@g5...> Date: Fri May 5 14:53:48 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-mmc * master.kernel.org:/home/rmk/linux-2.6-mmc: [BLOCK] Fix oops on removal of SD/MMC card commit 568cb09b9d889b6f2852ede19772b8e9eed36c1e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=568cb09b9d889b6f2852ede19772b8e9eed36c1e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=568cb09b9d889b6f2852ede19772b8e9eed36c1e Author: Nicolas Pitre <ni...@ca...> Date: Fri May 5 22:35:05 2006 +0100 [ARM] 3495/1: EABI: undefine removed syscalls, but... Patch from Nicolas Pitre ... but only for user space. Signed-off-by: Nicolas Pitre <ni...@ca...> Signed-off-by: Russell King <rmk...@ar...> commit 99532559dc7a8e686b2cef14c780a7ad5dbd4a31 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=99532559dc7a8e686b2cef14c780a7ad5dbd4a31 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=99532559dc7a8e686b2cef14c780a7ad5dbd4a31 Author: Nicolas Pitre <ni...@ca...> Date: Fri May 5 22:32:24 2006 +0100 [ARM] 3500/1: fix PXA27x DMA allocation priority Patch from Nicolas Pitre Intel PXA27x developers manual section 5.4.1.1 lists a priority distribution for the DMA channels differently than what the code currently assumes. This patch fixes that. Noticed by Simon Vogl <vo...@so...> Signed-off-by: Nicolas Pitre <ni...@ca...> Signed-off-by: Russell King <rmk...@ar...> commit b7d7ef87e15dea105be59ec8f14e2f92182dd421 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b7d7ef87e15dea105be59ec8f14e2f92182dd421 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b7d7ef87e15dea105be59ec8f14e2f92182dd421 Author: George G. Davis <da...@mv...> Date: Fri May 5 22:32:23 2006 +0100 [ARM] 3499/1: Fix VFP FPSCR corruption for double exception case Patch from George G. Davis The ARM VFP FPSCR register is corrupted when a condition flags modifying VFP instruction is followed by a non-condition flags modifying VFP instruction and both instructions raise exceptions. The fix is to read the current FPSCR in between emulation of these two instructions and use the current FPSCR value when handling the second exception. Signed-off-by: George G. Davis <gd...@mv...> Signed-off-by: Russell King <rmk...@ar...> commit 56cf6504fc1c0c221b82cebc16a444b684140fb7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=56cf6504fc1c0c221b82cebc16a444b684140fb7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=56cf6504fc1c0c221b82cebc16a444b684140fb7 Author: Russell King <rm...@dy...> Date: Fri May 5 17:57:52 2006 +0100 [BLOCK] Fix oops on removal of SD/MMC card The block layer keeps a reference (driverfs_dev) to the struct device associated with the block device, and uses it internally for generating uevents in block_uevent. Block device uevents include umounting the partition, which can occur after the backing device has been removed. Unfortunately, this reference is not counted. This means that if the struct device is removed from the device tree, the block layers reference will become stale. Guard against this by holding a reference to the struct device in add_disk(), and only drop the reference when we're releasing the gendisk kobject - in other words when we can be sure that no further uevents will be generated for this block device. Signed-off-by: Russell King <rmk...@ar...> Acked-by: Jens Axboe <ax...@su...> commit 2eb9d3157107497fdccb51e1570fea677f6e3c82 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2eb9d3157107497fdccb51e1570fea677f6e3c82 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2eb9d3157107497fdccb51e1570fea677f6e3c82 Author: Uwe Zeisberger <Uwe...@di...> Date: Fri May 5 15:11:14 2006 +0100 [ARM] 3496/1: more constants for asm-offsets.h Patch from Uwe Zeisberger added the following constants: - MACHINFO_TYPE - MACHINFO_NAME - MACHINFO_PHYSIO - MACHINFO_PGOFFIO - PROCINFO_INITFUNC - PROCINFO_MMUFLAGS and removed their definition from head.S and head-nommu.S Signed-off-by: Uwe Zeisberger <Uwe...@di...> Signed-off-by: Russell King <rmk...@ar...> commit ff10952a547dad934d9ed9afc5cf579ed1ccb53a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ff10952a547dad934d9ed9afc5cf579ed1ccb53a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ff10952a547dad934d9ed9afc5cf579ed1ccb53a Author: Nicolas Pitre <ni...@ca...> Date: Fri May 5 15:11:14 2006 +0100 [ARM] 3494/1: asm-arm/bug.h needs linux/stddef.h Patch from Nicolas Pitre ... for the definition of NULL. Signed-off-by: Nicolas Pitre <ni...@ca...> Signed-off-by: Russell King <rmk...@ar...> commit d98550e334715b2d9e45f8f0f4e1608720108640 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d98550e334715b2d9e45f8f0f4e1608720108640 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d98550e334715b2d9e45f8f0f4e1608720108640 Merge: f9cc847... d205819... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 15:09:52 2006 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] powerpc: Use the ibm,pa-features property if available powerpc: Fix incorrect might_sleep in __get_user/__put_user on kernel addresses [PATCH] ppc32 CPM_UART: fixes and improvements [PATCH] ppc32 CPM_UART: Fixed break send on SCC [PATCH] powerpc/kprobes: fix singlestep out-of-line [PATCH] powerpc/pseries: avoid crash in PCI code if mem system not up commit f9cc8475e7595dbb41a9567f83288e2cd7445b6c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f9cc8475e7595dbb41a9567f83288e2cd7445b6c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f9cc8475e7595dbb41a9567f83288e2cd7445b6c Merge: 6fc56cc... 5b80234... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 14:52:43 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3490/1: i.MX: move uart resources to board files [ARM] 3488/1: make icedcc_putc do the right thing [ARM] 3487/1: IXP4xx: Support non-PCI systems [ARM] 3486/1: Mark memory as clobbered by the ARM _syscallX() macros commit 6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 Merge: cbdf811... 920e70c... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 14:52:27 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-mmc * master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Move set_ios debugging into mmc.c [MMC] Correct mmc_request_done comments [MMC] PXA: reduce the number of lines PXAMCI debug uses [MMC] PXA and i.MX: don't avoid sending stop command on error [MMC] extend data timeout for writes [ARM] 3485/1: i.MX: MX1 SD/MMC fix of unintentional double start possibility commit cbdf811c77cf2906a099b8da92e9f6f335b68a73 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cbdf811c77cf2906a099b8da92e9f6f335b68a73 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cbdf811c77cf2906a099b8da92e9f6f335b68a73 Merge: 936ef1d... 98232d5... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 13:25:40 2006 -0400 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] compat_sys_vmsplice: one-off in UIO_MAXIOV check [PATCH] splice: redo page lookup if add_to_page_cache() returns -EEXIST [PATCH] splice: rename remaining info variables to pipe [PATCH] splice: LRU fixups [PATCH] splice: fix unlocking of page on error ->prepare_write() commit 936ef1d48ac9a9fc90746bacd93624969711775a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=936ef1d48ac9a9fc90746bacd93624969711775a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=936ef1d48ac9a9fc90746bacd93624969711775a Merge: 0de2a93... d1a6498... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 13:25:19 2006 -0400 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: [DECNET]: Fix level1 router hello [TCP]: Fix sock_orphan dead lock [ROSE]: Eleminate HZ from ROSE kernel interfaces [NETROM]: Eleminate HZ from NET/ROM kernel interfaces [AX.25]: Eleminate HZ from AX.25 kernel interfaces [ROSE]: Fix routing table locking in rose_remove_neigh. [AX.25]: Move AX.25 symbol exports [HAMRADIO]: Remove remaining SET_MODULE_OWNER calls from hamradio drivers. [AX25, ROSE]: Remove useless SET_MODULE_OWNER calls. [AX.25]: Spelling fix [ROSE]: Remove useless prototype for rose_remove_neigh(). [NETFILTER]: x_tables: don't use __copy_{from,to}_user on unchecked memory in compat layer [NETFILTER]: H.323 helper: Change author's email address [NETFILTER]: NAT: silence unused variable warnings with CONFIG_XFRM=n [NETFILTER]: H.323 helper: fix use of uninitialized data [NETFILTER]: H.323 helper: fix endless loop caused by invalid TPKT len commit 0de2a93e80917c70716c20b8b6a75e5350da3f71 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0de2a93e80917c70716c20b8b6a75e5350da3f71 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0de2a93e80917c70716c20b8b6a75e5350da3f71 Merge: fed3be9... 8c45112... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 13:25:05 2006 -0400 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Hook up vmsplice into syscall tables. commit fed3be9bd56e67c9b9324277b7f95c32e73a75bb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fed3be9bd56e67c9b9324277b7f95c32e73a75bb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fed3be9bd56e67c9b9324277b7f95c32e73a75bb Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 13:23:40 2006 -0400 CREDITS file update (Tristan Greaves) By request from Tristan. Signed-off-by: Linus Torvalds <tor...@os...> commit 920e70c5c603ada05dd480ca0ccc0ae12a5fdc39 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=920e70c5c603ada05dd480ca0ccc0ae12a5fdc39 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=920e70c5c603ada05dd480ca0ccc0ae12a5fdc39 Author: Russell King <rm...@dy...> Date: Thu May 4 18:22:51 2006 +0100 [MMC] Move set_ios debugging into mmc.c Rather than having every driver duplicate the set_ios debugging, provide a single version in mmc.c which can be expanded as we add additional functionality. Signed-off-by: Russell King <rmk...@ar...> commit 5b802344357338a4d645beac8ca97470bcbe3542 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5b802344357338a4d645beac8ca97470bcbe3542 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5b802344357338a4d645beac8ca97470bcbe3542 Author: Sascha Hauer <sa...@sa...> Date: Thu May 4 14:07:42 2006 +0100 [ARM] 3490/1: i.MX: move uart resources to board files Patch from Sascha Hauer This patch moves the i.MX uart resources and the gpio pin setup to the board files. This allows the boards to decide how many internal uarts are connected to the outside world and whether they use rts/cts or not. Signed-off-by: Sascha Hauer <s....@pe...> Signed-off-by: Russell King <rmk...@ar...> commit fe10c6abea8bc83291a13e0580b3e4c355710b09 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fe10c6abea8bc83291a13e0580b3e4c355710b09 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fe10c6abea8bc83291a13e0580b3e4c355710b09 Author: Russell King <rm...@dy...> Date: Thu May 4 13:51:45 2006 +0100 [MMC] Correct mmc_request_done comments mmc_request_done should be called at the end of handling a request, not between the data and initial command parts of the request. Signed-off-by: Russell King <rmk...@ar...> commit 98232d504db0a1f91ecaa93686ed3bf61963103b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=98232d504db0a1f91ecaa93686ed3bf61963103b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=98232d504db0a1f91ecaa93686ed3bf61963103b Author: Jens Axboe <ax...@su...> Date: Thu May 4 09:13:49 2006 +0200 [PATCH] compat_sys_vmsplice: one-off in UIO_MAXIOV check nr_segs may not be > UIO_MAXIOV, however it may be equal to. This makes the behaviour identical to the real sys_vmsplice(). The other foov syscalls also agree that this is the way to go. Signed-off-by: Jens Axboe <ax...@su...> commit d1a649838802edd94b6335834919463c6ae61f40 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d1a649838802edd94b6335834919463c6ae61f40 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d1a649838802edd94b6335834919463c6ae61f40 Author: Patrick Caulfield <pa...@ty...> Date: Wed May 3 23:36:23 2006 -0700 [DECNET]: Fix level1 router hello This patch fixes hello messages sent when a node is a level 1 router. Slightly contrary to the spec (maybe) VMS ignores hello messages that do not name level2 routers that it also knows about. So, here we simply name all the routers that the node knows about rather just other level1 routers. (I hope the patch is clearer than the description. sorry). Signed-off-by: Patrick Caulfield <pa...@ty...> Signed-off-by: David S. Miller <da...@da...> commit 75c2d9077c63ac21488129cc23561d4f4fd0f5e5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=75c2d9077c63ac21488129cc23561d4f4fd0f5e5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=75c2d9077c63ac21488129cc23561d4f4fd0f5e5 Author: Herbert Xu <he...@go...> Date: Wed May 3 23:31:35 2006 -0700 [TCP]: Fix sock_orphan dead lock Calling sock_orphan inside bh_lock_sock in tcp_close can lead to dead locks. For example, the inet_diag code holds sk_callback_lock without disabling BH. If an inbound packet arrives during that admittedly tiny window, it will cause a dead lock on bh_lock_sock. Another possible path would be through sock_wfree if the network device driver frees the tx skb in process context with BH enabled. We can fix this by moving sock_orphan out of bh_lock_sock. The tricky bit is to work out when we need to destroy the socket ourselves and when it has already been destroyed by someone else. By moving sock_orphan before the release_sock we can solve this problem. This is because as long as we own the socket lock its state cannot change. So we simply record the socket state before the release_sock and then check the state again after we regain the socket lock. If the socket state has transitioned to TCP_CLOSE in the time being, we know that the socket has been destroyed. Otherwise the socket is still ours to keep. Note that I've also moved the increment on the orphan count forward. This may look like a problem as we're increasing it even if the socket is just about to be destroyed where it'll be decreased again. However, this simply enlarges a window that already exists. This also changes the orphan count test by one. Considering what the orphan count is meant to do this is no big deal. This problem was discoverd by Ingo Molnar using his lock validator. Signed-off-by: Herbert Xu <he...@go...> Signed-off-by: David S. Miller <da...@da...> commit 82e84249f0ee098e004c8bd6d90a1640bd56cfbb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=82e84249f0ee098e004c8bd6d90a1640bd56cfbb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=82e84249f0ee098e004c8bd6d90a1640bd56cfbb Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:28:20 2006 -0700 [ROSE]: Eleminate HZ from ROSE kernel interfaces Convert all ROSE sysctl time values from jiffies to ms as units. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 4d8937d0b113e8ec39f7d18cf13804f3b5fb8fd4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4d8937d0b113e8ec39f7d18cf13804f3b5fb8fd4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4d8937d0b113e8ec39f7d18cf13804f3b5fb8fd4 Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:27:47 2006 -0700 [NETROM]: Eleminate HZ from NET/ROM kernel interfaces Convert all NET/ROM sysctl time values from jiffies to ms as units. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit e1fdb5b39656ea2be8cadde565e543649a988af9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e1fdb5b39656ea2be8cadde565e543649a988af9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e1fdb5b39656ea2be8cadde565e543649a988af9 Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:27:16 2006 -0700 [AX.25]: Eleminate HZ from AX.25 kernel interfaces Convert all AX.25 sysctl time values from jiffies to ms as units. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 4cc7c2734e2b4032103e47d8f3e8b6fa3360d3f1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4cc7c2734e2b4032103e47d8f3e8b6fa3360d3f1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4cc7c2734e2b4032103e47d8f3e8b6fa3360d3f1 Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:26:20 2006 -0700 [ROSE]: Fix routing table locking in rose_remove_neigh. The locking rule for rose_remove_neigh() are that the caller needs to hold rose_neigh_list_lock, so we better don't take it yet again in rose_neigh_list_lock. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 70868eace5031298c6f6e991a40a2106957f582c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=70868eace5031298c6f6e991a40a2106957f582c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=70868eace5031298c6f6e991a40a2106957f582c Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:25:17 2006 -0700 [AX.25]: Move AX.25 symbol exports Move AX.25 symbol exports to next to their definitions where they're supposed to be these days. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 3ab33dcc82e014c69ebad3b524d0053378ef76c3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3ab33dcc82e014c69ebad3b524d0053378ef76c3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3ab33dcc82e014c69ebad3b524d0053378ef76c3 Author: Ralf Baechle DL5RB <ra...@li...> Date: Wed May 3 23:24:35 2006 -0700 [HAMRADIO]: Remove remaining SET_MODULE_OWNER calls from hamradio drivers. Signed-off-by: Ralf Baechle DL5RB <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 86cfcb95ec60e910d7efcb35ae89bf3403befaad gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=86cfcb95ec60e910d7efcb35ae89bf3403befaad gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=86cfcb95ec60e910d7efcb35ae89bf3403befaad Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:23:48 2006 -0700 [AX25, ROSE]: Remove useless SET_MODULE_OWNER calls. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 3f072310d0ca85891323e9d325c37c76de389387 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3f072310d0ca85891323e9d325c37c76de389387 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3f072310d0ca85891323e9d325c37c76de389387 Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:22:36 2006 -0700 [AX.25]: Spelling fix Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 0cc5ae24af08abe8e2a467f45b54c48a0f52670f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0cc5ae24af08abe8e2a467f45b54c48a0f52670f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0cc5ae24af08abe8e2a467f45b54c48a0f52670f Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:22:01 2006 -0700 [ROSE]: Remove useless prototype for rose_remove_neigh(). Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 7800007c1e2d42cd4120b87b0ba3f3480f17f30a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7800007c1e2d42cd4120b87b0ba3f3480f17f30a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7800007c1e2d42cd4120b87b0ba3f3480f17f30a Author: Patrick McHardy <ka...@tr...> Date: Wed May 3 23:20:27 2006 -0700 [NETFILTER]: x_tables: don't use __copy_{from,to}_user on unchecked memory in compat layer Noticed by Linus Torvalds <tor...@os...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 7582e9d17edbabab6cbe59467c5d1b5e8c04fca8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7582e9d17edbabab6cbe59467c5d1b5e8c04fca8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7582e9d17edbabab6cbe59467c5d1b5e8c04fca8 Author: Jing Min Zhao <zha...@us...> Date: Wed May 3 23:19:59 2006 -0700 [NETFILTER]: H.323 helper: Change author's email address Signed-off-by: Jing Min Zhao <zha...@us...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 2354feaeb2acb78f6aabdf8410d55b44492a7949 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2354feaeb2acb78f6aabdf8410d55b44492a7949 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2354feaeb2acb78f6aabdf8410d55b44492a7949 Author: Patrick McHardy <ka...@tr...> Date: Wed May 3 23:19:26 2006 -0700 [NETFILTER]: NAT: silence unused variable warnings with CONFIG_XFRM=n net/ipv4/netfilter/ip_nat_standalone.c: In function 'ip_nat_out': net/ipv4/netfilter/ip_nat_standalone.c:223: warning: unused variable 'ctinfo' net/ipv4/netfilter/ip_nat_standalone.c:222: warning: unused variable 'ct' Surprisingly no complaints so far .. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 4228e2a9890cd01b0c8cc58af6fd9e08a4b5e8a7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4228e2a9890cd01b0c8cc58af6fd9e08a4b5e8a7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4228e2a9890cd01b0c8cc58af6fd9e08a4b5e8a7 Author: Patrick McHardy <ka...@tr...> Date: Wed May 3 23:17:11 2006 -0700 [NETFILTER]: H.323 helper: fix use of uninitialized data When a Choice element contains an unsupported choice no error is returned and parsing continues normally, but the choice value is not set and contains data from the last parsed message. This may in turn lead to parsing of more stale data and following crashes. Fixes a crash triggered by testcase 0003243 from the PROTOS c07-h2250v4 testsuite following random other testcases: CPU: 0 EIP: 0060:[<c01a9554>] Not tainted VLI EFLAGS: 00210646 (2.6.17-rc2 #3) EIP is at memmove+0x19/0x22 eax: d7be0307 ebx: d7be0307 ecx: e841fcf9 edx: d7be0307 esi: bfffffff edi: bfffffff ebp: da5eb980 esp: c0347e2c ds: 007b es: 007b ss: 0068 Process events/0 (pid: 4, threadinfo=c0347000 task=dff86a90) Stack: <0>00000006 c0347ea6 d7be0301 e09a6b2c 00000006 da5eb980 d7be003e d7be0052 c0347f6c e09a6d9c 00000006 c0347ea6 00000006 00000000 d7b9a548 00000000 c0347f6c d7b9a548 00000004 e0a1a119 0000028f 00000006 c0347ea6 00000006 Call Trace: [<e09a6b2c>] mangle_contents+0x40/0xd8 [ip_nat] [<e09a6d9c>] ip_nat_mangle_tcp_packet+0xa1/0x191 [ip_nat] [<e0a1a119>] set_addr+0x60/0x14d [ip_nat_h323] [<e0ab6e66>] q931_help+0x2da/0x71a [ip_conntrack_h323] [<e0ab6e98>] q931_help+0x30c/0x71a [ip_conntrack_h323] [<e09af242>] ip_conntrack_help+0x22/0x2f [ip_conntrack] [<c022934a>] nf_iterate+0x2e/0x5f [<c025d357>] xfrm4_output_finish+0x0/0x39f [<c02294ce>] nf_hook_slow+0x42/0xb0 [<c025d357>] xfrm4_output_finish+0x0/0x39f [<c025d732>] xfrm4_output+0x3c/0x4e [<c025d357>] xfrm4_output_finish+0x0/0x39f [<c0230370>] ip_forward+0x1c2/0x1fa [<c022f417>] ip_rcv+0x388/0x3b5 [<c02188f9>] netif_receive_skb+0x2bc/0x2ec [<c0218994>] process_backlog+0x6b/0xd0 [<c021675a>] net_rx_action+0x4b/0xb7 [<c0115606>] __do_softirq+0x35/0x7d [<c0104294>] do_softirq+0x38/0x3f Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 6fd737031eb6869430d0f3cf6bf1440adf7aedf5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6fd737031eb6869430d0f3cf6bf1440adf7aedf5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6fd737031eb6869430d0f3cf6bf1440adf7aedf5 Author: Patrick McHardy <ka...@tr...> Date: Wed May 3 23:16:29 2006 -0700 [NETFILTER]: H.323 helper: fix endless loop caused by invalid TPKT len When the TPKT len included in the packet is below the lowest valid value of 4 an underflow occurs which results in an endless loop. Found by testcase 0000058 from the PROTOS c07-h2250v4 testsuite. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit a0548871ed267ae12eb1c860c5aaebd9e466b34e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a0548871ed267ae12eb1c860c5aaebd9e466b34e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a0548871ed267ae12eb1c860c5aaebd9e466b34e Author: Jens Axboe <ax...@su...> Date: Wed May 3 10:58:22 2006 +0200 [PATCH] splice: redo page lookup if add_to_page_cache() returns -EEXIST This can happen quite easily, if several processes are trying to splice the same file at the same time. It's not a failure, it just means someone raced with us in allocating this file page. So just dump the allocated page and relookup the original. Signed-off-by: Jens Axboe <ax...@su...> commit 76ad4d11105ccd40a536db1057083f28326019fd gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=76ad4d11105ccd40a536db1057083f28326019fd gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=76ad4d11105ccd40a536db1057083f28326019fd Author: Jens Axboe <ax...@su...> Date: Wed May 3 10:41:33 2006 +0200 [PATCH] splice: rename remaining info variables to pipe Same thing was done in fs/pipe.c and most of fs/splice.c, but we had a few missing still. Signed-off-by: Jens Axboe <ax...@su...> commit 1432873af7ae29d4bb3c56114c05b539d078ca62 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1432873af7ae29d4bb3c56114c05b539d078ca62 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1432873af7ae29d4bb3c56114c05b5... [truncated message content] |