Merge branch 'work.adfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull adfs updates from Al Viro:
 "More ADFS patches from Russell King"

* 'work.adfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs/adfs: add time stamp and file type helpers
  fs/adfs: super: limit idlen according to directory type
  fs/adfs: super: fix use-after-free bug
  fs/adfs: super: safely update options on remount
  fs/adfs: super: correct superblock flags
  fs/adfs: clean up indirect disc addresses and fragment IDs
  fs/adfs: clean up error message printing
  fs/adfs: use %pV for error messages
  fs/adfs: use format_version from disc_record
  fs/adfs: add helper to get filesystem size
  fs/adfs: add helper to get discrecord from map
  fs/adfs: correct disc record structure

diff --cc fs/adfs/dir.c
Simple merge

diff --cc fs/adfs/dir_f.c
index 7557378,67afb38..c1a950c
--- 1/fs/adfs/dir_f.c
--- 2/fs/adfs/dir_f.c
+++ b/fs/adfs/dir_f.c
@@@ -4,9 -3,12 +4,8 @@@
   *
   * Copyright (C) 1997-1999 Russell King
   *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License version 2 as
 - * published by the Free Software Foundation.
 - *
   *  E and F format directory handling
   */
- #include <linux/buffer_head.h>
  #include "adfs.h"
  #include "dir_f.h"
  

diff --cc fs/adfs/dir_fplus.c
index 6c5fbb0,973282f..d56924c
--- 1/fs/adfs/dir_fplus.c
--- 2/fs/adfs/dir_fplus.c
+++ b/fs/adfs/dir_fplus.c
@@@ -3,8 -2,11 +3,7 @@@
   *  linux/fs/adfs/dir_fplus.c
   *
   *  Copyright (C) 1997-1999 Russell King
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License version 2 as
 - * published by the Free Software Foundation.
   */
- #include <linux/buffer_head.h>
  #include <linux/slab.h>
  #include "adfs.h"
  #include "dir_fplus.h"

diff --cc fs/adfs/inode.c
Simple merge

diff --cc fs/adfs/map.c
index 4d34338,e8f70f7..f44d12c
--- 1/fs/adfs/map.c
--- 2/fs/adfs/map.c
+++ b/fs/adfs/map.c
@@@ -3,8 -2,11 +3,7 @@@
   *  linux/fs/adfs/map.c
   *
   *  Copyright (C) 1997-2002 Russell King
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License version 2 as
 - * published by the Free Software Foundation.
   */
- #include <linux/buffer_head.h>
  #include <asm/unaligned.h>
  #include "adfs.h"
  

diff --cc fs/adfs/super.c
Simple merge