On Wed, Mar 23, 2011 at 08:44:06PM -0700, Linus Torvalds wrote: > On Wed, Mar 23, 2011 at 12:34 PM, J. Bruce Fields <bfields@xxxxxxxxxxxx> wrote: > > The following nfsd changes are available from the for-2.6.39 branch at: > > > > Âgit://linux-nfs.org/~bfields/linux.git for-2.6.39 > > diffstat? The diffstat generated by request-pull looked horribly wrong despite the individual patches looking reasonable; I assumed it was a side effect of the one back-merge and didn't look any closer. Sorry, I probably should have looked closer or asked for help. Here you go--did I screw something up? --b. .gitignore | 1 + Documentation/DocBook/filesystems.tmpl | 5 + Documentation/hwmon/jc42 | 21 +- Documentation/hwmon/k10temp | 8 +- Documentation/kernel-parameters.txt | 24 +- Documentation/networking/Makefile | 2 + Documentation/workqueue.txt | 4 +- MAINTAINERS | 14 +- Makefile | 2 +- arch/arm/Kconfig | 25 + arch/arm/Makefile | 2 +- arch/arm/boot/compressed/.gitignore | 6 +- arch/arm/include/asm/hardware/cache-l2x0.h | 1 + arch/arm/include/asm/hardware/sp810.h | 3 + arch/arm/include/asm/tlb.h | 105 ++- arch/arm/include/asm/tlbflush.h | 7 +- arch/arm/kernel/kprobes-decode.c | 2 +- arch/arm/kernel/pmu.c | 22 +- arch/arm/kernel/setup.c | 4 +- arch/arm/kernel/signal.c | 4 +- arch/arm/kernel/vmlinux.lds.S | 11 + arch/arm/mach-omap2/clkt_dpll.c | 2 +- arch/arm/mach-omap2/mailbox.c | 2 +- arch/arm/mach-omap2/mux.c | 2 +- arch/arm/mach-omap2/pm-debug.c | 8 +- arch/arm/mach-omap2/prcm_mpu44xx.h | 4 +- arch/arm/mach-omap2/smartreflex.c | 4 +- arch/arm/mach-omap2/timer-gp.c | 13 + arch/arm/mach-s5p6442/include/mach/map.h | 69 +- arch/arm/mach-s5p64x0/include/mach/map.h | 83 +- arch/arm/mach-s5pc100/include/mach/map.h | 193 ++--- arch/arm/mach-s5pv210/include/mach/map.h | 168 ++-- arch/arm/mach-s5pv210/mach-aquila.c | 15 +- arch/arm/mach-s5pv210/mach-goni.c | 15 +- arch/arm/mach-s5pv310/include/mach/map.h | 149 ++-- arch/arm/mach-spear3xx/include/mach/spear320.h | 2 +- arch/arm/mach-tegra/include/mach/kbc.h | 1 + arch/arm/mm/cache-l2x0.c | 6 + arch/arm/mm/proc-v7.S | 6 + arch/arm/plat-omap/mailbox.c | 11 +- arch/arm/plat-s5p/dev-uart.c | 12 +- arch/arm/plat-samsung/dev-ts.c | 1 - arch/arm/plat-spear/include/plat/uncompress.h | 4 +- arch/arm/plat-spear/include/plat/vmalloc.h | 2 +- arch/cris/kernel/vmlinux.lds.S | 5 - arch/s390/boot/compressed/misc.c | 5 +- arch/s390/crypto/sha_common.c | 1 + arch/s390/include/asm/atomic.h | 26 +- arch/s390/include/asm/cache.h | 1 + arch/sparc/include/asm/pcr.h | 2 + arch/sparc/kernel/iommu.c | 5 +- arch/sparc/kernel/pcr.c | 2 - arch/sparc/kernel/smp_64.c | 2 + arch/sparc/kernel/una_asm_32.S | 4 +- arch/sparc/lib/bitext.c | 5 +- arch/x86/include/asm/acpi.h | 1 + arch/x86/include/asm/perf_event_p4.h | 1 + arch/x86/include/asm/smpboot_hooks.h | 2 +- arch/x86/kernel/acpi/boot.c | 14 +- arch/x86/kernel/apb_timer.c | 2 +- arch/x86/kernel/cpu/perf_event_p4.c | 11 +- arch/x86/kernel/early-quirks.c | 16 +- arch/x86/kernel/reboot.c | 8 + arch/x86/kvm/svm.c | 2 + block/genhd.c | 2 +- block/ioctl.c | 8 +- drivers/atm/solos-pci.c | 5 +- drivers/block/floppy.c | 2 +- drivers/bluetooth/ath3k.c | 5 + drivers/bluetooth/btusb.c | 12 +- drivers/char/agp/amd64-agp.c | 9 +- drivers/char/agp/intel-agp.h | 1 + drivers/char/agp/intel-gtt.c | 56 +- drivers/char/pcmcia/cm4000_cs.c | 3 +- drivers/char/pcmcia/ipwireless/main.c | 52 +- drivers/char/tpm/tpm.c | 28 +- drivers/char/tpm/tpm.h | 2 - drivers/char/tpm/tpm_tis.c | 4 +- drivers/gpu/drm/drm_irq.c | 29 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 16 +- drivers/gpu/drm/i915/i915_irq.c | 6 +- drivers/gpu/drm/i915/i915_reg.h | 10 - drivers/gpu/drm/i915/intel_display.c | 95 ++- drivers/gpu/drm/i915/intel_panel.c | 37 - drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 18 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 1 + drivers/gpu/drm/nouveau/nouveau_pm.c | 2 +- drivers/gpu/drm/nouveau/nv04_dfp.c | 12 +- drivers/gpu/drm/nouveau/nv40_graph.c | 46 +- drivers/gpu/drm/radeon/atombios_crtc.c | 4 +- drivers/gpu/drm/radeon/r100.c | 4 +- drivers/gpu/drm/radeon/r300.c | 2 + drivers/gpu/drm/radeon/radeon_display.c | 2 +- drivers/gpu/drm/radeon/radeon_fb.c | 5 +- drivers/hwmon/Kconfig | 19 +- drivers/hwmon/ad7414.c | 1 + drivers/hwmon/adt7411.c | 1 + drivers/hwmon/jc42.c | 35 +- drivers/hwmon/k10temp.c | 5 +- drivers/hwmon/lm85.c | 23 +- drivers/i2c/busses/i2c-omap.c | 35 +- drivers/i2c/busses/i2c-stu300.c | 2 +- drivers/infiniband/hw/nes/nes_hw.c | 32 +- drivers/infiniband/hw/qib/qib_rc.c | 5 +- drivers/input/gameport/gameport.c | 2 +- drivers/input/keyboard/tegra-kbc.c | 62 ++- drivers/input/mouse/synaptics.h | 23 + drivers/input/serio/serio.c | 2 +- drivers/isdn/hisax/isdnl2.c | 28 +- drivers/md/linear.c | 1 - drivers/md/md.c | 31 +- drivers/md/md.h | 2 + drivers/md/multipath.c | 1 - drivers/md/raid0.c | 2 +- drivers/md/raid1.c | 6 +- drivers/md/raid10.c | 7 +- drivers/md/raid5.c | 1 - drivers/memstick/core/memstick.c | 2 +- drivers/message/fusion/mptbase.h | 4 +- drivers/message/fusion/mptctl.c | 8 + drivers/message/fusion/mptscsih.c | 7 +- drivers/misc/tifm_core.c | 2 +- drivers/misc/vmw_balloon.c | 2 +- drivers/mtd/nand/r852.c | 2 +- drivers/mtd/sm_ftl.c | 2 +- drivers/net/can/mcp251x.c | 2 +- drivers/net/can/softing/Kconfig | 2 +- drivers/net/cxgb4vf/cxgb4vf_main.c | 80 ++- drivers/net/cxgb4vf/t4vf_hw.c | 2 +- drivers/net/dm9000.c | 9 +- drivers/net/e1000e/netdev.c | 52 +- drivers/net/forcedeth.c | 2 + drivers/net/ixgbe/ixgbe_fcoe.c | 51 ++- drivers/net/ixgbe/ixgbe_fcoe.h | 2 + drivers/net/ixgbe/ixgbe_main.c | 6 +- drivers/net/pch_gbe/pch_gbe.h | 2 +- drivers/net/pch_gbe/pch_gbe_main.c | 104 ++- drivers/net/r8169.c | 44 +- drivers/net/sfc/ethtool.c | 22 +- drivers/net/stmmac/stmmac_main.c | 4 +- drivers/net/tg3.c | 8 +- drivers/net/usb/dm9601.c | 4 + drivers/net/usb/hso.c | 12 +- drivers/net/usb/usbnet.c | 4 +- drivers/net/wireless/ath/ath5k/phy.c | 143 ++-- drivers/net/wireless/ath/ath9k/ath9k.h | 6 - drivers/net/wireless/ath/ath9k/init.c | 8 - drivers/net/wireless/ath/ath9k/main.c | 8 - drivers/net/wireless/iwlwifi/iwl-3945.c | 67 -- drivers/net/wireless/p54/p54pci.c | 14 +- drivers/net/wireless/rt2x00/rt2800pci.c | 8 + drivers/net/wireless/rt2x00/rt2800usb.c | 6 + drivers/nfc/Kconfig | 2 +- drivers/nfc/pn544.c | 4 +- drivers/pcmcia/pcmcia_resource.c | 2 + drivers/pcmcia/pxa2xx_base.c | 2 +- drivers/pcmcia/pxa2xx_base.h | 1 + drivers/pcmcia/pxa2xx_lubbock.c | 1 + drivers/platform/x86/Kconfig | 2 +- drivers/platform/x86/acer-wmi.c | 4 +- drivers/platform/x86/asus_acpi.c | 8 +- drivers/platform/x86/dell-laptop.c | 24 +- drivers/platform/x86/intel_pmic_gpio.c | 116 +-- drivers/platform/x86/tc1100-wmi.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 8 +- drivers/pps/kapi.c | 2 +- drivers/rapidio/rio-sysfs.c | 12 +- drivers/regulator/mc13xxx-regulator-core.c | 2 +- drivers/regulator/wm831x-dcdc.c | 1 + drivers/rtc/Kconfig | 12 + drivers/rtc/interface.c | 23 +- drivers/rtc/rtc-at91sam9.c | 2 +- drivers/rtc/rtc-dev.c | 104 +++ drivers/rtc/rtc-ds3232.c | 14 +- drivers/s390/block/dasd_eckd.c | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 5 +- drivers/scsi/qla2xxx/qla_init.c | 10 +- drivers/scsi/qla2xxx/qla_os.c | 10 +- drivers/scsi/scsi_debug.c | 2 +- drivers/spi/pxa2xx_spi_pci.c | 61 +- drivers/target/Makefile | 3 +- drivers/target/target_core_configfs.c | 155 ++-- drivers/target/target_core_device.c | 13 +- drivers/target/target_core_fabric_configfs.c | 92 ++- drivers/target/target_core_iblock.c | 8 +- drivers/target/target_core_mib.c | 1078 ------------------------ drivers/target/target_core_mib.h | 28 - drivers/target/target_core_pscsi.c | 4 +- drivers/target/target_core_tpg.c | 29 +- drivers/target/target_core_transport.c | 48 +- drivers/thermal/Kconfig | 1 - drivers/thermal/thermal_sys.c | 40 +- drivers/tty/serial/max3100.c | 2 +- drivers/tty/serial/max3107.c | 2 +- drivers/usb/core/hub.c | 18 +- drivers/usb/core/quirks.c | 8 + drivers/usb/host/xhci-dbg.c | 9 +- drivers/usb/host/xhci-mem.c | 10 +- drivers/usb/host/xhci-ring.c | 40 +- drivers/usb/host/xhci.c | 14 +- drivers/usb/host/xhci.h | 2 +- drivers/usb/musb/musb_core.c | 1 + drivers/usb/musb/musb_core.h | 17 +- drivers/usb/musb/omap2430.c | 1 + drivers/usb/serial/sierra.c | 3 + drivers/usb/serial/usb_wwan.c | 15 +- drivers/usb/serial/visor.c | 12 + drivers/xen/manage.c | 10 + fs/afs/write.c | 1 + fs/aio.c | 52 +- fs/block_dev.c | 30 +- fs/btrfs/ctree.h | 3 + fs/btrfs/extent-tree.c | 9 +- fs/btrfs/extent_io.c | 138 +++- fs/btrfs/extent_io.h | 2 +- fs/btrfs/inode.c | 126 +++- fs/btrfs/ioctl.c | 7 +- fs/btrfs/lzo.c | 21 +- fs/btrfs/relocation.c | 13 +- fs/btrfs/super.c | 7 +- fs/btrfs/volumes.c | 13 +- fs/ceph/dir.c | 5 +- fs/ceph/snap.c | 14 +- fs/ceph/super.h | 1 + fs/cifs/cifsfs.h | 2 +- fs/cifs/netmisc.c | 8 +- fs/cifs/sess.c | 8 +- fs/ecryptfs/dentry.c | 22 +- fs/ecryptfs/ecryptfs_kernel.h | 3 +- fs/ecryptfs/file.c | 1 + fs/ecryptfs/inode.c | 138 +--- fs/eventfd.c | 12 +- fs/eventpoll.c | 95 +++ fs/fuse/dir.c | 7 +- fs/fuse/file.c | 52 +- fs/fuse/fuse_i.h | 6 +- fs/gfs2/glock.c | 4 +- fs/gfs2/main.c | 11 +- fs/inode.c | 31 +- fs/internal.h | 2 +- fs/locks.c | 12 +- fs/namei.c | 9 +- fs/namespace.c | 2 +- fs/nfsd/export.c | 1 - fs/nfsd/nfs4idmap.c | 1 - fs/nfsd/nfs4proc.c | 4 +- fs/nfsd/nfs4state.c | 160 ++-- fs/nfsd/nfs4xdr.c | 5 +- fs/nfsd/nfsctl.c | 35 +- fs/nfsd/state.h | 12 +- fs/nfsd/vfs.c | 2 - fs/nilfs2/btnode.c | 5 - fs/nilfs2/btnode.h | 1 - fs/nilfs2/mdt.c | 4 +- fs/nilfs2/page.c | 13 - fs/nilfs2/page.h | 1 - fs/nilfs2/super.c | 2 +- fs/ocfs2/journal.h | 6 +- fs/ocfs2/refcounttree.c | 7 +- fs/ocfs2/super.c | 28 +- fs/partitions/ldm.c | 5 + fs/partitions/mac.c | 17 +- fs/xfs/linux-2.6/xfs_discard.c | 2 + fs/xfs/xfs_fsops.c | 3 + include/asm-generic/pgtable.h | 2 + include/drm/drmP.h | 2 +- include/linux/dcbnl.h | 2 +- include/linux/freezer.h | 2 +- include/linux/fs.h | 4 +- include/linux/list.h | 12 +- include/linux/module.h | 2 +- include/linux/pm.h | 2 + include/linux/pm_wakeup.h | 25 +- include/linux/rio_regs.h | 4 +- include/linux/rtc.h | 15 + include/linux/sched.h | 2 +- include/linux/thermal.h | 8 + include/linux/workqueue.h | 8 +- include/net/ipv6.h | 12 + include/net/netfilter/nf_tproxy_core.h | 12 +- include/net/sch_generic.h | 2 +- include/pcmcia/ds.h | 1 + include/sound/wm8903.h | 10 +- include/target/target_core_base.h | 28 +- include/target/target_core_transport.h | 2 + kernel/irq/internals.h | 6 + kernel/irq/irqdesc.c | 11 +- kernel/irq/manage.c | 2 +- kernel/irq/resend.c | 2 +- kernel/perf_event.c | 19 +- kernel/power/main.c | 2 +- kernel/power/process.c | 6 +- kernel/power/snapshot.c | 7 +- kernel/time/tick-broadcast.c | 10 + kernel/time/tick-common.c | 6 +- kernel/time/tick-internal.h | 3 + kernel/workqueue.c | 37 +- lib/list_debug.c | 39 +- lib/swiotlb.c | 6 +- mm/memory.c | 2 + mm/mempolicy.c | 2 +- mm/migrate.c | 6 +- mm/mremap.c | 4 +- mm/page_alloc.c | 5 +- mm/swapfile.c | 2 +- mm/truncate.c | 2 + mm/vmscan.c | 32 +- net/bluetooth/l2cap.c | 1 + net/bluetooth/rfcomm/tty.c | 2 + net/bridge/br_input.c | 2 +- net/bridge/br_multicast.c | 42 +- net/bridge/br_private.h | 3 +- net/ceph/messenger.c | 62 +- net/core/dev.c | 9 +- net/dcb/dcbnl.c | 9 +- net/ipv4/devinet.c | 30 +- net/ipv4/inet_timewait_sock.c | 2 + net/ipv4/ip_gre.c | 1 + net/ipv4/route.c | 1 + net/ipv4/tcp_input.c | 5 +- net/ipv4/tcp_output.c | 2 +- net/ipv6/netfilter/ip6t_LOG.c | 2 +- net/ipv6/route.c | 1 + net/mac80211/iface.c | 1 + net/mac80211/mlme.c | 6 + net/mac80211/util.c | 2 + net/netfilter/core.c | 3 +- net/netfilter/nf_tproxy_core.c | 27 +- net/netfilter/xt_TPROXY.c | 22 +- net/netfilter/xt_socket.c | 13 +- net/rxrpc/ar-key.c | 8 +- net/sched/sch_generic.c | 1 + net/sctp/sm_make_chunk.c | 10 +- net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/auth_gss/gss_krb5_mech.c | 2 +- net/sunrpc/svcauth_unix.c | 18 +- net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 + net/wireless/wext-compat.c | 4 +- net/xfrm/xfrm_policy.c | 7 +- scripts/basic/fixdep.c | 12 +- sound/core/jack.c | 1 + sound/pci/au88x0/au88x0_core.c | 14 +- sound/pci/hda/hda_intel.c | 1 + sound/pci/hda/patch_conexant.c | 68 ++- sound/pci/hda/patch_sigmatel.c | 15 +- sound/pci/hda/patch_via.c | 2 +- sound/soc/codecs/cx20442.c | 2 +- sound/soc/codecs/wm8903.c | 2 +- sound/soc/codecs/wm8903.h | 2 +- sound/soc/codecs/wm8994.c | 202 ++++- sound/soc/codecs/wm_hubs.c | 3 + sound/soc/imx/eukrea-tlv320.c | 2 +- sound/soc/pxa/e740_wm9705.c | 4 +- sound/soc/pxa/e750_wm9705.c | 4 +- sound/soc/pxa/e800_wm9712.c | 4 +- sound/soc/pxa/em-x270.c | 4 +- sound/soc/pxa/mioa701_wm9713.c | 4 +- sound/soc/pxa/palm27x.c | 4 +- sound/soc/pxa/tosa.c | 4 +- sound/soc/pxa/zylonite.c | 4 +- sound/soc/soc-dapm.c | 23 +- sound/usb/caiaq/audio.c | 2 +- sound/usb/caiaq/midi.c | 2 +- sound/usb/card.c | 4 + sound/usb/pcm.c | 7 +- sound/usb/usbaudio.h | 1 + tools/perf/builtin-timechart.c | 6 +- tools/perf/util/hist.c | 7 +- tools/perf/util/svghelper.c | 6 +- 370 files changed, 3795 insertions(+), 3239 deletions(-) delete mode 100644 drivers/target/target_core_mib.c delete mode 100644 drivers/target/target_core_mib.h -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
