Linux 2.6.12

As some people may have noticed already, 2.6.12 is out there now.

The full ChangeLog ended up missing, because I only have the history from 2.6.12-rc2 in my git archives, but if you want to, you can puzzle it together by taking the 2.6.12 changelog and merging it with the -rc1 and -rc2 logs in the testing directory. The file that says "ChangeLog-2.6.12" only contains the stuff from -rc2 onward.

Included here in the email are the changes since -rc6, and as you can see from the appended diffstat, most of the things are pretty small (ie it looks like a long list, and then you look at the diffstat and realize that most of the changes end up being just a line or two).

One of the least important changes is still worth pointing out: it was discussed earlier on the kernel mailing list in another thread, but maybe people didn't notice it: the sign-off procedure was clarified to make it clear that the person signing off understands that the project - and thus the patch and the sign-off itself, of course - is public and will be archived.

This may sound silly and obvious - and it is - but it makes people more comfortable about the fact that we obviously save identifying information in the sign-off (that's the whole point), and in general people also submit things like their own email addresses in CREDITS files etc, and so nobody should be expecting any of that to be kept confidential.

I don't think anybody did, of course, but hey, this way it's explicit. So part of the new stuff is this patch:

diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches --- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -271,7 +271,7 @@ patch, which certifies that you wrote it
pass it on as a open-source patch. The rules are pretty simple: if you can certify the below:

- Developer's Certificate of Origin 1.0
+ Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

@@ -291,6 +291,12 @@ can certify the below:
person who certified (a), (b) or (c) and I have not modified it.

+ (d) I understand and agree that this project and the contribution
+ are public and that a record of the contribution (including all
+ personal information I submit with it, including my sign-off) is
+ maintained indefinitely and may be redistributed consistent with
+ this project or the open source license(s) involved.
+
then you just add a line saying

just so that people are aware of this.

Btw, in case anybody ends up wondering about what the actual patches are, if you're a git user (or, more likely, not quite a user yet, but rather wondering what you can do with git), you can start off with doing

	git-whatchanged -p v2.6.12-rc6..v2.6.12

and it will do exactly what you think it migth do - it shows every commit between -rc6 and the final 2.6.12 release as a patch ("-p") with the associated commit message.

Linus

-----
Al Viro:
namei fixes (1-19)

Alan Cox:
pwc bug fix

Alan Hourihane:
i945G patch for agpgart

Albert Lee:
sg traverse fix for __atapi_pio_bytes()

Albrecht Dreß:
ARM: 2694/1: [s3c2410/dma] release irq properly to fix kernel oops

Alexandre Oliva:
sbp2 slab corruption fix

Ananth N Mavinakayanahalli:
ppc64 kprobes: remove spurious MSR_SE masking ppc64 kprobes: correct kprobe registration return values ppc64 kprobes: don't eat dabr/iabr exceptions

Andi Kleen:
[TCP]: Adjust TCP mem order check to new alloc_large_system_hash

Andrew Morton:
revert x86_64-use-the-e820-hole-to-map-the-iommu-agp-aperture

Benjamin Herrenschmidt:
radeonfb: don't blow up VGA console on load
ppc32: Fix nasty sleep/wakeup problem

Bjorn Helgaas:
PCI: do VIA IRQ fixup always, not just in PIC mode

Catalin Marinas:
ARM: 2714/1: Fix the IB2 definitions for the Versatile platform
ARM: 2713/1: Fix the GPIO base for Integrator/CP
ARM: 2712/1: Fix the RGB order for the Versatile CLCD

Christoph Hellwig:
PCI: don't override drv->shutdown unconditionally

Christoph Lameter:
[IA64] Fix race condition in the rt_sigprocmask fastcall

Daniel Jacobowitz:
Fix large core dumps with a 32-bit off_t

Dave Airlie:
remove bogus hack from radeon IRQ handler
drm add i945G pci id

Dave Neuer:
ARM: 2706/1: Fix compile on SA-based iPAQs and remove stale CREDITS info

David Brownell:
spin longer for ehci port reset completion
ARM: 2709/1: Systems with PCMCIA should also see IDE options (for CompactFlash memories)

David Mosberger:
Replace check_bridge_mode() with (bridge->mode & AGSTAT_MODE_3_0). Include <linux/config.h> before testing CONFIG_ACPI

David Mosberger-Tang:
[IA64] Fill holes in FIXADDR_USER space with zero pages.

David S. Miller:
[NETFILTER]: ipt_recent: last_pkts is an array of "unsigned long" not "u_int32_t" [TG3]: Update driver version and release date.
[TG3]: Update driver version and release date.
[ETHTOOL]: Check correct pointer in ethtool_set_coalesce().

Dean Nelson:
[IA64] fix setting of sn_hub_info->shub_1_1_found

Deepak Saxena:
ARM: 2700/1: Disable IXP2000 IRQs at bootup
ARM: 2692/1: Fix compile warnings in include/asm-arm/arch-ixp2000/io.h

Denis Vlasenko:
moxa: do not ignore input

Dmitry Torokhov:
ALPS: fix enabling hardware tapping

Eugene Surovegin:
ppc32: add 405EP cpu_spec entry
ppc32: add 405EP cpu_spec entry
ppc32: add 405EP cpu_spec entry

Gabor Fekete:
[IPV6]: Update parm.link in ip6ip6_tnl_change()

Geert Uytterhoeven:
M68k: Mark Sun-3 NCR5380 SCSI broken
M68k: Update defconfigs
Remove obsolete HAVE_ARCH_GET_SIGNAL_TO_DELIVER?
IrDA: IrDA: Fix CONFIG_VIA_FIR typo (double `those')

Giorgio Padrin:
ARM: 2703/1: pxa-regs.h: complete I2S GPIO alternate functions for PXA27x

Ian Abbott:
USB: ftdi_sio: avoid losing received data in tty-ldisc

Ingo Molnar:
timer exit cleanup

J. Simonetti:
[IPV4]: Sysctl configurable icmp error source address.

Jan Kara:
cond_resched_lock() fix

Jeff Dike:
uml: slirp and slip driver cleanups and fixes
uml: use fork instead of clone
uml: build cleanups
uml: remove duplicate includes
uml: clean up error path
uml: fix strace -f
uml: compile fixes for gcc 4
uml: make the emulated iomem driver work on 2.6

Jens Axboe:
sata_sil: Fix FIFO PCI Bus Arbitration kernel oops

John W. Linville:
[TG3]: Update pci.ids for BCM5752

Jon Smirl:
Typo in fbdev sysfs support, virtual_size

Karsten Wiese:
usbusx2y: prevent oops & dead keyboard on usb unplugging while the device is being used
usbaudio: prevent oops & dead keyboard on usb unplugging while the device is being used

Keir Fraser:
AGP fix for Xen VMM

Keith Owens:
Stop arch/i386/kernel/vsyscall-note.o being rebuilt every time [IA64] Extract correct break number for break.b [IA64] Module gp must point to valid memory

Kiyoshi Ueda:
When cfq I/O scheduler is selected, get_request() in __make_request() calls

Kumar Gala:
ppc32: Fix incorrect CPU_FTR fixup usage for unified caches

Lars Marowsky-Bree:
dm: Handle READA requests in dm-mpath.c

Linus Torvalds:
Linux 2.6.12
Merge 'for-linus' branch of rsync://rsync.kernel.org/.../axboe/linux-2.6-block Merge master.kernel.org:/home/rmk/linux-2.6-arm
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Merge 'for-linus' branch of master.kernel.org:/.../axboe/linux-2.6-block Merge rsync://rsync.kernel.org/.../davem/net-2.6
Update DCO ("signoff") rules to 1.1
Merge rsync://rsync.kernel.org/.../davem/net-2.6
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Merge rsync://rsync.kernel.org/.../sfrench/cifs-2.6
Merge rsync://rsync.kernel.org/.../airlied/drm-2.6
ppc: remove two extraneous descriptors for the 405EP CPU
Merge rsync://rsync.kernel.org/.../gregkh/usb-2.6
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Merge rsync://rsync.kernel.org/.../aegl/linux-2.6
Merge rsync://rsync.kernel.org/.../gregkh/usb-2.6
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Merge rsync://rsync.kernel.org/.../davem/net-2.6
Merge rsync://rsync.kernel.org/.../davem/tg3-2.6
Merge rsync://rsync.kernel.org/.../aegl/linux-2.6
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Automatic merge of master.kernel.org:/home/rmk/linux-2.6-arm Merge of master.kernel.org:/.../davej/agpgart
Merge of rsync://rsync.kernel.org/.../davem/tg3-2.6
Merge of rsync://rsync.kernel.org/.../davem/net-2.6

Markus Lidel:
i2o: Fix free of event memory in i2o_block_event()

Martin Schwidefsky:
broken fault_in_pages_readable call in generic_file_buffered_write()

Matthew Dobson:
send_IPI_mask_sequence() warning fix

Michael Chan:
[TG3]: Fix 5700/5701 DMA corruption on Apple G4. [TG3] Fix link failure in 5701
[TG3]: Add TSO firmware license

Michael Ellerman:
iseries_veth: Supress spurious WARN_ON() at module unload

Michael Werner:
sgi-agp: fixes a problem with accessing GART memory in sgi_tioca_insert_memory and sgi_tioca_remove_memory

Mike Frysinger:
ARM: 2696/1: remove ';' in ELF_DATA define in asm-arm{,26}/elf.h

Narendra Sankar:
PCI: MSI functionality broken on Serverworks GC chipset

Neil Horman:
[SCTP] Add support for ip_nonlocal_bind sysctl & IP_FREEBIND socket option [SCTP] Support SO_BINDTODEVICE socket option on incoming packets.

Nicolas Pitre:
ARM: 2715/1: restore CPLD interrupts upon resume for Lubbock and Mainstone
ARM: 2711/1: fix compilation on PXA targets with CONFIG_PM=n
ARM: 2664/2: add support for atomic ops on pre-ARMv6 SMP systems
ARM: 2705/1: fix writesw for misaligned source pointer

Olaf Hering:
update ppc64 defconfig
ppc64: print negative numbers correctly in boot wrapper

Oliver Neukum:
fix for kaweth broken by changes in the networking layer

Olof Johansson:
Fix PCI BAR size interpretation on 64-bit arches

Patrick McHardy:
[NETFILTER]: Advance seq-file position in exp_next_seq()

Paul Mackerras:
ppc64: update example configs
ppc64: Fix PER_LINUX32 behaviour

Pete Zaitcev:
USB: fix ub issues

Peter Chubb:
ia64: fix floating-point preemption problem

Ralf Baechle:
[NET]: Move the netdev list to vger.kernel.org.

Randy Dunlap:
macmodes: needs a license
[IPV4]: Multipath modules need a license to prevent kernel tainting.

Russell King:
ARM: Remove zero-byte sized file
Serial: remove unused variable in sa1100 driver
ARM: Fix Xscale copy_page implementation

Rémi Denis-Courmont:
[IPv6] Don't generate temporary for TUN devices

Scott Murray:
PCI Hotplug: fix CPCI reference counting bug

Sridhar Samudrala:
[SCTP] Fix incorrect setting of sk_bound_dev_if when binding/sending to a ipv6

Stephen Hemminger:
[NET]: Fix sysctl net.core.dev_weight
[NET]: Allow controlling NAPI device weight with sysfs

Steve French:
Merge with rsync://rsync.kernel.org/.../torvalds/linux-2.6.git [CIFS] Fix cifs update of page cache. Write at correct offset when out of memory Merge with rsync://rsync.kernel.org/.../torvalds/linux-2.6.git [CIFS] Update cifs version number and fix whitespace
Merge with rsync://rsync.kernel.org/.../torvalds/linux-2.6.git Merge with rsync://rsync.kernel.org/.../torvalds/linux-2.6.git Merge with rsync://rsync.kernel.org/.../torvalds/linux-2.6.git

Tejun Heo:
This patch fixes q->unplug_thresh condition check in This patch kills elevator_global_init() in elevator.c which does

Thomas Graf:
[PKT_SCHED]: Fix numeric comparison in meta ematch [PKT_SCHED]: Dump classification result for basic classifier [PKT_SCHED]: Allow socket attributes to be matched on via meta ematch [PKT_SCHED]: Fix typo in NET_EMATCH_STACK help text

Thomas Hood:
apm.c: ignore_normal_resume is set a bit too late

Todd Poynor:
ARM: 2691/1: PXA27x sleep fixes take 2

Tom Rini:
[NET]: linux/if_tr.h needs asm/byteorder.h
ppc32: add <linux/compiler.h> to <asm/sigcontext.h>

Tony Luck:
[IA64] Update comment to describe modes set in default control register. Auto merge with /home/aegl/GIT/linus
auto merge with /home/aegl/GIT/linus

Trond Myklebust:
NFS: Ensure that we revalidate the cached file length for llseek(SEEK_END)
NFS: Fix lookup intent handling

Vincent Sanders:
ARM: 2708/1: Fix hackkit CPU Frequency build faliure
ARM: 2707/2: Fix badge4 CPU Frequency build faliure

Vladislav Yasevich:
[SCTP] Extend the info exported via /proc/net/sctp to support netstat for SCTP. [SCTP]: Fix bug in restart of peeled-off associations.

Vojtech Pavlik:
input: disable scroll feature on AT keyboards

William Lee Irwin III:
sparc32: silence access_ok() warnings

YOSHIFUJI Hideaki:
[IPV6]: Ensure to use icmpv6_socket in non-preemptive context.

Yoshinori Sato:
binfmt_flat mmap flag fix
h8300 build error fix

---
 CREDITS                                      |    6 -
 Documentation/SubmittingPatches              |    8 +
 Documentation/networking/vortex.txt          |    2 
 MAINTAINERS                                  |   48 ++--
 Makefile                                     |    2 
 arch/arm/Kconfig                             |    6 -
 arch/arm/boot/compressed/head-xscale.S       |    7 +
 arch/arm/configs/badge4_defconfig            |   29 ++-
 arch/arm/configs/h3600_defconfig             |   24 +-
 arch/arm/configs/hackkit_defconfig           |   22 +-
 arch/arm/kernel/entry-armv.S                 |   16 +
 arch/arm/kernel/traps.c                      |   49 ++++
 arch/arm/lib/io-writesw-armv4.S              |    6 -
 arch/arm/mach-integrator/integrator_cp.c     |    1 
 arch/arm/mach-pxa/lubbock.c                  |   30 +++
 arch/arm/mach-pxa/mainstone.c                |   40 +++-
 arch/arm/mach-pxa/pm.c                       |   32 ++-
 arch/arm/mach-pxa/pxa25x.c                   |   33 +++
 arch/arm/mach-pxa/pxa27x.c                   |   36 +++
 arch/arm/mach-s3c2410/dma.c                  |    4 
 arch/arm/mach-sa1100/Kconfig                 |    2 
 arch/arm/mach-versatile/core.c               |    2 
 arch/arm/mm/Kconfig                          |   15 +
 arch/arm/mm/Makefile                         |    2 
 arch/arm/mm/copypage-xscale.S                |  113 ----------
 arch/arm/mm/copypage-xscale.c                |  131 ++++++++++++
 arch/arm/mm/minicache.c                      |   73 ------
 arch/i386/kernel/Makefile                    |    2 
 arch/i386/kernel/apm.c                       |    2 
 arch/ia64/kernel/fsys.S                      |    4 
 arch/ia64/kernel/module.c                    |   10 +
 arch/ia64/kernel/ptrace.c                    |    6 +
 arch/ia64/kernel/setup.c                     |    3 
 arch/ia64/kernel/traps.c                     |   29 ++-
 arch/ia64/mm/init.c                          |   19 +-
 arch/ia64/sn/kernel/setup.c                  |    4 
 arch/m68k/configs/amiga_defconfig            |   15 -
 arch/m68k/configs/apollo_defconfig           |    7 -
 arch/m68k/configs/atari_defconfig            |    7 -
 arch/m68k/configs/bvme6000_defconfig         |    7 -
 arch/m68k/configs/hp300_defconfig            |    7 -
 arch/m68k/configs/mac_defconfig              |    7 -
 arch/m68k/configs/mvme147_defconfig          |    7 -
 arch/m68k/configs/mvme16x_defconfig          |    7 -
 arch/m68k/configs/q40_defconfig              |   15 -
 arch/m68k/configs/sun3_defconfig             |    8 -
 arch/m68k/configs/sun3x_defconfig            |    7 -
 arch/m68k/defconfig                          |    7 -
 arch/ppc/kernel/cputable.c                   |   11 +
 arch/ppc/kernel/misc.S                       |    6 -
 arch/ppc/platforms/pmac_cpufreq.c            |    7 -
 arch/ppc64/boot/prom.c                       |   28 ++
 arch/ppc64/configs/g5_defconfig              |   76 ++++---
 arch/ppc64/configs/iSeries_defconfig         |   62 +++--
 arch/ppc64/configs/maple_defconfig           |   70 ++++--
 arch/ppc64/configs/pSeries_defconfig         |  102 ++++++---
 arch/ppc64/defconfig                         |  104 ++++++---
 arch/ppc64/kernel/kprobes.c                  |   18 +-
 arch/ppc64/kernel/misc.S                     |    2 
 arch/ppc64/kernel/sys_ppc32.c                |   70 +++---
 arch/ppc64/kernel/syscalls.c                 |   33 ++-
 arch/um/Kconfig_char                         |    6 +
 arch/um/drivers/Makefile                     |    6 -
 arch/um/drivers/chan_user.c                  |   26 +-
 arch/um/drivers/mmapper_kern.c               |   24 ++
 arch/um/drivers/net_user.c                   |    2 
 arch/um/drivers/slip.h                       |   23 --
 arch/um/drivers/slip_common.c                |   54 +++++
 arch/um/drivers/slip_common.h                |  104 +++++++++
 arch/um/drivers/slip_kern.c                  |   12 +
 arch/um/drivers/slip_proto.h                 |   93 --------
 arch/um/drivers/slip_user.c                  |  154 ++++++--------
 arch/um/drivers/slirp.h                      |   26 --
 arch/um/drivers/slirp_kern.c                 |    5 
 arch/um/drivers/slirp_user.c                 |  102 ++-------
 arch/um/drivers/stderr_console.c             |    6 -
 arch/um/include/mconsole.h                   |    2 
 arch/um/include/net_user.h                   |    2 
 arch/um/include/os.h                         |    2 
 arch/um/include/sysdep-i386/ptrace.h         |    5 
 arch/um/include/user_util.h                  |    3 
 arch/um/kernel/main.c                        |    2 
 arch/um/kernel/process.c                     |   49 ++--
 arch/um/kernel/skas/process_kern.c           |    7 +
 arch/um/kernel/um_arch.c                     |    1 
 arch/um/os-Linux/elf_aux.c                   |    6 -
 arch/um/os-Linux/file.c                      |    2 
 arch/um/scripts/Makefile.rules               |    2 
 arch/x86_64/kernel/aperture.c                |   41 +---
 drivers/block/cfq-iosched.c                  |    9 +
 drivers/block/elevator.c                     |    9 -
 drivers/block/ub.c                           |    4 
 drivers/char/agp/agp.h                       |    2 
 drivers/char/agp/ali-agp.c                   |    4 
 drivers/char/agp/amd-k7-agp.c                |    6 -
 drivers/char/agp/amd64-agp.c                 |    4 
 drivers/char/agp/ati-agp.c                   |    6 -
 drivers/char/agp/backend.c                   |    6 -
 drivers/char/agp/efficeon-agp.c              |    2 
 drivers/char/agp/generic.c                   |   36 +--
 drivers/char/agp/hp-agp.c                    |    4 
 drivers/char/agp/i460-agp.c                  |    4 
 drivers/char/agp/intel-agp.c                 |   21 +-
 drivers/char/agp/sgi-agp.c                   |   12 +
 drivers/char/agp/sworks-agp.c                |    8 -
 drivers/char/agp/uninorth-agp.c              |    2 
 drivers/char/drm/drm_pciids.h                |    1 
 drivers/char/drm/radeon_irq.c                |    5 
 drivers/char/mxser.c                         |   38 +--
 drivers/ieee1394/sbp2.c                      |    3 
 drivers/input/keyboard/atkbd.c               |    2 
 drivers/input/mouse/alps.c                   |    2 
 drivers/macintosh/via-pmu.c                  |    6 +
 drivers/md/dm-mpath.c                        |    3 
 drivers/message/i2o/i2o_block.c              |    1 
 drivers/net/irda/Kconfig                     |    2 
 drivers/net/iseries_veth.c                   |    9 -
 drivers/net/r8169.c                          |    2 
 drivers/net/tg3.c                            |   39 +++
 drivers/pci/hotplug/cpci_hotplug_core.c      |    2 
 drivers/pci/hotplug/cpci_hotplug_pci.c       |    5 
 drivers/pci/pci-driver.c                     |    5 
 drivers/pci/pci.ids                          |    1 
 drivers/pci/probe.c                          |    2 
 drivers/pci/quirks.c                         |   41 ++--
 drivers/scsi/Kconfig                         |    2 
 drivers/scsi/libata-core.c                   |    4 
 drivers/scsi/sata_sil.c                      |    8 +
 drivers/serial/sa1100.c                      |    2 
 drivers/usb/host/ehci-hub.c                  |    5 
 drivers/usb/media/pwc/pwc-if.c               |    4 
 drivers/usb/net/kaweth.c                     |    2 
 drivers/usb/serial/ftdi_sio.c                |  118 ++++++++--
 drivers/video/aty/radeon_base.c              |    7 -
 drivers/video/fbsysfs.c                      |    2 
 drivers/video/macmodes.c                     |    1 
 fs/binfmt_elf.c                              |    2 
 fs/binfmt_flat.c                             |    6 -
 fs/cifs/CHANGES                              |    3 
 fs/cifs/cifsfs.h                             |    2 
 fs/cifs/file.c                               |    2 
 fs/cifs/inode.c                              |   34 +--
 fs/namei.c                                   |  153 ++++++++-----
 fs/nfs/dir.c                                 |   49 +++-
 fs/nfs/file.c                                |   42 ++++
 include/asm-alpha/agp.h                      |   10 +
 include/asm-arm/arch-integrator/platform.h   |    4 
 include/asm-arm/arch-ixp2000/io.h            |   16 +
 include/asm-arm/arch-pxa/pxa-regs.h          |    2 
 include/asm-arm/arch-versatile/platform.h    |   16 +
 include/asm-arm/elf.h                        |    4 
 include/asm-arm26/elf.h                      |    2 
 include/asm-arm26/signal.h                   |    3 
 include/asm-h8300/kmap_types.h               |    6 -
 include/asm-h8300/mman.h                     |    3 
 include/asm-i386/agp.h                       |   10 +
 include/asm-i386/mach-numaq/mach_ipi.h       |    2 
 include/asm-ia64/agp.h                       |   10 +
 include/asm-ia64/pgtable.h                   |    8 +
 include/asm-ia64/processor.h                 |   10 +
 include/asm-ppc/agp.h                        |   10 +
 include/asm-ppc/sigcontext.h                 |    2 
 include/asm-ppc64/agp.h                      |   10 +
 include/asm-ppc64/elf.h                      |    4 
 include/asm-sparc/uaccess.h                  |    5 
 include/asm-sparc64/agp.h                    |   10 +
 include/asm-x86_64/agp.h                     |   10 +
 include/linux/acpi.h                         |    2 
 include/linux/if_tr.h                        |    2 
 include/linux/pci_ids.h                      |    3 
 include/linux/signal.h                       |    2 
 include/linux/sysctl.h                       |    1 
 include/linux/tc_ematch/tc_em_meta.h         |   30 +++
 include/net/ip.h                             |    1 
 kernel/exit.c                                |    4 
 kernel/posix-timers.c                        |    1 
 kernel/sched.c                               |    7 -
 mm/filemap.c                                 |    8 +
 net/core/dev.c                               |    1 
 net/core/ethtool.c                           |    2 
 net/core/net-sysfs.c                         |   17 +
 net/ipv4/af_inet.c                           |    1 
 net/ipv4/icmp.c                              |    9 +
 net/ipv4/multipath_drr.c                     |    2 
 net/ipv4/multipath_random.c                  |    2 
 net/ipv4/multipath_rr.c                      |    2 
 net/ipv4/multipath_wrandom.c                 |    2 
 net/ipv4/netfilter/ip_conntrack_standalone.c |    1 
 net/ipv4/netfilter/ipt_recent.c              |   10 -
 net/ipv4/sysctl_net_ipv4.c                   |    9 +
 net/ipv4/tcp.c                               |    2 
 net/ipv6/addrconf.c                          |    1 
 net/ipv6/icmp.c                              |   14 +
 net/ipv6/ip6_tunnel.c                        |    1 
 net/sched/Kconfig                            |    2 
 net/sched/act_api.c                          |    2 
 net/sched/cls_basic.c                        |    3 
 net/sched/em_meta.c                          |  295 ++++++++++++++++++++++++--
 net/sctp/input.c                             |   49 +++-
 net/sctp/ipv6.c                              |   36 +--
 net/sctp/proc.c                              |  190 +++++++++++++----
 net/sctp/protocol.c                          |    7 -
 net/sctp/socket.c                            |   12 +
 sound/usb/usbaudio.c                         |    2 
 sound/usb/usx2y/usbusx2y.c                   |   11 +
 205 files changed, 2496 insertions(+), 1438 deletions(-)

tar xjvf linux-2.6.12.tar.bz2, using SuSE tar-1.13.25-325.3 on IA64, reports

tar: pax_global_header: Unknown file type 'g', extracted as normal file

It does not seem to cause any problems.

Yes, git creates tar-archives that use the extended pax headers, and I think you need tar-1.14 to fully understand them. They should not hurt (apart from the warning) on older versions of tar.

The extended header just contains a hidden comment record that tells the git commit ID that was used to generate the tar-tree.

Because it's extracted as a regular file (instead of tar knowing that it's a comment header), you will now have a file called "pax_global_header" that has the contents

	52 comment=9ee1c939d1cb936b1f98e8d81aeffab57bae46ab

in it (where "9ee1c939d1cb936b1f98e8d81aeffab57bae46ab" is the git SHA1 name of the Linux-2.6.12 commit).

So it's not entirely "harmless" in that it causes a bogus file to be created, but it's not like it's a huge problem either, and that bogus file actually does contain real information (although it's not useful unless you're a git user).

Linus

I guess it will end up in dontdiff quickly :-)

Willy

If Linus accepts the patch below, then yes :-)

Add pax_global_header to Documentation/dontdiff
Kernel tar-archives created by git contain an extended header with the git commit ID that was used to generate the tar-tree. If your tar is older than 1.14 then this extended header will be extracted as a regular file called pax_global_header. Patches should never be generated against this file, so it should be listed in dontdiff.

---

 Documentation/dontdiff |    1 +
 1 files changed, 1 insertion(+)

@@ -138,3 +138,4 @@
 wanxlfw.inc
 uImage
 zImage
+pax_global_header

Ok.

Add pax_global_header to Documentation/dontdiff
Kernel tar-archives created by git contain an extended header with the git commit ID that was used to generate the tar-tree. If your tar is older than 1.14 then this extended header will be extracted as a regular file called pax_global_header. Patches should never be generated against this file, so it should be listed in dontdiff.

---

 Documentation/dontdiff |    1 +
 1 files changed, 1 insertion(+)

@@ -115,6 +115,7 @@
 oui.c*
 parse.c*
 parse.h*
+pax_global_header
 pnmtologo
 ppc_defs.h*
 promcon_tbl.c*

Then uImage is not at the right place :)
Patch attached.

Brice

@@ -130,11 +130,11 @@ tags
 times.h*
 tkparse
 trix_boot.h
+uImage
 version.h*
 vmlinux
 vmlinux-*
 vmlinux.lds
 vsyscall.lds
 wanxlfw.inc
-uImage
 zImage

Actually, I won't.

As far as I know, the "pax_global_header" file doesn't get added to inside the Linux directory, it gets added to the "top" directory, ie one directory up from the Linux directory. As such, this should all be unnecessary.

Linus

I just downloaded it, copied my 2.6.11.2 config over and did a make oldconfig. On USB Mon I got the following in the help.

-------------
If you say Y here, a component which captures the USB traffic between peripheral-specific drivers and HC drivers will be built. The USB_MON is similar in spirit and may be compatible with Dave Harding's USBMon.

This is somewhat experimental at this time, but it should be safe, as long as you aren't building this as a module and then removing it.

If unsure, say Y. Do not say M.

USB Monitor (USB_MON) [M/n/?] (NEW)
--------------

I really like my options. :-)

OK, I have CONFIG_USB as a module, but I really thought that this was pretty amusing.

-- Steve

The patch below tries to solve this in a better way.

cu
Adrian

<-- snip -->

This patch makes the USB_MON less confusing.

---

 drivers/usb/Makefile     |    4 +++-
 drivers/usb/core/hcd.c   |    2 +-
 drivers/usb/core/hcd.h   |    2 +-
 drivers/usb/mon/Kconfig  |   13 ++++---------
 drivers/usb/mon/Makefile |    2 +-
 include/linux/usb.h      |    2 +-
 6 files changed, 11 insertions(+), 14 deletions(-)

@@ -2,13 +2,9 @@
 # USB Monitor configuration
 #
 
-# In normal life, it makes little sense to have usbmon as a module, and in fact
-# it is harmful, because there is no way to autoload the module.
-# The 'm' option is allowed for hackers who debug the usbmon itself,
-# and for those who have usbcore as a module.
 config USB_MON
-	tristate "USB Monitor"
-	depends on USB
+	bool "USB Monitor"
+	depends on USB!=n
 	default y
 	help
 	  If you say Y here, a component which captures the USB traffic

@@ -17,6 +13,5 @@
 	  Harding's USBMon.
 
 	  This is somewhat experimental at this time, but it should be safe,
-	  as long as you aren't building this as a module and then removing it.
-
-	  If unsure, say Y. Do not say M.
+	  as long as you aren't using modular USB and try to remove this
+	  module.

@@ -6,7 +6,9 @@
 
 obj-$(CONFIG_USB)		+= core/
 
-obj-$(CONFIG_USB_MON)		+= mon/
+ifdef CONFIG_USB_MON
+  obj-$(CONFIG_USB)		+= mon/
+endif
 
 obj-$(CONFIG_USB_EHCI_HCD)	+= host/
 obj-$(CONFIG_USB_ISP116X_HCD)	+= host/

@@ -4,4 +4,4 @@
 
 usbmon-objs	:= mon_main.o mon_stat.o mon_text.o
 
-obj-$(CONFIG_USB_MON)	+= usbmon.o
+obj-$(CONFIG_USB)	+= usbmon.o

@@ -290,7 +290,7 @@
 	struct class_device *class_dev;	/* class device for this bus */
 	struct kref kref;		/* handles reference counting this bus */
 	void (*release)(struct usb_bus *bus);	/* function to destroy this bus's memory */
-#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
+#if defined(CONFIG_USB_MON)
 	struct mon_bus *mon_bus;	/* non-null when associated */
 	int monitored;			/* non-zero when monitored */
 #endif

@@ -410,7 +410,7 @@
 
 /*-------------------------------------------------------------------------*/
 
-#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
+#if defined(CONFIG_USB_MON)
 
 struct usb_mon_operations {
 	void (*urb_submit)(struct usb_bus *bus, struct urb *urb);

@@ -1855,7 +1855,7 @@
 
 /*-------------------------------------------------------------------------*/
 
-#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
+#if defined(CONFIG_USB_MON)
 
 struct usb_mon_operations *mon_ops;
 

I thought it was required, but reading Documentation/kbuild/makefiles.txt convinces me you are correct.

cu
Adrian

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

I forgot to attach the updated patch...
Here it is.

cu
Adrian

<-- snip -->

This patch makes the USB_MON less confusing.

---

 drivers/usb/core/hcd.c   |    2 +-
 drivers/usb/core/hcd.h   |    2 +-
 drivers/usb/mon/Kconfig  |   13 ++++---------
 drivers/usb/mon/Makefile |    2 +-
 include/linux/usb.h      |    2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

@@ -2,13 +2,9 @@
 # USB Monitor configuration
 #
 
-# In normal life, it makes little sense to have usbmon as a module, and in fact
-# it is harmful, because there is no way to autoload the module.
-# The 'm' option is allowed for hackers who debug the usbmon itself,
-# and for those who have usbcore as a module.
 config USB_MON
-	tristate "USB Monitor"
-	depends on USB
+	bool "USB Monitor"
+	depends on USB!=n
 	default y
 	help
 	  If you say Y here, a component which captures the USB traffic

@@ -17,6 +13,5 @@
 	  Harding's USBMon.
 
 	  This is somewhat experimental at this time, but it should be safe,
-	  as long as you aren't building this as a module and then removing it.
-
-	  If unsure, say Y. Do not say M.
+	  as long as you aren't using modular USB and try to remove this
+	  module.

@@ -4,4 +4,4 @@
 
 usbmon-objs	:= mon_main.o mon_stat.o mon_text.o
 
-obj-$(CONFIG_USB_MON)	+= usbmon.o
+obj-$(CONFIG_USB)	+= usbmon.o

@@ -290,7 +290,7 @@
 	struct class_device *class_dev;	/* class device for this bus */
 	struct kref kref;		/* handles reference counting this bus */
 	void (*release)(struct usb_bus *bus);	/* function to destroy this bus's memory */
-#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
+#if defined(CONFIG_USB_MON)
 	struct mon_bus *mon_bus;	/* non-null when associated */
 	int monitored;			/* non-zero when monitored */
 #endif

@@ -410,7 +410,7 @@
 
 /*-------------------------------------------------------------------------*/
 
-#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
+#if defined(CONFIG_USB_MON)
 
 struct usb_mon_operations {
 	void (*urb_submit)(struct usb_bus *bus, struct urb *urb);

@@ -1855,7 +1855,7 @@
 
 /*-------------------------------------------------------------------------*/
 
-#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
+#if defined(CONFIG_USB_MON)
 
 struct usb_mon_operations *mon_ops;
 

I have tested this for all 6 build positions (CONFIG_USB = n, m, y and CONFIG_USB_MON = n y) with a positive result. But I thought the help wordage was not quite what we needed, and the reference to USBMon was incorrect. So, the attached is just a little different. Adrian, how about this?

--------------------------------
This makes the configuration of USB_MON less confusing.

diff -urp -X dontdiff linux-2.6.12/drivers/usb/core/hcd.c linux-2.6.12-lem/drivers/usb/core/hcd.c
@@ -1801,7 +1801,7 @@ EXPORT_SYMBOL (usb_remove_hcd);
 
 /*-------------------------------------------------------------------------*/
 
-#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
+#if defined(CONFIG_USB_MON)
 
 struct usb_mon_operations *mon_ops;
 

diff -urp -X dontdiff linux-2.6.12/drivers/usb/core/hcd.h linux-2.6.12-lem/drivers/usb/core/hcd.h
@@ -399,7 +399,7 @@ static inline void usbfs_cleanup(void) {
 
 /*-------------------------------------------------------------------------*/
 
-#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
+#if defined(CONFIG_USB_MON)
 
 struct usb_mon_operations {
 	void (*urb_submit)(struct usb_bus *bus, struct urb *urb);

diff -urp -X dontdiff linux-2.6.12/drivers/usb/mon/Kconfig linux-2.6.12-lem/drivers/usb/mon/Kconfig
@@ -2,21 +2,15 @@
 # USB Monitor configuration
 #
 
-# In normal life, it makes little sense to have usbmon as a module, and in fact
-# it is harmful, because there is no way to autoload the module.
-# The 'm' option is allowed for hackers who debug the usbmon itself,
-# and for those who have usbcore as a module.
 config USB_MON
-	tristate "USB Monitor"
-	depends on USB
+	bool "USB Monitor"
+	depends on USB!=n
 	default y
 	help
 	  If you say Y here, a component which captures the USB traffic
 	  between peripheral-specific drivers and HC drivers will be built.
-	  The USB_MON is similar in spirit and may be compatible with Dave
-	  Harding's USBMon.
+	  For more information, see <file:Documentation/usb/usbmon.txt>.
 
-	  This is somewhat experimental at this time, but it should be safe,
-	  as long as you aren't building this as a module and then removing it.
+	  This is somewhat experimental at this time, but it should be safe.
 
-	  If unsure, say Y. Do not say M.
+	  If unsure, say Y.

diff -urp -X dontdiff linux-2.6.12/drivers/usb/mon/Makefile linux-2.6.12-lem/drivers/usb/mon/Makefile
@@ -4,4 +4,5 @@
 
 usbmon-objs	:= mon_main.o mon_stat.o mon_text.o
 
-obj-$(CONFIG_USB_MON)	+= usbmon.o
+# This does not use CONFIG_USB_MON because we want this to use a tristate.
+obj-$(CONFIG_USB)	+= usbmon.o

diff -urp -X dontdiff linux-2.6.12/include/linux/usb.h linux-2.6.12-lem/include/linux/usb.h
@@ -289,7 +289,7 @@ struct usb_bus {
 
 	struct class_device class_dev;	/* class device for this bus */
 	void (*release)(struct usb_bus *bus);	/* function to destroy this bus's memory */
-#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
+#if defined(CONFIG_USB_MON)
 	struct mon_bus *mon_bus;	/* non-null when associated */
 	int monitored;			/* non-zero when monitored */
 #endif

Looks good.

cu
Adrian

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed