Merge remote-tracking branch 'upstream/master' into queue
Merge reason: From: Alexander Graf <agraf@suse.de> "Just recently this really important patch got pulled into Linus' tree for 3.9: commit 1674400a Author: Anton Blanchard <anton <at> samba.org> Date: Tue Mar 12 01:51:51 2013 +0000 Without that commit, I can not boot my G5, thus I can't run automated tests on it against my queue. Could you please merge kvm/next against linus/master, so that I can base my trees against that?" * upstream/master: (653 commits) PCI: Use ROM images from firmware only if no other ROM source available sparc: remove unused "config BITS" sparc: delete "if !ULTRA_HAS_POPULATION_COUNT" KVM: Fix bounds checking in ioapic indirect register reads (CVE-2013-1798) KVM: x86: Convert MSR_KVM_SYSTEM_TIME to use gfn_to_hva_cache functions (CVE-2013-1797) KVM: x86: fix for buffer overflow in handling of MSR_KVM_SYSTEM_TIME (CVE-2013-1796) arm64: Kconfig.debug: Remove unused CONFIG_DEBUG_ERRORS arm64: Do not select GENERIC_HARDIRQS_NO_DEPRECATED inet: limit length of fragment queue hash table bucket lists qeth: Fix scatter-gather regression qeth: Fix invalid router settings handling qeth: delay feature trace sgy-cts1000: Remove __dev* attributes KVM: x86: fix deadlock in clock-in-progress request handling KVM: allow host header to be included even for !CONFIG_KVM hwmon: (lm75) Fix tcn75 prefix hwmon: (lm75.h) Update header inclusion MAINTAINERS: Remove Mark M. Hoffman xfs: ensure we capture IO errors correctly xfs: fix xfs_iomap_eof_prealloc_initial_size type ... Signed-off-by:Marcelo Tosatti <mtosatti@redhat.com>
No related branches found
No related tags found
Showing
- CREDITS 11 additions, 3 deletionsCREDITS
- Documentation/SubmittingPatches 1 addition, 2 deletionsDocumentation/SubmittingPatches
- Documentation/device-mapper/dm-raid.txt 37 additions, 7 deletionsDocumentation/device-mapper/dm-raid.txt
- Documentation/devicetree/bindings/mfd/ab8500.txt 1 addition, 5 deletionsDocumentation/devicetree/bindings/mfd/ab8500.txt
- Documentation/devicetree/bindings/tty/serial/of-serial.txt 3 additions, 0 deletionsDocumentation/devicetree/bindings/tty/serial/of-serial.txt
- Documentation/hwmon/adm1275 1 addition, 1 deletionDocumentation/hwmon/adm1275
- Documentation/hwmon/adt7410 10 additions, 1 deletionDocumentation/hwmon/adt7410
- Documentation/hwmon/jc42 1 addition, 1 deletionDocumentation/hwmon/jc42
- Documentation/hwmon/lineage-pem 1 addition, 1 deletionDocumentation/hwmon/lineage-pem
- Documentation/hwmon/lm25066 1 addition, 1 deletionDocumentation/hwmon/lm25066
- Documentation/hwmon/lm75 1 addition, 1 deletionDocumentation/hwmon/lm75
- Documentation/hwmon/ltc2978 3 additions, 3 deletionsDocumentation/hwmon/ltc2978
- Documentation/hwmon/ltc4261 1 addition, 1 deletionDocumentation/hwmon/ltc4261
- Documentation/hwmon/max16064 1 addition, 1 deletionDocumentation/hwmon/max16064
- Documentation/hwmon/max16065 1 addition, 1 deletionDocumentation/hwmon/max16065
- Documentation/hwmon/max34440 1 addition, 1 deletionDocumentation/hwmon/max34440
- Documentation/hwmon/max8688 1 addition, 1 deletionDocumentation/hwmon/max8688
- Documentation/hwmon/pmbus 1 addition, 1 deletionDocumentation/hwmon/pmbus
- Documentation/hwmon/smm665 1 addition, 1 deletionDocumentation/hwmon/smm665
- Documentation/hwmon/ucd9000 1 addition, 1 deletionDocumentation/hwmon/ucd9000
Please register or sign in to comment