aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-05-25hwmon: (max6650) Properly support the MAX6650Jean Delvare2-10/+36
The MAX6650 has only one fan input. Signed-off-by: Jean Delvare <[email protected]> Acked-by: "Hans J. Koch" <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2011-05-25hwmon: (max6650) Drop device detectionJean Delvare2-45/+8
MAX6650 device detection is unreliable, we got reports of false positives. We now have many ways to let users instantiate the devices explicitly, so unreliable detection should be dropped. Signed-off-by: Jean Delvare <[email protected]> Acked-by: "Hans J. Koch" <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2011-05-25Move ACPI power meter driver to hwmonJean Delvare5-12/+11
As discussed earlier, the ACPI power meter driver would better live in drivers/hwmon, as its only purpose is to create hwmon-style interfaces for ACPI 4.0 power meter devices. Users are more likely to look for it there, and less likely to accidentally hide it by unselecting its dependencies. Signed-off-by: Jean Delvare <[email protected]> Acked-by: "Darrick J. Wong" <[email protected]> Acked-by: Guenter Roeck <[email protected]> Cc: Len Brown <[email protected]>
2011-05-25hwmon: (f71882fg) Add support for F71808AHans de Goede3-4/+89
Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2011-05-25hwmon: (f71882fg) Split has_beep in fan_has_beep and temp_has_beepHans de Goede1-7/+21
Needed for upcoming support of the F71808A. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2011-05-25hwmon: (asc7621) Drop duplicate dependencyJean Delvare1-1/+1
The config SENSORS_ASC7621 entry is inside an if HWMON / endif block, so it already depends on HWMON. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2011-05-25hwmon: (jc42) Change detection classJean Delvare2-2/+2
While the JC42-compatible chips are temperature sensors, I2C_CLASS_SPD makes more sense because these chips always live on memory modules. Signed-off-by: Jean Delvare <[email protected]> Cc: Guenter Roeck <[email protected]>
2011-05-25hwmon: Add driver for AMD family 15h processor power informationAndreas Herrmann5-0/+284
This CPU family provides NB register values to gather following TDP information * ProcessorPwrWatts: Specifies in Watts the maximum amount of power the processor can support. * CurrPwrWatts: Specifies in Watts the current amount of power being consumed by the processor. This driver provides * power1_crit (ProcessorPwrWatts) * power1_input (CurrPwrWatts) Signed-off-by: Andreas Herrmann <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2011-05-25hwmon: (k10temp) Add support for Fam15h (Bulldozer)Andre Przywara3-5/+7
AMDs upcoming CPUs use the same mechanism for the internal temperature reporting as the Fam10h CPUs, so we just needed to add the appropriate PCI-ID to the list. This allows to use the k10temp driver on those CPUs. While at it change the Kconfig entry to be more generic. Signed-off-by: Andre Przywara <[email protected]> Acked-by: Clemens Ladisch <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2011-05-25hwmon: Use helper functions to set and get driver dataJean Delvare6-27/+27
Use helper functions to set and get driver data. This is more elegant. Signed-off-by: Jean Delvare <[email protected]> Cc: Andreas Herrmann <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2011-05-25i8k: Avoid lahf in 64-bit codeLuca Tettamanti1-2/+2
i8k uses lahf to read the flag register in 64-bit code; early x86-64 CPUs, however, lack this instruction and we get an invalid opcode exception at runtime. Use pushf to load the flag register into the stack instead. Signed-off-by: Luca Tettamanti <[email protected]> Reported-by: Jeff Rickman <[email protected]> Tested-by: Jeff Rickman <[email protected]> Tested-by: Harry G McGavran Jr <[email protected]> Cc: [email protected] Cc: Massimo Dal Zotto <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2011-05-24Merge branch 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linuxLinus Torvalds8-115/+263
* 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linux: (21 commits) mach-ux500: set proper I2C platform data from MOP500s i2c-nomadik: break out single messsage transmission i2c-nomadik: reset the hw after status check i2c-nomadik: remove the unnecessary delay i2c-nomadik: change the TX and RX threshold i2c-nomadik: add code to retry on timeout failure i2c-nomadik: use pm_runtime API i2c-nomadik: print abort cause only on abort tag i2c-nomadik: correct adapter timeout initialization i2c-nomadik: remove the redundant error message i2c-nomadik: corrrect returned error numbers i2c-nomadik: fix speed enumerator i2c-nomadik: make i2c timeout specific per i2c bus i2c-nomadik: add regulator support i2c: i2c-sh_mobile bus speed platform data V2 i2c: i2c-sh_mobile clock string removal i2c-eg20t: Support new device ML7223 IOH i2c: tegra: Add de-bounce cycles. i2c: tegra: fix repeated start handling i2c: tegra: recover from spurious interrupt storm ...
2011-05-25Merge branches 'for-2639/i2c-eg20t', 'for-2639/i2c-shmobile', ↵Ben Dooks5084-325333/+334116
'for-2639/i2c-tegra' and 'for-2639/i2c-nomadik2' into for-linus/2640/i2c
2011-05-25mach-ux500: set proper I2C platform data from MOP500sLinus Walleij1-6/+8
This specifies the new per-platform timeout per I2C bus and switches the I2C buses to fast mode, and increase the FIFO depth to 8 for reads and writes. Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-05-25i2c-nomadik: break out single messsage transmissionLinus Walleij1-32/+48
Reduce code size in the message transfer function by factoring out a single-message transfer function. Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-05-25i2c-nomadik: reset the hw after status checkVirupax Sadashivpetimath1-4/+4
In case of I2C timeout, reset the HW only after the HW status is read, otherwise the staus will be lost. Signed-off-by: Virupax Sadashivpetimath <[email protected]> Reviewed-by: Jonas Aberg <[email protected]> Reviewed-by: Srinidhi Kasagar <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-05-25i2c-nomadik: remove the unnecessary delayVirupax Sadashivpetimath1-18/+2
The delay in the driver seems to be not needed, so remove it. Signed-off-by: Virupax Sadashivpetimath <[email protected]> Reviewed-by: Markus Grape <[email protected]> Tested-by: Per Persson <[email protected]> Tested-by: Chethan Krishna N <[email protected]> Reviewed-by: Srinidhi Kasagar <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-05-25i2c-nomadik: change the TX and RX thresholdVirupax Sadashivpetimath1-13/+26
1) Increase RX FIFO threshold so that there is a reduction in the number of interrupts handled to complete a transaction. 2) Fill TX FIFO in the write function. Signed-off-by: Virupax Sadashivpetimath <[email protected]> Reviewed-by: Jonas Aberg <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-05-25i2c-nomadik: add code to retry on timeout failureVirupax Sadashivpetimath1-48/+49
It is seen that i2c-nomadik controller randomly stops generating the interrupts leading to a i2c timeout. As a workaround to this problem, add retries to the on going transfer on failure. Signed-off-by: Virupax Sadashivpetimath <[email protected]> Reviewed-by: Jonas ABERG <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-05-25i2c-nomadik: use pm_runtime APIRabin Vincent1-6/+31
Use the pm_runtime API for pins control. Signed-off-by: Rabin Vincent <[email protected]> Reviewed-by: Srinidhi Kasagar <[email protected]> Reviewed-by: Jonas Aberg <[email protected]> [deleted some surplus runtime PM code] Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-05-25i2c-nomadik: print abort cause only on abort tagVirupax Sadashivpetimath1-8/+19
Modify the code to: 1)Print the cause of i2c failure only if the status is set to ABORT. 2)Print slave address on send/receive fail, will help in which slave failed. Signed-off-by: Virupax Sadashivpetimath <[email protected]> Reviewed-by: Jonas Aberg <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-05-25i2c-nomadik: correct adapter timeout initializationVirupax Sadashivpetimath1-4/+5
Correct the incorrect initialization of adapter timeout not to be in milliseconds, as it needs to be done in jiffies. Signed-off-by: Virupax Sadashivpetimath <[email protected]> Reviewed-by: Srinidhi Kasagar <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-05-25i2c-nomadik: remove the redundant error messagesrinidhi kasagar1-2/+0
The abort cause string itself is an error, so remove the redundant explicit error message. Signed-off-by: Srinidhi Kasagar <[email protected]> Reviewed-by: Jonas Aberg <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-05-25i2c-nomadik: corrrect returned error numbersVirupax Sadashivpetimath1-4/+6
The code was returning bad error numbers or just -1 in some cases. Signed-off-by: Virupax Sadashivpetimath <[email protected]> Reviewed-by: Srinidhi Kasagar <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-05-25i2c-nomadik: fix speed enumeratorLinus Walleij1-1/+1
The I2C speed enumerators in the i2c-nomadik header file were in the wrong order. Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-05-25i2c-nomadik: make i2c timeout specific per i2c busVirupax Sadashivpetimath2-8/+8
Add option to have different i2c timeout delay for different i2c buses specified in platform data. Default to the old value unless specified. Signed-off-by: Virupax Sadashivpetimath <[email protected]> Reviewed-by: Srinidhi Kasagar <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-05-25i2c-nomadik: add regulator supportJonas Aberg1-15/+58
This on-chip I2C controller needs to fetch the regulator representing its voltage domain so that it won't be switched off. Signed-off-by: Jonas Aberg <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-05-24Merge branch 'i2c-for-linus' of ↵Linus Torvalds7-83/+97
git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c-parport: Various cleanups i2c-i801: Don't depend on other kernel driver config options i2c-i801: Check for vendor Fujitsu before probing for apanel i2c-i801: Don't probe for slaves on IDF channels i2c-i801: SMBus patch for Intel Panther Point DeviceIDs i2c/writing-clients: Fix foo_driver.id_table
2011-05-24Merge branch 'for_linus' of ↵Linus Torvalds6-32/+91
git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: jbd: Fix comment to match the code in journal_start() jbd/jbd2: remove obsolete summarise_journal_usage. jbd: Fix forever sleeping process in do_get_write_access() ext2: fix error msg when mounting fs with too-large blocksize jbd: fix fsync() tid wraparound bug ext3: Fix fs corruption when make_indexed_dir() fails ext3: Fix lock inversion in ext3_symlink()
2011-05-24Merge branch 'for-linus' of ↵Linus Torvalds9-51/+223
git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm: dlm: make plock operation killable dlm: remove shared message stub for recovery dlm: delayed reply message warning dlm: Remove superfluous call to recalc_sigpending()
2011-05-24Merge branch 'for-linus' of ↵Linus Torvalds39-284/+603
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (43 commits) TOMOYO: Fix wrong domainname validation. SELINUX: add /sys/fs/selinux mount point to put selinuxfs CRED: Fix load_flat_shared_library() to initialise bprm correctly SELinux: introduce path_has_perm flex_array: allow 0 length elements flex_arrays: allow zero length flex arrays flex_array: flex_array_prealloc takes a number of elements, not an end SELinux: pass last path component in may_create SELinux: put name based create rules in a hashtable SELinux: generic hashtab entry counter SELinux: calculate and print hashtab stats with a generic function SELinux: skip filename trans rules if ttype does not match parent dir SELinux: rename filename_compute_type argument to *type instead of *con SELinux: fix comment to state filename_compute_type takes an objname not a qstr SMACK: smack_file_lock can use the struct path LSM: separate LSM_AUDIT_DATA_DENTRY from LSM_AUDIT_DATA_PATH LSM: split LSM_AUDIT_DATA_FS into _PATH and _INODE SELINUX: Make selinux cache VFS RCU walks safe SECURITY: Move exec_permission RCU checks into security modules SELinux: security_read_policy should take a size_t not ssize_t ...
2011-05-24Merge branch 'kbuild' of ↵Linus Torvalds20-108/+287
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: kbuild: make KBUILD_NOCMDDEP=1 handle empty built-in.o scripts/kallsyms.c: fix potential segfault scripts/gen_initramfs_list.sh: Convert to a /bin/sh script kbuild: Fix GNU make v3.80 compatibility kbuild: Fix passing -Wno-* options to gcc 4.4+ kbuild: move scripts/basic/docproc.c to scripts/docproc.c kbuild: Fix Makefile.asm-generic for um kbuild: Allow to combine multiple W= levels kbuild: Disable -Wunused-but-set-variable for gcc 4.6.0 Fix handling of backlash character in LINUX_COMPILE_BY name kbuild: asm-generic support kbuild: implement several W= levels kbuild: Fix build with binutils <= 2.19 initramfs: Use KBUILD_BUILD_TIMESTAMP for generated entries kbuild: Allow to override LINUX_COMPILE_BY and LINUX_COMPILE_HOST macros kbuild: Drop unused LINUX_COMPILE_TIME and LINUX_COMPILE_DOMAIN macros kbuild: Use the deterministic mode of ar kbuild: Call gzip with -n kbuild: move KALLSYMS_EXTRA_PASS from Kconfig to Makefile Kconfig: improve KALLSYMS_ALL documentation Fix up trivial conflict in Makefile
2011-05-24Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds60-63/+63
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: Make struct pcmcia_device_id const, sound drivers edition staging: pcmcia: Convert pcmcia_device_id declarations to const pcmcia: Convert pcmcia_device_id declarations to const pcmcia: Make declaration and uses of struct pcmcia_device_id const pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data
2011-05-24Merge branch 'drm-core-next' of ↵Linus Torvalds104-4045/+9392
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (169 commits) drivers/gpu/drm/radeon/atom.c: fix warning drm/radeon/kms: bump kms version number drm/radeon/kms: properly set num banks for fusion asics drm/radeon/kms/atom: move dig phy init out of modesetting drm/radeon/kms/cayman: fix typo in register mask drm/radeon/kms: fix typo in spread spectrum code drm/radeon/kms: fix tile_config value reported to userspace on cayman. drm/radeon/kms: fix incorrect comparison in cayman setup code. drm/radeon/kms: add wait idle ioctl for eg->cayman drm/radeon/cayman: setup hdp to invalidate and flush when asked drm/radeon/evergreen/btc/fusion: setup hdp to invalidate and flush when asked agp/uninorth: Fix lockups with radeon KMS and >1x. drm/radeon/kms: the SS_Id field in the LCD table if for LVDS only drm/radeon/kms: properly set the CLK_REF bit for DCE3 devices drm/radeon/kms: fixup eDP connector handling drm/radeon/kms: bail early for eDP in hotplug callback drm/radeon/kms: simplify hotplug handler logic drm/radeon/kms: rewrite DP handling drm/radeon/kms/atom: add support for setting DP panel mode drm/radeon/kms: atombios.h updates for DP panel mode ...
2011-05-24Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds58-1284/+895
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (29 commits) [S390] cpu hotplug: fix external interrupt subclass mask handling [S390] oprofile: dont access lowcore [S390] oprofile: add missing irq stats counter [S390] Ignore sendmmsg system call note wired up warning [S390] s390,oprofile: fix compile error for !CONFIG_SMP [S390] s390,oprofile: fix alert counter increment [S390] Remove unused includes in process.c [S390] get CPC image name [S390] sclp: event buffer dissection [S390] chsc: process channel-path-availability information [S390] refactor page table functions for better pgste support [S390] merge page_test_dirty and page_clear_dirty [S390] qdio: prevent compile warning [S390] sclp: remove unnecessary sendmask check [S390] convert old cpumask API into new one [S390] pfault: cleanup code [S390] pfault: cpu hotplug vs missing completion interrupts [S390] smp: add __noreturn attribute to cpu_die() [S390] percpu: implement arch specific irqsafe_cpu_ops [S390] vdso: disable gcov profiling ...
2011-05-24i2c-parport: Various cleanupsJean Delvare3-59/+55
* Fix white space. * Rename labels to something meaningful. * Prefix defines with PORT_ to avoid collision with macros from <linux/parport.h>. * Add const markers where possible. Signed-off-by: Jean Delvare <[email protected]>
2011-05-24Merge branch 'for-linus' of ↵Linus Torvalds38-359/+2155
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits) Input: ADP5589 - new driver for I2C Keypad Decoder and I/O Expander Input: tsc2007 - add X, Y and Z fuzz factors to platform data Input: tsc2007 - add poll_period parameter to platform data Input: tsc2007 - add poll_delay parameter to platform data Input: tsc2007 - add max_rt parameter to platform data Input: tsc2007 - debounce pressure measurement Input: ad714x - fix captouch wheel option algorithm Input: ad714x - allow platform code to specify irqflags Input: ad714x - fix threshold and completion interrupt masks Input: ad714x - fix up input configuration Input: elantech - remove support for proprietary X driver Input: elantech - report multitouch with proper ABS_MT messages Input: elantech - export pressure and width when supported Input: elantech - describe further the protocol Input: atmel_tsadcc - correct call to input_free_device Input: add driver FSL MPR121 capacitive touch sensor Input: remove useless synchronize_rcu() calls Input: ads7846 - fix gpio_pendown configuration Input: ads7846 - add possibility to use external vref on ads7846 Input: rotary-encoder - add support for half-period encoders ...
2011-05-24i2c-i801: Don't depend on other kernel driver config optionsJean Delvare2-10/+7
Don't let other driver config options influence us, as it makes the code more complex and fragile for a small benefit. There's nothing wrong with instantiating I2C devices even if they don't have a driver. And we're talking about 835 extra bytes in the binary on x86-64, that's hardly worth arguing about. Signed-off-by: Jean Delvare <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Hans de Goede <[email protected]>
2011-05-24i2c-i801: Check for vendor Fujitsu before probing for apanelJean Delvare1-1/+2
Scanning the BIOS memory for the apanel information is costly, so avoid doing it on non-Fujitsu machines. Signed-off-by: Jean Delvare <[email protected]>
2011-05-24i2c-i801: Don't probe for slaves on IDF channelsJean Delvare1-15/+31
I don't know if Fujitsu is ever going to produce Patsburg-based machines, but if they do, I'd rather not probe the secondary (IDF) SMBus channels. At least not until we have a good reason for doing so. On a side note, I'm not even sure if it is right to enable detection of HWMON and DDC devices on the IDF channels. Time will tell... Signed-off-by: Jean Delvare <[email protected]> Acked-by: Hans de Goede <[email protected]> Acked-by: David Woodhouse <[email protected]>
2011-05-24i2c-i801: SMBus patch for Intel Panther Point DeviceIDsSeth Heasley3-1/+5
This patch adds the SMBus controller DeviceID for the Intel Panther Point PCH. Signed-off-by: Seth Heasley <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2011-05-24i2c/writing-clients: Fix foo_driver.id_tableVikram Narayanan1-1/+1
The i2c_device_id structure variable's name is not used in the i2c_driver structure. Signed-off-by: Vikram Narayanan <[email protected]> Cc: [email protected] Signed-off-by: Jean Delvare <[email protected]>
2011-05-24Merge branch 'for-2.6.40' of ↵Linus Torvalds21-52/+60
git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu * 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu: Unify input section names percpu: Avoid extra NOP in percpu_cmpxchg16b_double percpu: Cast away printk format warning percpu: Always align percpu output section to PAGE_SIZE Fix up fairly trivial conflict in arch/x86/include/asm/percpu.h as per Tejun
2011-05-24Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6Linus Torvalds10-129/+132
* 'linux-next' of git://git.infradead.org/ubi-2.6: UBI: switch to dynamic printks UBI: turn some macros into static inline UBI: improve checking in debugging prints UBI: fix typo in a message UBI: fix minor stylistic issues UBI: use __packed instead of __attribute__((packed)) UBI: cleanup comments around volume properties UBI: re-name set volume properties ioctl UBI: make the control character device non-seekable
2011-05-24Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6Linus Torvalds26-934/+1117
* 'linux-next' of git://git.infradead.org/ubifs-2.6: (52 commits) UBIFS: switch to dynamic printks UBIFS: fix kernel-doc comments UBIFS: fix extremely rare mount failure UBIFS: simplify LEB recovery function further UBIFS: always cleanup the recovered LEB UBIFS: clean up LEB recovery function UBIFS: fix-up free space on mount if flag is set UBIFS: add the fixup function UBIFS: add a superblock flag for free space fix-up UBIFS: share the next_log_lnum helper UBIFS: expect corruption only in last journal head LEBs UBIFS: synchronize write-buffer before switching to the next bud UBIFS: remove BUG statement UBIFS: change bud replay function conventions UBIFS: substitute the replay tree with a replay list UBIFS: simplify replay UBIFS: store free and dirty space in the bud replay entry UBIFS: remove unnecessary stack variable UBIFS: double check that buds are replied in order UBIFS: make 2 functions static ...
2011-05-24Merge branch 'for-linus' of ↵Linus Torvalds41-1960/+1369
git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (22 commits) m68knommu: Use generic show_interrupts() coldfire_qspi compile fix m68k: merge the mmu and non-mmu versions of sys_m68k.c m68knommu: use asm-generic/bitops/ext2-atomic.h m68knommu: Remove obsolete #include <linux/sys.h> m68k: merge mmu and non-mmu versions of asm-offsets.c m68k: merge non-mmu and mmu versions of m68k_ksyms.c m68knommu: remove un-needed exporting of COLDFIRE symbols m68knommu: move EXPORT of kernel_thread to function definition m68knommu: move EXPORT of local checksumming functions to definitions m68knommu: move EXPORT of dump_fpu to function definition m68knommu: clean up mm/init_no.c m68k: merge the mmu and non-mmu mm/Makefile m68k: mv kmap_mm.c to kmap.c m68knommu: remove stubs for __ioremap() and iounmap() m68knommu: remove unused kernel_set_cachemode() m68k: let Makefile sort out compiling mmu and non-mmu lib/checksum.c m68k: remove duplicate memcpy() implementation m68k: remove duplicate memset() implementation m68k: remove duplicate memmove() implementation ...
2011-05-24Merge branch 'x86-urgent-for-linus' of ↵Linus Torvalds5-15/+6
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, ioapic: Restore ioapic entries during resume properly x86: Get rid of asmregparm um: Use RWSEM_GENERIC_SPINLOCK on x86
2011-05-24x86, ioapic: Restore ioapic entries during resume properlySuresh Siddha1-2/+2
In mask/restore_ioapic_entries() we should be restoring ioapic entries when ioapics[apic].saved_registers is not NULL. Fix the typo and address the resume hang regression reported by Linus. This was not found sooner because the systems where these changes were tested on kept the IO-APIC entries intact over resume. Reported-and-tested-by: Linus Torvalds <[email protected]> Signed-off-by: Suresh Siddha <[email protected]> Cc: Daniel J Blueman <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
2011-05-24Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into ↵James Morris14-220/+398
for-linus Conflicts: lib/flex_array.c security/selinux/avc.c security/selinux/hooks.c security/selinux/ss/policydb.c security/smack/smack_lsm.c Manually resolve conflicts. Signed-off-by: James Morris <[email protected]>
2011-05-24Merge branch 'next' into for-linusJames Morris25-64/+205
Powered by cgit, Gruvboxed by Blaster4385.