Commits on Oct 14, 2012
  1. Linux 3.7-rc1

    committed Oct 14, 2012
  2. Merge branch 'upstream' of git://…

    Pull MIPS update from Ralf Baechle:
     "Cleanups and fixes for breakage that occured earlier during this merge
      phase.  Also a few patches that didn't make the first pull request.
      Of those is the Alchemy work that merges code for many of the SOCs and
      evaluation boards thus among other code shrinkage, reduces the number
      of MIPS defconfigs by 5."
    * 'upstream' of git:// (22 commits)
      MIPS: SNI: Switch RM400 serial to SCCNXP driver
      MIPS: Remove unused empty_bad_pmd_table[] declaration.
      MIPS: MT: Remove kspd.
      MIPS: Malta: Fix section mismatch.
      MIPS: asm-offset.c: Delete unused irq_cpustat_t struct offsets.
      MIPS: Alchemy: Merge PB1100/1500 support into DB1000 code.
      MIPS: Alchemy: merge PB1550 support into DB1550 code
      MIPS: Alchemy: Single kernel for DB1200/1300/1550
      MIPS: Optimize TLB refill for RI/XI configurations.
      MIPS: proc: Cleanup printing of ASEs.
      MIPS: Hardwire detection of DSP ASE Rev 2 for systems, as required.
      MIPS: Add detection of DSP ASE Revision 2.
      MIPS: Optimize pgd_init and pmd_init
      MIPS: perf: Add perf functionality for BMIPS5000
      MIPS: perf: Split the Kconfig option CONFIG_MIPS_MT_SMP
      MIPS: perf: Remove unnecessary #ifdef
      MIPS: perf: Add cpu feature bit for PCI (performance counter interrupt)
      MIPS: perf: Change the "mips_perf_event" table unsupported indicator.
      MIPS: Align swapper_pg_dir to 64K for better TLB Refill code. Allow architectures to add sections to the front of .bss
    committed Oct 14, 2012
  3. Merge branch 'modules-next' of git://…

    Pull module signing support from Rusty Russell:
     "module signing is the highlight, but it's an all-over David Howells frenzy..."
    Hmm "Magrathea: Glacier signing key". Somebody has been reading too much HHGTTG.
    * 'modules-next' of git:// (37 commits)
      X.509: Fix indefinite length element skip error handling
      X.509: Convert some printk calls to pr_devel
      asymmetric keys: fix printk format warning
      MODSIGN: Fix 32-bit overflow in X.509 certificate validity date checking
      MODSIGN: Make mrproper should remove generated files.
      MODSIGN: Use utf8 strings in signer's name in autogenerated X.509 certs
      MODSIGN: Use the same digest for the autogen key sig as for the module sig
      MODSIGN: Sign modules during the build process
      MODSIGN: Provide a script for generating a key ID from an X.509 cert
      MODSIGN: Implement module signature checking
      MODSIGN: Provide module signing public keys to the kernel
      MODSIGN: Automatically generate module signing keys if missing
      MODSIGN: Provide Kconfig options
      MODSIGN: Provide gitignore and make clean rules for extra files
      MODSIGN: Add FIPS policy
      module: signature checking hook
      X.509: Add a crypto key parser for binary (DER) X.509 certificates
      MPILIB: Provide a function to read raw data into an MPI
      X.509: Add an ASN.1 decoder
      X.509: Add simple ASN.1 grammar compiler
    committed Oct 14, 2012
  4. x86, boot: Explicitly include autoconf.h for hostprogs

    The hostprogs need access to the CONFIG_* symbols found in
    include/generated/autoconf.h.  But commit abbf159 ("UAPI: Partition
    the header include path sets and add uapi/ header directories") replaced
    $(LINUXINCLUDE) with $(USERINCLUDE) which doesn't contain the necessary
    include paths.
    This has the undesirable effect of breaking the EFI boot stub because
    the #ifdef CONFIG_EFI_STUB code in arch/x86/boot/tools/build.c is
    never compiled.
    It should also be noted that because $(USERINCLUDE) isn't exported by
    the top-level Makefile it's actually empty in arch/x86/boot/Makefile.
    Cc: H. Peter Anvin <>
    Cc: Ingo Molnar <>
    Acked-by: David Howells <>
    Signed-off-by: Matt Fleming <>
    Signed-off-by: Linus Torvalds <>
    mfleming committed with Oct 12, 2012
  5. perf: Fix UAPI fallout

    The UAPI commits forgot to test tooling builds such as tools/perf/,
    and this fixes the fallout.
    Manual conversion.
    Signed-off-by: Ingo Molnar <>
    Signed-off-by: Linus Torvalds <>
    Ingo Molnar committed with Oct 14, 2012
  6. Merge branch 'late-for-linus' of git://…

    Pull ARM update from Russell King:
     "This is the final round of stuff for ARM, left until the end of the
      merge window to reduce the number of conflicts.  This set contains the
      ARM part of David Howells UAPI changes, and a fix to the ordering of
      'select' statements in ARM Kconfig files (see the appropriate commit
      for why this happened - thanks to Andrew Morton for pointing out the
      I've left this as long as I dare for this window to avoid conflicts,
      and I regenerated the config patch yesterday, posting it to our
      mailing list for review and testing.  I have several acks which
      include successful test reports for it.
      However, today I notice we've got new conflicts with previously unseen
      code...  though that conflict should be trivial (it's my changes vs a
      one liner.)"
    * 'late-for-linus' of git://
      ARM: config: make sure that platforms are ordered by option string
      ARM: config: sort select statements alphanumerically
      UAPI: (Scripted) Disintegrate arch/arm/include/asm
    Fix up fairly conflict in arch/arm/Kconfig (the select re-organization
    vs recent addition of GENERIC_KERNEL_EXECVE)
    committed Oct 14, 2012
Commits on Oct 13, 2012
  1. Merge tag 'disintegrate-main-20121013' of git://…

    Pull UAPI disintegration for include/linux/{,byteorder/}*.h from David Howells:
     "The patches contained herein do the following:
     (1) Remove kernel-only stuff in linux/ppp-comp.h from the UAPI.  I checked
         this with Paul Mackerras before I created the patch and he suggested some
         extra bits to unexport.
     (2) Remove linux/blk_types.h entirely from the UAPI as none of it is userspace
         applicable, and remove from the UAPI that part of linux/fs.h that was the
         reason for linux/blk_types.h being exported in the first place.  I
         discussed this with Jens Axboe before creating the patch.
     (3) The big patch of the series to disintegrate include/linux/*.h as a unit.
         This could be split up, though there would be collisions in moving stuff
         between the two Kbuild files when the parts are merged as that file is
         sorted alphabetically rather than being grouped by subsystem.
         Of this set of headers, 17 files have changed in the UAPI exported region
         since the 4th and only 8 since the 9th so there isn't much change in this
         area - as one might expect.
         It should be pretty obvious and straightforward if it does come to fixing
         up: stuff in __KERNEL__ guards stays where it is and stuff outside moves
         to the same file in the include/uapi/linux/ directory.
         If a new file appears then things get a bit more complicated as the
         "headers +=" line has to move to include/uapi/linux/Kbuild.  Only one new
         file has appeared since the 9th and I judge this type of event relatively
     (4) A patch to disintegrate include/linux/byteorder/*.h as a unit.
      Signed-off-by: David Howells <>"
    * tag 'disintegrate-main-20121013' of git://
      UAPI: (Scripted) Disintegrate include/linux/byteorder
      UAPI: (Scripted) Disintegrate include/linux
      UAPI: Unexport linux/blk_types.h
      UAPI: Unexport part of linux/ppp-comp.h
    committed Oct 13, 2012
  2. Merge tag 'disintegrate-spi-20121009' of git://…

    Pull spi UAPI disintegration from David Howells:
     "This is to complete part of the Userspace API (UAPI) disintegration
      for which the preparatory patches were pulled recently.  After these
      patches, userspace headers will be segregated into:
      for the userspace interface stuff, and:
      for the strictly kernel internal stuff.
      Signed-off-by: David Howells <>
      Acked-by: Grant Likely <>"
    * tag 'disintegrate-spi-20121009' of git://
      UAPI: (Scripted) Disintegrate include/linux/spi
    committed Oct 13, 2012
  3. Merge tag 'openrisc-uapi' of git://

    Pull OpenRISC uapi disintegration from Jonas Bonn:
     "OpenRISC UAPI disintegration work from David Howells"
    * tag 'openrisc-uapi' of git://
      UAPI: (Scripted) Disintegrate arch/openrisc/include/asm
    committed Oct 13, 2012
  4. Merge branch 'for-linus' of git://…

    Pull user namespace compile fixes from Eric W Biederman:
     "This tree contains three trivial fixes.  One compiler warning, one
      thinko fix, and one build fix"
    * 'for-linus' of git://
      btrfs: Fix compilation with user namespace support enabled
      userns: Fix posix_acl_file_xattr_userns gid conversion
      userns: Properly print bluetooth socket uids
    committed Oct 13, 2012
  5. Merge tag 'md-3.7' of git://

    Pull md updates from NeilBrown:
     - "discard" support, some dm-raid improvements and other assorted bits
       and pieces.
    * tag 'md-3.7' of git:// (29 commits)
      md: refine reporting of resync/reshape delays.
      md/raid5: be careful not to resize_stripes too big.
      md: make sure manual changes to recovery checkpoint are saved.
      md/raid10: use correct limit variable
      md: writing to sync_action should clear the read-auto state.
      Subject: [PATCH] md:change resync_mismatches to atomic64_t to avoid races
      md/raid5: make sure to_read and to_write never go negative.
      md: When RAID5 is dirty, force reconstruct-write instead of read-modify-write.
      md/raid5: protect debug message against NULL derefernce.
      md/raid5: add some missing locking in handle_failed_stripe.
      MD: raid5 avoid unnecessary zero page for trim
      MD: raid5 trim support
      md/bitmap:Don't use IS_ERR to judge alloc_page().
      md/raid1: Don't release reference to device while handling read error.
      raid: replace list_for_each_continue_rcu with new interface
      add further __init annotations to crypto/xor.c
      DM RAID: Fix for "sync" directive ineffectiveness
      DM RAID: Fix comparison of index and quantity for "rebuild" parameter
      DM RAID: Add rebuild capability for RAID10
      DM RAID: Move 'rebuild' checking code to its own function
    committed Oct 13, 2012
  6. Merge branch 'config' into late-for-linus

    Russell King committed Oct 13, 2012
  7. ARM: config: make sure that platforms are ordered by option string

    The large platform selection choice should be sorted by option string
    so it's easy to find the platform you're looking for.  Fix the few
    options which are out of this order.
    Acked-by: Tony Lindgren <>
    Signed-off-by: Russell King <>
    Russell King committed Oct 12, 2012
  8. ARM: config: sort select statements alphanumerically

    As suggested by Andrew Morton:
      This is a pet peeve of mine.  Any time there's a long list of items
      (header file inclusions, kconfig entries, array initalisers, etc) and
      someone wants to add a new item, they *always* go and stick it at the
      end of the list.
      Guys, don't do this.  Either put the new item into a randomly-chosen
      position or, probably better, alphanumerically sort the list.
    lets sort all our select statements alphanumerically.  This commit was
    created by the following perl:
    while (<>) {
    	while (/\\\s*$/) {
    		$_ .= <>;
    	undef %selects if /^\s*config\s+/;
    	if (/^\s+select\s+(\w+).*/) {
    		if (defined($selects{$1})) {
    			if ($selects{$1} eq $_) {
    				print STDERR "Warning: removing duplicated $1 entry\n";
    			} else {
    				print STDERR "Error: $1 differently selected\n".
    					"\tOld: $selects{$1}\n".
    					"\tNew: $_\n";
    				exit 1;
    		$selects{$1} = $_;
    	if (%selects and (/^\s*$/ or /^\s+help/ or /^\s+---help---/ or
    			  /^endif/ or /^endchoice/)) {
    		foreach $k (sort (keys %selects)) {
    			print "$selects{$k}";
    		undef %selects;
    if (%selects) {
    	foreach $k (sort (keys %selects)) {
    		print "$selects{$k}";
    It found two duplicates:
    Warning: removing duplicated S5P_SETUP_MIPIPHY entry
    Warning: removing duplicated HARDIRQS_SW_RESEND entry
    and they are identical duplicates, hence the shrinkage in the diffstat
    of two lines.
    We have four testers reporting success of this change (Tony, Stephen,
    Linus and Sekhar.)
    Acked-by: Jason Cooper <>
    Acked-by: Tony Lindgren <>
    Acked-by: Stephen Warren <>
    Acked-by: Linus Walleij <>
    Acked-by: Sekhar Nori <>
    Signed-off-by: Russell King <>
    Russell King committed Oct 6, 2012
  9. UAPI: (Scripted) Disintegrate include/linux/byteorder

    Signed-off-by: David Howells <>
    Acked-by: Arnd Bergmann <>
    Acked-by: Thomas Gleixner <>
    Acked-by: Michael Kerrisk <>
    Acked-by: Paul E. McKenney <>
    Acked-by: Dave Jones <>
    dhowells committed Oct 13, 2012
  10. UAPI: (Scripted) Disintegrate include/linux

    Signed-off-by: David Howells <>
    Acked-by: Arnd Bergmann <>
    Acked-by: Thomas Gleixner <>
    Acked-by: Michael Kerrisk <>
    Acked-by: Paul E. McKenney <>
    Acked-by: Dave Jones <>
    dhowells committed Oct 13, 2012
  11. UAPI: Unexport linux/blk_types.h

    It seems that was linux/blk_types.h incorrectly exported to fix up some missing
    bits required by the exported parts of linux/fs.h (READ, WRITE, READA, etc.).
    So unexport linux/blk_types.h and unexport the relevant bits of linux/fs.h.
    Signed-off-by: David Howells <>
    cc: Jens Axboe <>
    cc: Tejun Heo <>
    cc: Al Viro <>
    dhowells committed Oct 13, 2012
  12. UAPI: Unexport part of linux/ppp-comp.h

    Unexport part of linux/ppp-comp.h as userspace can't make use of that bit.
    Signed-off-by: David Howells <>
    cc: Paul Mackerras <>
    cc: David Miller <>
    dhowells committed Oct 13, 2012
  13. Merge tag 'disintegrate-openrisc-20121009' of git://…

    UAPI Disintegration 2012-10-09
    * tag 'disintegrate-openrisc-20121009' of git://
      UAPI: (Scripted) Disintegrate arch/openrisc/include/asm
    Jonas Bonn committed Oct 13, 2012
  14. Merge branch 'for-linus' of git://…

    Pull TPM bugfixes from James Morris.
    * 'for-linus' of git://
      tpm: Propagate error from tpm_transmit to fix a timeout hang
      driver/char/tpm: fix regression causesd by ppi
    committed Oct 13, 2012
  15. Merge branch 'release' of git://…

    Pull ACPI & Thermal updates from Len Brown:
     "The generic Linux thermal layer is gaining some new capabilities
      (generic cooling via cpufreq) and some new customers (ARM).
      Also, an ACPI EC bug fix plus a regression fix."
    * 'release' of git:// (30 commits)
      tools/power/acpi/acpidump: remove duplicated include from acpidump.c
      ACPI idle, CPU hotplug: Fix NULL pointer dereference during hotplug
      cpuidle / ACPI: fix potential NULL pointer dereference
      ACPI: EC: Add a quirk for CLEVO M720T/M730T laptop
      ACPI: EC: Make the GPE storm threshold a module parameter
      thermal: Exynos: Fix NULL pointer dereference in exynos_unregister_thermal()
      Thermal: Fix bug on cpu_cooling, cooling device's id conflict problem.
      thermal: exynos: Use devm_* functions
      ARM: exynos: add thermal sensor driver platform data support
      thermal: exynos: register the tmu sensor with the kernel thermal layer
      thermal: exynos5: add exynos5250 thermal sensor driver support
      hwmon: exynos4: move thermal sensor driver to driver/thermal directory
      thermal: add generic cpufreq cooling implementation
      Fix a build error.
      thermal: Fix potential NULL pointer accesses
      thermal: add Renesas R-Car thermal sensor support
      thermal: fix potential out-of-bounds memory access
      Thermal: Introduce locking for cdev.thermal_instances list.
      Thermal: Unify the code for both active and passive cooling
      Thermal: Introduce simple arbitrator for setting device cooling state
    committed Oct 13, 2012
  16. Merge tag 'for-3.7' of git://

    Pull OpenRISC updates from Jonas Bonn:
     "Fixups for some corner cases, build issues, and some obvious bugs in
      IRQ handling.  No major changes."
    * tag 'for-3.7' of git://
      openrisc: mask interrupts in irq_mask_ack function
      openrisc: fix typos in comments and warnings
      openrisc: PIC should act on domain-local irqs
      openrisc: Make cpu_relax() invoke barrier()
      audit: define AUDIT_ARCH_OPENRISC
      openrisc: delay: fix handling of counter overflow
      openrisc: delay: fix loops calculation for __const_udelay
    committed Oct 13, 2012
  17. Merge tag 'disintegrate-misc-arches-20121010' of git://git.infradead.…

    Pull UAPI disintegration for misc arches from David Howells:
     "UAPI disintegration for MN10300, FRV and AVR32 arches"
    * tag 'disintegrate-misc-arches-20121010' of git://
      UAPI: (Scripted) Disintegrate arch/mn10300/include/asm
      UAPI: (Scripted) Disintegrate arch/frv/include/asm
      UAPI: (Scripted) Disintegrate arch/avr32/include/asm
    committed Oct 13, 2012
  18. Merge branch 'merge' of git://…

    Pull powerpc uapi disintegration from Benjamin Herrenschmidt.
    * 'merge' of git://
      UAPI: (Scripted) Disintegrate arch/powerpc/include/asm
    committed Oct 13, 2012
  19. Merge tag 'arm64-uapi' of git://…

    Pull arm64 uapi disintegration from Catalin Marinas:
     "UAPI headers for arm64 together with some clean-up to make it
       - Do not export the COMPAT_* definitions to user
       - Simplify the compat unistd32.h definitions and remove the
         __SYSCALL_COMPAT guard
       - Disintegrate the arch/arm64/include/asm/* headers"
    * tag 'arm64-uapi' of git://
      UAPI: (Scripted) Disintegrate arch/arm64/include/asm
      arm64: Do not export the compat-specific definitions to the user
      arm64: Do not include asm/unistd32.h in asm/unistd.h
      arm64: Remove unused definitions from asm/unistd32.h
    committed Oct 13, 2012
  20. Merge tag 'for-linus' of git://…

    Pull C6X UAPI disintegration from Mark Salter:
     - scripted UAPI disintegration by David Howells.
    * tag 'for-linus' of git://
      UAPI: (Scripted) Disintegrate arch/c6x/include/asm
    committed Oct 13, 2012
  21. Merge tag 'for_linus-3.7' of git://…

    Pull KGDB/KDB fixes and cleanups from Jason Wessel:
       - Clean up compile warnings in kgdboc.c and x86/kernel/kgdb.c
       - Add module event hooks for simplified debugging with gdb
       - Fix kdb to stop paging with 'q' on bta and dmesg
       - Fix for data that scrolls off the vga console due to line wrapping
         when using the kdb pager
       - The debug core registers for kernel module events which allows a
         kernel aware gdb to automatically load symbols and break on entry
         to a kernel module
       - Allow kgdboc=kdb to setup kdb on the vga console"
    * tag 'for_linus-3.7' of git://
      tty/console: fix warnings in drivers/tty/serial/kgdboc.c
      kdb,vt_console: Fix missed data due to pager overruns
      kdb: Fix dmesg/bta scroll to quit with 'q'
      kgdboc: Accept either kbd or kdb to activate the vga + keyboard kdb shell
      kgdb,x86: fix warning about unused variable
      mips,kgdb: fix recursive page fault with CONFIG_KPROBES
      kgdb: Add module event hooks
    committed Oct 13, 2012
  22. Merge tag 'stable/for-linus-3.7-uapi-tag' of git://…

    Pull Xen UAPI disintegration from Konrad Rzeszutek Wilk:
     "This has the UAPI disintegration work done by David Howells"
    * tag 'stable/for-linus-3.7-uapi-tag' of git://
      UAPI: (Scripted) Disintegrate include/xen
    committed Oct 13, 2012
  23. Merge tag 'mmc-merge-for-3.7-rc1-part2' of git://…

    Pull two more mmc changes from Chris Ball:
     - Disintegrate UAPI
     - fix a mismerge that caused a build error.
    * tag 'mmc-merge-for-3.7-rc1-part2' of git://
      UAPI: (Scripted) Disintegrate include/linux/mmc
      mmc: mxs-mmc: Fix merge issue causing build error
    committed Oct 13, 2012
  24. Merge tag 'dm-3.7-changes' of git://…

    Pull device-mapper changes from Alasdair G Kergon:
     "Remove the power-of-2 block size constraint on discards in dm thin
      provisioning and factor the bio_prison code out into a separate module
      (for sharing with the forthcoming cache target).
      Use struct bio's front_pad to eliminate the use of one separate
      mempool by bio-based devices.
      A few other tiny clean-ups."
    * tag 'dm-3.7-changes' of git://
      dm: store dm_target_io in bio front_pad
      dm thin: move bio_prison code to separate module
      dm thin: prepare to separate bio_prison code
      dm thin: support discard with non power of two block size
      dm persistent data: convert to use le32_add_cpu
      dm: use ACCESS_ONCE for sysfs values
      dm bufio: use list_move
      dm mpath: fix check for null mpio in end_io fn
    committed Oct 13, 2012
  25. Merge tag 'scsi-misc' of git://…

    Pull misc SCSI updates from James Bottomley:
     "This is an assorted set of stragglers into the merge window with
      driver updates for megaraid_sas, lpfc, bfi and mvumi.  It also
      includes some fairly major fixes for virtio-scsi (scatterlist init),
      scsi_debug (off by one error), storvsc (use after free) and qla2xxx
      (potential deadlock).
      Signed-off-by: James Bottomley <>"
    * tag 'scsi-misc' of git:// (49 commits)
      [SCSI] storvsc: Account for in-transit packets in the RESET path
      [SCSI] qla2xxx: fix potential deadlock on ha->hardware_lock
      [SCSI] scsi_debug: Fix off-by-one bug when unmapping region
      [SCSI] Shorten the path length of scsi_cmd_to_driver()
      [SCSI] virtio-scsi: support online resizing of disks
      [SCSI] virtio-scsi: fix LUNs greater than 255
      [SCSI] virtio-scsi: initialize scatterlist structure
      [SCSI] megaraid_sas: Version, Changelog, Copyright update
      [SCSI] megaraid_sas: Remove duplicate code
      [SCSI] megaraid_sas: Add SystemPD FastPath support
      [SCSI] megaraid_sas: Add array boundary check for SystemPD
      [SCSI] megaraid_sas: Load io_request DataLength in bytes
      [SCSI] megaraid_sas: Add module param for configurable MSI-X vector count
      [SCSI] megaraid_sas: Remove un-needed completion_lock spinlock calls
      [SCSI] lpfc 8.3.35: Update lpfc version for 8.3.35 driver release
      [SCSI] lpfc 8.3.35: Fixed not reporting logical link speed to SCSI midlayer when QoS not on
      [SCSI] lpfc 8.3.35: Fix error with fabric service parameters causing performance issues
      [SCSI] lpfc 8.3.35: Fixed SCSI host create showing wrong link speed on SLI3 HBA ports
      [SCSI] lpfc 8.3.35: Fixed not checking solicition in progress bit when verifying FCF record for use
      [SCSI] lpfc 8.3.35: Fixed messages for misconfigured port errors
    committed Oct 13, 2012
  26. Merge branch 'for-linus' of git://…

    Pull input layer updates from Dmitry Torokhov:
     "2nd round of updates for the input subsystem.  With it input core no
      longer limits number of character devices per event handler (such as
      evdev) to 32, but switches to dynamic minors once legacy range is
      exhausted.  This should get multi-seat installations that currently
      run our of event devices very quickly.
      You will also get an update for Wacom driver and a couple of driver
    * 'for-linus' of git://
      Input: extend the number of event (and other) devices
      Input: mousedev - mark mousedev interfaces as non-seekable
      Input: mousedev - rename mixdev_open to opened_by_mixdev
      Input: mousedev - reformat structure initializers
      Input: mousedev - factor out psaux code to reduce #ifdefery
      Input: samsung-keypad - add clk_prepare and clk_unprepare
      Input: atmel_mxt_ts - simplify mxt_dump_message
      Input: wacom - clean up wacom_query_tablet_data
      Input: wacom - introduce wacom_fix_phy_from_hid
      Input: wacom - allow any multi-input Intuos device to set prox
      Input: wacom - report correct touch contact size for I5/Bamboo
    committed Oct 13, 2012
  27. Merge branch 'for-3.7' of git://

    Pull nfsd update from J Bruce Fields:
     "Another relatively quiet cycle.  There was some progress on my
      remaining 4.1 todo's, but a couple of them were just of the form
      "check that we do X correctly", so didn't have much affect on the
      Other than that, a bunch of cleanup and some bugfixes (including an
      annoying NFSv4.0 state leak and a busy-loop in the server that could
      cause it to peg the CPU without making progress)."
    * 'for-3.7' of git:// (46 commits)
      UAPI: (Scripted) Disintegrate include/linux/sunrpc
      UAPI: (Scripted) Disintegrate include/linux/nfsd
      nfsd4: don't allow reclaims of expired clients
      nfsd4: remove redundant callback probe
      nfsd4: expire old client earlier
      nfsd4: separate session allocation and initialization
      nfsd4: clean up session allocation
      nfsd4: minor free_session cleanup
      nfsd4: new_conn_from_crses should only allocate
      nfsd4: separate connection allocation and initialization
      nfsd4: reject bad forechannel attrs earlier
      nfsd4: enforce per-client sessions/no-sessions distinction
      nfsd4: set cl_minorversion at create time
      nfsd4: don't pin clientids to pseudoflavors
      nfsd4: fix bind_conn_to_session xdr comment
      nfsd4: cast readlink() bug argument
      NFSD: pass null terminated buf to kstrtouint()
      nfsd: remove duplicate init in nfsd4_cb_recall
      nfsd4: eliminate redundant nfs4_free_stateid
      fs/nfsd/nfs4idmap.c: adjust inconsistent IS_ERR and PTR_ERR
    committed Oct 13, 2012
  28. Merge git://

    Pull networking updates from David Miller:
     1) Alexey Kuznetsov noticed we routed TCP resets improperly in the
        assymetric routing case, fix this by reverting a change that made us
        use the incoming interface in the outgoing route key when we didn't
        have a socket context to work with.
     2) TCP sysctl kernel memory leakage to userspace fix from Alan Cox.
     3) Move UAPI bits from David Howells, WIMAX and CAN this time.
     4) Fix TX stalls in e1000e wrt.  Byte Queue Limits, from Hiroaki
        SHIMODA, Denys Fedoryshchenko, and Jesse Brandeburg.
     5) Fix IPV6 crashes in packet generator module, from Amerigo Wang.
     6) Tidies and fixes in the new VXLAN driver from Stephen Hemminger.
     7) Bridge IP options parse doesn't check first if SKB header has at
        least an IP header's worth of content present.  Fix from Sarveshwar
     8) The kernel now generates compound pages on transmit and the Xen
        netback drivers needs some adjustments in order to handle this.  Fix
        from Ian Campbell.
     9) Turn off ASPM in JME driver, from Kevin Bardon and Matthew Garrett.
    * git:// (43 commits)
      mcs7830: Fix link state detection
      net: add doc for in4_pton()
      net: add doc for in6_pton()
      vti: fix sparse bit endian warnings
      tcp: resets are misrouted
      usbnet: Support devices reporting idleness
      Add CDC-ACM support for the CX93010-2x UCMxx USB Modem
      net/ethernet/jme: disable ASPM
      tcp: sysctl interface leaks 16 bytes of kernel memory
      kaweth: print correct debug ptr
      e1000e: Change wthresh to 1 to avoid possible Tx stalls
      ipv4: fix route mark sparse warning
      xen: netback: handle compound page fragments on transmit.
      bridge: Pull ip header into skb->data before looking into ip header.
      isdn: fix a wrapping bug in isdn_ppp_ioctl()
      vxlan: fix oops when give unknown ifindex
      vxlan: fix receive checksum handling
      vxlan: add additional headroom
      vxlan: allow configuring port range
      vxlan: associate with tunnel socket on transmit
    committed Oct 13, 2012
  29. Merge git://

    Pull Sparc updates from David Miller:
     1) Updated syscall tracing fix from Al Viro.
     2) SUN4V error reporting was deficient in several areas.
    * git://
      sparc64: fix ptrace interaction with force_successful_syscall_return()
      sparc64: Fix deficiencies in sun4v error reporting.
    committed Oct 13, 2012