Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Remove SunOS and Solaris binary support.

diff --combined Documentation/feature-removal-schedule.txt
index b45ea28abc997c5269f20fdaa331f9a558cb4705,76ab78e83bb1a85ccb751cb40144acf96d5a7f40..448729fcaeb1d0b9557333d54cef7ef7f1628fe5
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -261,17 -261,6 +261,6 @@@ Who:      Michael Buesch <mb@bu3sch.de
  
  ---------------------------
  
- What: Solaris/SunOS syscall and binary support on Sparc
- When: 2.6.26
- Why:  Largely unmaintained and almost entirely unused.  File system
-       layering used to divert library and dynamic linker searches to
-       /usr/gnemul is extremely buggy and unfixable.  Making it work
-       is largely pointless as without a lot of work only the most
-       trivial of Solaris binaries can work with the emulation code.
- Who:  David S. Miller <davem@davemloft.net>
- 
- ---------------------------
- 
  What: init_mm export
  When: 2.6.26
  Why:  Not used in-tree. The current out-of-tree users used it to
@@@ -282,13 -271,6 +271,13 @@@
        out-of-tree driver.
  Who:  Thomas Gleixner <tglx@linutronix.de>
  
 +----------------------------
 +
 +What: usedac i386 kernel parameter
 +When: 2.6.27
 +Why:  replaced by allowdac and no dac combination
 +Who:  Glauber Costa <gcosta@redhat.com>
 +
  ---------------------------
  
  What: /sys/o2cb symlink
@@@ -298,11 -280,3 +287,11 @@@ Why:     /sys/fs/o2cb is the proper locatio
        ocfs2-tools. 2 years should be sufficient time to phase in new versions
        which know to look in /sys/fs/o2cb.
  Who:  ocfs2-devel@oss.oracle.com
 +
 +---------------------------
 +
 +What: asm/semaphore.h
 +When: 2.6.26
 +Why:  Implementation became generic; users should now include
 +      linux/semaphore.h instead.
 +Who:  Matthew Wilcox <willy@linux.intel.com>

diff --combined arch/sparc64/Kconfig
index 2667a9dee11d943cd2f018a2eec489034c0fd07d,b782d874759c03222b4bb77e50f8bd0e7ee0fd5a..df3eacb5ca15dcaf1f716148d1dcdcc1e7c33195
--- 1/arch/sparc64/Kconfig
--- 2/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@@ -16,7 -16,6 +16,7 @@@ config SPARC6
        bool
        default y
        select HAVE_IDE
 +      select HAVE_LMB
        help
          SPARC is a family of RISC microprocessors designed and marketed by
          Sun Microsystems, incorporated.  This port covers the newer 64-bit
@@@ -88,9 -87,6 +88,6 @@@ config GENERIC_HARDIRQS_NO__DO_IR
        bool
        def_bool y
  
- config ARCH_SUPPORTS_AOUT
-       def_bool y
- 
  choice
        prompt "Kernel page size"
        default SPARC64_PAGE_SIZE_8KB
@@@ -148,11 -144,6 +145,6 @@@ config HOTPLUG_CP
  
  source "init/Kconfig"
  
- config SYSVIPC_COMPAT
-       bool
-       depends on COMPAT && SYSVIPC
-       default y
- 
  config GENERIC_HARDIRQS
        bool
        default y
@@@ -380,6 -371,10 +372,10 @@@ config SUN_OPENPROMF
          To compile the /proc/openprom support as a module, choose M here: the
          module will be called openpromfs.  If unsure, choose M.
  
+ menu "Executable file formats"
+ 
+ source "fs/Kconfig.binfmt"
+ 
  config SPARC32_COMPAT
        bool "Kernel support for Linux/Sparc 32bit binary compatibility"
        help
@@@ -392,37 -387,10 +388,10 @@@ config COMPA
        default y
        select COMPAT_BINFMT_ELF
  
- config BINFMT_AOUT32
-       bool "Kernel support for 32-bit (ie. SunOS) a.out binaries"
-       depends on SPARC32_COMPAT && ARCH_SUPPORTS_AOUT
-       help
-         This allows you to run 32-bit a.out format binaries on your Ultra.
-         If you want to run SunOS binaries (see SunOS binary emulation below)
-         or other a.out binaries, say Y. If unsure, say N.
- 
- menu "Executable file formats"
- 
- source "fs/Kconfig.binfmt"
- 
- config SUNOS_EMUL
-       bool "SunOS binary emulation"
-       depends on BINFMT_AOUT32
-       help
-         This allows you to run most SunOS binaries.  If you want to do this,
-         say Y here and place appropriate files in /usr/gnemul/sunos. See
-         <http://www.ultralinux.org/faq.html> for more information.  If you
-         want to run SunOS binaries on an Ultra you must also say Y to
-         "Kernel support for 32-bit a.out binaries" above.
- 
- config SOLARIS_EMUL
-       tristate "Solaris binary emulation (EXPERIMENTAL)"
-       depends on SPARC32_COMPAT && NET && EXPERIMENTAL
-       help
-         This is experimental code which will enable you to run (many)
-         Solaris binaries on your SPARC Linux machine.
- 
-         To compile this code as a module, choose M here: the
-         module will be called solaris.
+ config SYSVIPC_COMPAT
+       bool
+       depends on COMPAT && SYSVIPC
+       default y
  
  endmenu
  

diff --combined net/core/sock.c
index 5ac05269355474dafda721357934be004a52ac3d,bf6f83e48e8700ba576c0e6a3922f70ffc07dcb4..5dbb81bc96733d260e97c9c573acde9260b58174
--- 1/net/core/sock.c
--- 2/net/core/sock.c
+++ b/net/core/sock.c
@@@ -450,15 -450,6 +450,6 @@@ int sock_setsockopt(struct socket *sock
         *      Options without arguments
         */
  
- #ifdef SO_DONTLINGER          /* Compatibility item... */
-       if (optname == SO_DONTLINGER) {
-               lock_sock(sk);
-               sock_reset_flag(sk, SOCK_LINGER);
-               release_sock(sk);
-               return 0;
-       }
- #endif
- 
        if (optname == SO_BINDTODEVICE)
                return sock_bindtodevice(sk, optval, optlen);
  
@@@ -942,6 -933,7 +933,6 @@@ static void sk_prot_free(struct proto *
   *    @family: protocol family
   *    @priority: for allocation (%GFP_KERNEL, %GFP_ATOMIC, etc)
   *    @prot: struct proto associated with this new sock instance
 - *    @zero_it: if we should zero the newly allocated sock
   */
  struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
                      struct proto *prot)