[LV-k25-commit] Linux for the VAX architecture: Changes to 'master'

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

 arch/mips/Kconfig                    |    9 +++------
 arch/mips/Makefile                   |    4 +++-
 arch/mips/kernel/setup.c             |    6 +++++-
 arch/mips/momentum/ocelot_g/gt-irq.c |    8 ++++----
 fs/jfs/file.c                        |    2 ++
 include/asm-mips/system.h            |    2 +-
 include/asm-sparc64/futex.h          |   18 ++++++++----------
 net/bridge/netfilter/ebtables.c      |    2 +-
 net/ipv4/sysctl_net_ipv4.c           |    7 -------
 net/ipv4/tcp_cong.c                  |    8 ++++++++
 net/ipv6/xfrm6_tunnel.c              |    4 ++--
 net/tipc/port.c                      |    5 +++--
 12 files changed, 40 insertions(+), 35 deletions(-)

New commits:
commit e957b00a8caece90cbc2afd0a4cb4c4d61b9efa8
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e957b00a8caece90cbc2afd0a4cb4c4d61b9efa8
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e957b00a8caece90cbc2afd0a4cb4c4d61b9efa8
Merge: 096e5bdaf166791e128ed3b9190542412559333b 236d333c3c05c179e31f461285c09271256a1381
Author: Linus Torvalds <tor...@g5...>
Date:   Thu Nov 2 10:14:37 2006 -0800

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      [MIPS] Do not use -msym32 option for modules.
      [MIPS] Don't use R10000 llsc workaround version for all llsc-full processors.
      [MIPS] Ocelot G: Fix : "CURRENTLY_UNUSED" is not defined warning.
      [MIPS] Fix warning about init_initrd() call if !CONFIG_BLK_DEV_INITRD.
      [MIPS] IP27: Allow SMP ;-)  Another changeset messed up by patch.
      [MIPS] Fix merge screwup by patch(1)
      Revert "[MIPS] Make SPARSEMEM selectable on QEMU."

commit 236d333c3c05c179e31f461285c09271256a1381
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=236d333c3c05c179e31f461285c09271256a1381
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=236d333c3c05c179e31f461285c09271256a1381
Author: Atsushi Nemoto <an...@mb...>
Date:   Tue Oct 10 22:13:55 2006 +0900

    [MIPS] Do not use -msym32 option for modules.
    
    On 64-bit kernel, modules are loaded into XKSEG for now.  While XKSEG
    address is not a sign-extended 32-bit address, we can not use -msym32
    option.
    
    Signed-off-by: Atsushi Nemoto <an...@mb...>
    Signed-off-by: Ralf Baechle <ra...@li...>

commit 904880e717c5466041485ca6d6e8c6c1ef06d0fd
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=904880e717c5466041485ca6d6e8c6c1ef06d0fd
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=904880e717c5466041485ca6d6e8c6c1ef06d0fd
Author: Ralf Baechle <ra...@li...>
Date:   Fri Oct 13 11:32:50 2006 +0100

    [MIPS] Don't use R10000 llsc workaround version for all llsc-full processors.
    
    Found and original patch by bi...@la....
    
    Signed-off-by: Ralf Baechle <ra...@li...>

commit 8b922a851731037b2f1e1669e9b1a0baff3ab5dc
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8b922a851731037b2f1e1669e9b1a0baff3ab5dc
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8b922a851731037b2f1e1669e9b1a0baff3ab5dc
Author: Ralf Baechle <ra...@li...>
Date:   Mon Oct 30 12:48:04 2006 +0000

    [MIPS] Ocelot G: Fix : "CURRENTLY_UNUSED" is not defined warning.
    
      CC      arch/mips/momentum/ocelot_g/gt-irq.o
    arch/mips/momentum/ocelot_g/gt-irq.c:30:5: warning: "CURRENTLY_UNUSED" is not defined
    arch/mips/momentum/ocelot_g/gt-irq.c:199:5: warning: "CURRENTLY_UNUSED" is not defined
    
    Signed-off-by: Ralf Baechle <ra...@li...>

