Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: (41 commits)
  udf: use crc_itu_t from lib instead of udf_crc
  udf: Fix compilation warnings when UDF debug is on
  udf: Fix bug in VAT mapping code
  udf: Add read-only support for 2.50 UDF media
  udf: Fix handling of multisession media
  udf: Mount filesystem read-only if it has pseudooverwrite partition
  udf: Handle VAT packed inside inode properly
  udf: Allow loading of VAT inode
  udf: Fix detection of VAT version
  udf: Silence warning about accesses beyond end of device
  udf: Improve anchor block detection
  udf: Cleanup anchor block detection.
  udf: Move processing of virtual partitions
  udf: Move filling of partition descriptor info into a separate function
  udf: Improve error recovery on mount
  udf: Cleanup volume descriptor sequence processing
  udf: fix anchor point detection
  udf: Remove declarations of arrays of size UDF_NAME_LEN (256 bytes)
  udf: Remove checking of existence of filename in udf_add_entry()
  udf: Mark udf_process_sequence() as noinline
  ...

diff --combined fs/Kconfig
index 028ae38ecc52538038d76051c6862345fe431349,86229c913ace4c8368b2b2f93fd6234c7a267e48..8b18a875867751cc9a95bdf85a9f6f9935b6b68d
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -444,32 -444,6 +444,32 @@@ config OCFS2_F
          For more information on OCFS2, see the file
          <file:Documentation/filesystems/ocfs2.txt>.
  
 +config OCFS2_FS_O2CB
 +      tristate "O2CB Kernelspace Clustering"
 +      depends on OCFS2_FS
 +      default y
 +      help
 +        OCFS2 includes a simple kernelspace clustering package, the OCFS2
 +        Cluster Base.  It only requires a very small userspace component
 +        to configure it. This comes with the standard ocfs2-tools package.
 +        O2CB is limited to maintaining a cluster for OCFS2 file systems.
 +        It cannot manage any other cluster applications.
 +
 +        It is always safe to say Y here, as the clustering method is
 +        run-time selectable.
 +
 +config OCFS2_FS_USERSPACE_CLUSTER
 +      tristate "OCFS2 Userspace Clustering"
 +      depends on OCFS2_FS && DLM
 +      default y
 +      help
 +        This option will allow OCFS2 to use userspace clustering services
 +        in conjunction with the DLM in fs/dlm.  If you are using a
 +        userspace cluster manager, say Y here.
 +
 +        It is safe to say Y, as the clustering method is run-time
 +        selectable.
 +
  config OCFS2_DEBUG_MASKLOG
        bool "OCFS2 logging support"
        depends on OCFS2_FS
@@@ -689,6 -663,7 +689,7 @@@ config ZISOF
  
  config UDF_FS
        tristate "UDF file system support"
+       select CRC_ITU_T
        help
          This is the new file system used on some CD-ROMs and DVDs. Say Y if
          you intend to mount DVD discs or CDRW's written in packet mode, or
