[Unionfs] linux-2.6.22-rc7-u1.diff.gz: polluted diff

[Stefan Lippers-Hollmann]

Hi

The latest unionfs 2.x diff against kernel 2.6.22-rc7 obviously dragged in
newer upstream -git changes unrelated to unionfs, which conflict against
current -git.

$ wget -qO- ftp://ftp.filesystems.org/pub/unionfs/unionfs-2.x/linux-2.6.22-rc7-u1.diff.gz | gzip -dc | diffstat
 b/Documentation/filesystems/00-INDEX             |    2
 b/Documentation/filesystems/unionfs/00-INDEX     |   10
 b/Documentation/filesystems/unionfs/concepts.txt |  181 +++
 b/Documentation/filesystems/unionfs/issues.txt   |   15
 b/Documentation/filesystems/unionfs/rename.txt   |   31
 b/Documentation/filesystems/unionfs/usage.txt    |   97 +
 b/MAINTAINERS                                    |   17
 b/arch/blackfin/Kconfig                          |    6
 b/arch/blackfin/Makefile                         |   21
 b/arch/blackfin/configs/BF533-EZKIT_defconfig    |   12
 b/arch/blackfin/configs/BF533-STAMP_defconfig    |   26
 b/arch/blackfin/configs/BF537-STAMP_defconfig    |   26
 b/arch/blackfin/configs/BF561-EZKIT_defconfig    |   12
 b/arch/blackfin/configs/PNAV-10_defconfig        |   13
 b/arch/blackfin/kernel/setup.c                   |   18
 b/arch/blackfin/kernel/traps.c                   |    3
 b/drivers/acpi/osl.c                             |    4
 b/drivers/ata/Kconfig                            |    5
 b/drivers/ata/libata-core.c                      |    3
 b/drivers/ata/pata_pdc2027x.c                    |   11
 b/drivers/ata/pata_sis.c                         |   46
 b/drivers/ata/sata_inic162x.c                    |    7
 b/drivers/ata/sata_nv.c                          |    1
 b/drivers/ata/sata_sis.c                         |   39
 b/drivers/ata/sis.h                              |    2
 b/drivers/firewire/Kconfig                       |   65 -
 b/drivers/firewire/fw-ohci.c                     |    6
 b/drivers/infiniband/ulp/ipoib/ipoib_cm.c        |    4
 b/drivers/mtd/mtdsuper.c                         |    2
 b/drivers/net/gianfar.c                          |    2
 b/drivers/net/mlx4/main.c                        |    2
 b/drivers/net/myri10ge/myri10ge.c                |    2
 b/drivers/net/netxen/netxen_nic.h                |  180 +++
 b/drivers/net/netxen/netxen_nic_hdr.h            |    2
 b/drivers/net/netxen/netxen_nic_hw.c             |   33
 b/drivers/net/netxen/netxen_nic_init.c           |   51
 b/drivers/net/netxen/netxen_nic_main.c           |  177 ++-
 b/drivers/net/netxen/netxen_nic_phan_reg.h       |   14
 b/drivers/net/ns83820.c                          |    4
 b/drivers/net/pcmcia/3c589_cs.c                  |    2
 b/drivers/net/starfire.c                         |    2
 b/drivers/net/usb/cdc_ether.c                    |    8
 b/drivers/net/usb/dm9601.c                       |   11
 b/drivers/net/usb/usbnet.c                       |    9
 b/drivers/net/wireless/libertas/Makefile         |    2
 b/drivers/net/wireless/libertas/README           |  275 -----
 b/drivers/net/wireless/libertas/assoc.c          |   28
 b/drivers/net/wireless/libertas/cmd.c            |   12
 b/drivers/net/wireless/libertas/cmdresp.c        |   21
 b/drivers/net/wireless/libertas/hostcmd.h        |    2
 b/drivers/net/wireless/libertas/main.c           |    8
 b/drivers/net/wireless/libertas/scan.c           |   51
 b/drivers/net/wireless/libertas/wext.c           |  152 --
 b/drivers/net/wireless/libertas/wext.h           |   45
 b/drivers/scsi/Kconfig                           |    1
 b/fs/Kconfig                                     |   47
 b/fs/Makefile                                    |    1
 b/fs/drop_caches.c                               |    4
 b/fs/ecryptfs/dentry.c                           |    2
 b/fs/ecryptfs/inode.c                            |   16
 b/fs/ecryptfs/main.c                             |    2
 b/fs/namei.c                                     |   11
 b/fs/stack.c                                     |   30
 b/fs/unionfs/Makefile                            |   20
 b/fs/unionfs/commonfops.c                        |  815 +++++++++++++++
 b/fs/unionfs/copyup.c                            |  850 +++++++++++++++
 b/fs/unionfs/debug.c                             |  470 ++++++++
 b/fs/unionfs/dentry.c                            |  475 ++++++++
 b/fs/unionfs/dirfops.c                           |  276 +++++
 b/fs/unionfs/dirhelper.c                         |  271 +++++
 b/fs/unionfs/fanout.h                            |  318 +++++
 b/fs/unionfs/file.c                              |  157 ++
 b/fs/unionfs/inode.c                             | 1222 +++++++++++++++++++++++
 b/fs/unionfs/lookup.c                            |  575 ++++++++++
 b/fs/unionfs/main.c                              |  762 ++++++++++++++
 b/fs/unionfs/mmap.c                              |  358 ++++++
 b/fs/unionfs/rdstate.c                           |  282 +++++
 b/fs/unionfs/rename.c                            |  514 +++++++++
 b/fs/unionfs/sioq.c                              |  123 ++
 b/fs/unionfs/sioq.h                              |   96 +
 b/fs/unionfs/subr.c                              |  240 ++++
 b/fs/unionfs/super.c                             | 1005 ++++++++++++++++++
 b/fs/unionfs/union.h                             |  575 ++++++++++
 b/fs/unionfs/unlink.c                            |  192 +++
 b/fs/unionfs/xattr.c                             |  165 +++
 b/include/asm-blackfin/processor.h               |    4
 b/include/linux/fs_stack.h                       |   23
 b/include/linux/magic.h                          |    2
 b/include/linux/mm.h                             |    1
 b/include/linux/namei.h                          |   24
 b/include/linux/union_fs.h                       |   29
 drivers/net/wireless/libertas/ioctl.c            | 1081 --------------------
 92 files changed, 10967 insertions(+), 1852 deletions(-)

Regards
	Stefan Lippers-Hollmann
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://www.fsl.cs.sunysb.edu/pipermail/unionfs/attachments/20070707/2fc29593/attachment.bin