commit 9ba126cfbf505f4d5b39ed294cedd241321c7a91
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9ba126cfbf505f4d5b39ed294cedd241321c7a91
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9ba126cfbf505f4d5b39ed294cedd241321c7a91
Author: Ralf Baechle <ra...@li...>
Date:   Fri Oct 13 11:22:52 2006 +0100

    [MIPS] Fix warning about init_initrd() call if !CONFIG_BLK_DEV_INITRD.
    
    Signed-off-by: Ralf Baechle <ra...@li...>

commit 1a5c5de1b64ec510a6ab6994702c295db00b9acc
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1a5c5de1b64ec510a6ab6994702c295db00b9acc
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1a5c5de1b64ec510a6ab6994702c295db00b9acc
Author: Ralf Baechle <ra...@li...>
Date:   Thu Nov 2 17:23:33 2006 +0000

    [MIPS] IP27: Allow SMP ;-)  Another changeset messed up by patch.
    
    When lmo commit 4ef893e0515e8bf336dfbd200884f244869fbb43 was merged to
    kernel.org as e73ea273ef87a04ff59fc368fa33333dca275dde patch happily
    applied the IP27 segment to IP22.  f63f36c18b11e166d0f362ac04dbcd7e6ea23f9e
    did fix the effects partially - and with a wrong log message.  Now fixed
    for real (tm).
    
    Signed-off-by: Ralf Baechle <ra...@li...>

commit 8a88ca8f7fd15d06e53a848c6b3558ed9973327c
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8a88ca8f7fd15d06e53a848c6b3558ed9973327c
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8a88ca8f7fd15d06e53a848c6b3558ed9973327c
Author: Ralf Baechle <ra...@li...>
Date:   Thu Nov 2 17:23:33 2006 +0000

    [MIPS] Fix merge screwup by patch(1)
    
    Patch happily applied an Ocelot G patch to Ocelot C when merging
    linux-mips.org changeset 91ee9a801e65d2981dfe327d2519c7fc6ab02e6b into
    kernel.org as 6ceb6d3ab2d402cea326320a4143db90a66fd216.
    
    Signed-off-by: Ralf Baechle <ra...@li...>

commit 8427829711b35e0e62668618cec577f65c102935
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8427829711b35e0e62668618cec577f65c102935
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8427829711b35e0e62668618cec577f65c102935
Author: Ralf Baechle <ra...@li...>
Date:   Thu Nov 2 02:00:02 2006 +0000

    Revert "[MIPS] Make SPARSEMEM selectable on QEMU."
    
    This reverts commit 31473747bd441719f9f6a07385684dce547533e0.
    
    Another amazing example of patch(1) messing up - lmo changeset
    66e8560d11d02bcadc261498471831a6375ad046 was merged twice to kernel.org
    and ended up doing this rubbish job.
    
    Signed-off-by: Ralf Baechle <ra...@li...>

commit 096e5bdaf166791e128ed3b9190542412559333b
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=096e5bdaf166791e128ed3b9190542412559333b
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=096e5bdaf166791e128ed3b9190542412559333b
Merge: eb193e405155c5680ca1560b040b1551566660f9 89f68225876db7df638de2884b561facb1870239
Author: Linus Torvalds <tor...@g5...>
Date:   Thu Nov 2 08:51:26 2006 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
      jfs: Add splice support

commit eb193e405155c5680ca1560b040b1551566660f9
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=eb193e405155c5680ca1560b040b1551566660f9
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=eb193e405155c5680ca1560b040b1551566660f9
Merge: 0ca2b776ab1f4ba99d7f592baa4ff8525e53b050 6f5b7ef6b5816dc497094048d7d8a270004602d6
Author: Linus Torvalds <tor...@g5...>
Date:   Thu Nov 2 08:50:46 2006 -0800

    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:
      [NETFILTER]: silence a warning in ebtables
      [IPV6]: File the fingerprints off ah6->spi/esp6->spi
      [TCP]: Set default congestion control when no sysctl.
      [TIPC] net/tipc/port.c: fix NULL dereference

commit 0ca2b776ab1f4ba99d7f592baa4ff8525e53b050
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0ca2b776ab1f4ba99d7f592baa4ff8525e53b050
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0ca2b776ab1f4ba99d7f592baa4ff8525e53b050
Merge: aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7 c7fed9d75074f7c243ec8ff2c55d04de2839a6f6
Author: Linus Torvalds <tor...@g5...>
Date:   Thu Nov 2 08:50:02 2006 -0800

    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:
      [SPARC64]: Fix futex_atomic_cmpxchg_inatomic implementation.