@@@ -1770,10 -1745,10 +1771,10 @@@ config ROOT_NF
          If you want your Linux box to mount its whole root file system (the
          one containing the directory /) from some other computer over the
          net via NFS (presumably because your box doesn't have a hard disk),
 -        say Y. Read <file:Documentation/nfsroot.txt> for details. It is
 -        likely that in this case, you also want to say Y to "Kernel level IP
 -        autoconfiguration" so that your box can discover its network address
 -        at boot time.
 +        say Y. Read <file:Documentation/filesystems/nfsroot.txt> for
 +        details. It is likely that in this case, you also want to say Y to
 +        "Kernel level IP autoconfiguration" so that your box can discover
 +        its network address at boot time.
  
          Most people say N here.
  

diff --combined include/linux/Kbuild
index b3d9ccde0c278983954f2105771ac0761efc16d3,897d84e04985d0e003f0f72fe8133df431d75bd8..34624835d90f39146861888397f2517b644dd807
--- 1/include/linux/Kbuild
--- 2/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@@ -61,7 -61,6 +61,7 @@@ header-y += efs_fs_sb.
  header-y += elf-fdpic.h
  header-y += elf-em.h
  header-y += fadvise.h
 +header-y += falloc.h
  header-y += fd.h
  header-y += fdreg.h
  header-y += fib_rules.h
@@@ -86,7 -85,6 +86,7 @@@ header-y += if_plip.
  header-y += if_ppp.h
  header-y += if_slip.h
  header-y += if_strip.h
 +header-y += if_tun.h
  header-y += if_tunnel.h
  header-y += in6.h
  header-y += in_route.h
@@@ -128,6 -126,7 +128,6 @@@ header-y += pkt_sched.
  header-y += posix_types.h
  header-y += ppdev.h
  header-y += prctl.h
 -header-y += ps2esdi.h
  header-y += qnxtypes.h
  header-y += quotaio_v1.h
  header-y += quotaio_v2.h
@@@ -150,6 -149,7 +150,7 @@@ header-y += tiocl.
  header-y += tipc.h
  header-y += tipc_config.h
  header-y += toshiba.h
+ header-y += udf_fs_i.h
  header-y += ultrasound.h
  header-y += un.h
  header-y += utime.h
@@@ -196,6 -196,7 +197,6 @@@ unifdef-y += ethtool.
  unifdef-y += eventpoll.h
  unifdef-y += signalfd.h
  unifdef-y += ext2_fs.h
 -unifdef-y += ext3_fs.h
  unifdef-y += fb.h
  unifdef-y += fcntl.h
  unifdef-y += filter.h
@@@ -204,6 -205,7 +205,6 @@@ unifdef-y += futex.
  unifdef-y += fs.h
  unifdef-y += gameport.h
  unifdef-y += generic_serial.h
 -unifdef-y += genhd.h
  unifdef-y += gfs2_ondisk.h
  unifdef-y += hayesesp.h
  unifdef-y += hdlcdrv.h
@@@ -230,7 -232,9 +231,7 @@@ unifdef-y += if_link.
  unifdef-y += if_pppol2tp.h
  unifdef-y += if_pppox.h
  unifdef-y += if_tr.h
 -unifdef-y += if_tun.h
  unifdef-y += if_vlan.h
 -unifdef-y += if_wanpipe.h
  unifdef-y += igmp.h
  unifdef-y += inet_diag.h
  unifdef-y += in.h
@@@ -246,13 -250,14 +247,13 @@@ unifdef-y += isdn.
  unifdef-y += isdnif.h
  unifdef-y += isdn_divertif.h
  unifdef-y += isdn_ppp.h
 -unifdef-y += jbd.h
  unifdef-y += joystick.h
  unifdef-y += kdev_t.h
  unifdef-y += kd.h
  unifdef-y += kernelcapi.h
  unifdef-y += kernel.h
  unifdef-y += keyboard.h
 -unifdef-$(CONFIG_HAVE_KVM) += kvm.h
 +unifdef-y += kvm.h
  unifdef-y += llc.h
  unifdef-y += loop.h
  unifdef-y += lp.h
@@@ -260,7 -265,6 +261,7 @@@ unifdef-y += mempolicy.
  unifdef-y += mii.h
  unifdef-y += mman.h
  unifdef-y += mroute.h
 +unifdef-y += mroute6.h
  unifdef-y += msdos_fs.h
  unifdef-y += msg.h
  unifdef-y += nbd.h
@@@ -289,7 -293,6 +290,7 @@@ unifdef-y += parport.
  unifdef-y += patchkey.h
  unifdef-y += pci.h
  unifdef-y += personality.h
 +unifdef-y += pim.h
  unifdef-y += pktcdvd.h
  unifdef-y += pmu.h
  unifdef-y += poll.h
@@@ -334,7 -337,6 +335,6 @@@ unifdef-y += time.
  unifdef-y += timex.h
  unifdef-y += tty.h
  unifdef-y += types.h
- unifdef-y += udf_fs_i.h
  unifdef-y += udp.h
  unifdef-y += uinput.h
  unifdef-y += uio.h