Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-12-10 | Merge remote branch 'tty/tty-next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'driver-core/driver-core-next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'percpu/for-next' | Stephen Rothwell | |
Conflicts: arch/x86/kernel/apic/nmi.c | |||
2010-12-10 | Merge remote branch 'xen/upstream/xen' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'rcu/rcu/next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'tip/auto-latest' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'alacrity/linux-next' | Stephen Rothwell | |
Conflicts: drivers/Makefile include/linux/Kbuild lib/Kconfig | |||
2010-12-10 | Merge remote branch 'fsnotify/for-next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'suspend/linux-next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'trivial/for-next' | Stephen Rothwell | |
Conflicts: MAINTAINERS drivers/scsi/bfa/bfa_fcpim.c | |||
2010-12-10 | Merge remote branch 'selinux/master' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'security-testing/next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'voltage/for-next' | Stephen Rothwell | |
Conflicts: drivers/regulator/core.c | |||
2010-12-10 | Merge remote branch 'fbdev/master' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'drm/drm-next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'mfd/for-next' | Stephen Rothwell | |
Conflicts: drivers/mfd/wm8994-core.c | |||
2010-12-10 | Merge remote branch 'slab/for-next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'mmc/mmc-next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'battery/master' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'input/next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'sound/for-next' | Stephen Rothwell | |
Conflicts: sound/soc/sh/fsi.c | |||
2010-12-10 | Merge remote branch 'crypto/master' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'mtd/master' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'bluetooth/master' | Stephen Rothwell | |
Conflicts: net/bluetooth/Makefile | |||
2010-12-10 | Merge remote branch 'net/master' | Stephen Rothwell | |
Conflicts: drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | |||
2010-12-10 | Merge remote branch 'wireless/master' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'scsi/master' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'kvm/linux-next' | Stephen Rothwell | |
2010-12-10 | Merge commit 'refs/next/20101201/acpi' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'libata/NEXT' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'v4l-dvb/master' | Stephen Rothwell | |
2010-12-10 | Merge branch 'quilt/i2c' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'hid/for-next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'pci/linux-next' | Stephen Rothwell | |
Conflicts: drivers/pci/pci-sysfs.c | |||
2010-12-10 | Merge remote branch 'nfs/linux-next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'fuse/for-next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'ecryptfs/next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'ceph/for-next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'rmobile/rmobile-latest' | Stephen Rothwell | |
Conflicts: arch/arm/mach-shmobile/Kconfig | |||
2010-12-10 | Merge remote branch 'powerpc/next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'blackfin/for-linus' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'omap/for-next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'i.MX/for-next' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'arm/devel' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'sound-current/for-linus' | Stephen Rothwell | |
2010-12-10 | Merge remote branch 'net-current/master' | Stephen Rothwell | |
2010-12-10 | Merge branch 'perf/core' into auto-latest | Ingo Molnar | |
2010-12-10 | lockup detector: Compile fixes from removing the old x86 nmi watchdog | Don Zickus | |
My patch that removed the old x86 nmi watchdog broke other arches. This change reverts a piece of that patch and puts the change in the correct spot. Signed-off-by: Don Zickus <dzickus@redhat.com> Reviewed-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: fweisbec@gmail.com Cc: yinghai@kernel.org LKML-Reference: <1291068437-5331-2-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> | |||
2010-12-09 | [SCSI] libfc: fix statistics for FCP input/output megabytes | Joe Eykholt | |
The statistics for InputMegabytes and OutputMegabytes are misnamed. They're accumulating bytes, not megabytes. The statistic returned via /sys must be in megabytes, however, which is what the HBA-API wants. The FCP code needs to accumulate it in bytes and then divide by 1,000,000 (not 2^20) before it presented via sysfs. This affects fcoe.ko only, not fnic. The fnic driver correctly by accumulating bytes and then converts to megabytes. I checked that libhbalinux is using the /sys file directly without conversion. BTW, qla2xxx does divide by 2^20, which I'm not fixing here. Signed-off-by: Joe Eykholt <jeykholt@cisco.com> Signed-off-by: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de> | |||
2010-12-09 | [SCSI] libfcoe: retry rejected FLOGI to another FCF if possible | Joe Eykholt | |
Switches using multiple-FCFs may reject FLOGI in order to balance the load between multiple FCFs. Even though the FCF was available, it may have more load at the point we actually send the FLOGI. If the FLOGI fails, select a different FCF if possible, among those with the same priority. If no other FCF is available, just deliver the reject to libfc for retry. Signed-off-by: Joe Eykholt <jeykholt@cisco.com> Signed-off-by: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de> |