commit 6f5b7ef6b5816dc497094048d7d8a270004602d6
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6f5b7ef6b5816dc497094048d7d8a270004602d6
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6f5b7ef6b5816dc497094048d7d8a270004602d6
Author: Meelis Roos <mr...@li...>
Date:   Wed Nov 1 18:07:27 2006 -0800

    [NETFILTER]: silence a warning in ebtables
    
    net/bridge/netfilter/ebtables.c: In function 'ebt_dev_check':
    net/bridge/netfilter/ebtables.c:89: warning: initialization discards qualifiers from pointer target type
    
    So make the char* a const char * and the warning is gone.
    
    Signed-off-by: Meelis Roos <mr...@li...>
    Signed-off-by: David S. Miller <da...@da...>

commit c7fed9d75074f7c243ec8ff2c55d04de2839a6f6
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c7fed9d75074f7c243ec8ff2c55d04de2839a6f6
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c7fed9d75074f7c243ec8ff2c55d04de2839a6f6
Author: David S. Miller <da...@da...>
Date:   Wed Nov 1 16:30:39 2006 -0800

    [SPARC64]: Fix futex_atomic_cmpxchg_inatomic implementation.
    
    I copied the logic from ll/sc arch implementations, but that
    was wrong and makes no sense at all.  Just do a straight
    compare-exchange instruction, just like x86.
    
    Based upon bug reports from Dennis Gilmore and Fabio Massimo.
    
    Signed-off-by: David S. Miller <da...@da...>

commit 5b1225454f7891970cb5ba87c8ef24edb1fa6c3a
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5b1225454f7891970cb5ba87c8ef24edb1fa6c3a
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5b1225454f7891970cb5ba87c8ef24edb1fa6c3a
Author: Al Viro <vi...@ze...>
Date:   Wed Nov 1 15:28:58 2006 -0800

    [IPV6]: File the fingerprints off ah6->spi/esp6->spi
    
    In theory these are opaque 32bit values.  However, we end up
    allocating them sequentially in host-endian and stick unchanged
    on the wire.
    
    Signed-off-by: Al Viro <vi...@ze...>
    Signed-off-by: David S. Miller <da...@da...>

commit b1736a71404b3961f061c795a81210aa7f945fc0
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b1736a71404b3961f061c795a81210aa7f945fc0
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b1736a71404b3961f061c795a81210aa7f945fc0
Author: Stephen Hemminger <she...@os...>
Date:   Tue Oct 31 17:31:33 2006 -0800

    [TCP]: Set default congestion control when no sysctl.
    
    The setting of the default congestion control was buried in
    the sysctl code so it would not be done properly if SYSCTL was
    not enabled.
    
    Signed-off-by: Stephen Hemminger <she...@os...>
    Signed-off-by: David S. Miller <da...@da...>

commit d55b4c631e89a008e80b003e5aa4291d9ec800ac
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d55b4c631e89a008e80b003e5aa4291d9ec800ac
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d55b4c631e89a008e80b003e5aa4291d9ec800ac
Author: Adrian Bunk <bu...@st...>
Date:   Tue Oct 31 16:59:35 2006 -0800

    [TIPC] net/tipc/port.c: fix NULL dereference
    
    The correct order is: NULL check before dereference
    
    Spotted by the Coverity checker.
    
    Signed-off-by: Adrian Bunk <bu...@st...>
    Signed-off-by: David S. Miller <da...@da...>

commit 89f68225876db7df638de2884b561facb1870239
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=89f68225876db7df638de2884b561facb1870239
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=89f68225876db7df638de2884b561facb1870239
Author: Daniel Drake <dd...@br...>
Date:   Mon Oct 30 11:47:02 2006 -0600

    jfs: Add splice support
    
    This allows the splice() and tee() syscalls to be used with JFS.
    
    Signed-off-by: Daniel Drake <dd...@br...>
    Signed-off-by: Dave Kleikamp <sh...@au...>