aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-05-26Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linusLinus Torvalds14-24/+723
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus: squashfs: update documentation to include description of xattr layout squashfs: fix name reading in squashfs_xattr_get squashfs: constify xattr handlers squashfs: xattr fix sparse warnings squashfs: xattr_lookup sparse fix squashfs: add xattr support configure option squashfs: add new extended inode types squashfs: add support for xattr reading squashfs: add xattr id support
2010-05-26Merge branch 'for-linus' of ↵Linus Torvalds9-12/+541
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: roccat: fix build failure if built as module HID: roccat: propagate special events of roccat hardware to userspace HID: Add the GYR4101US USB ID to hid-gyration HID: fix hid-roccat-kone for bin_attr API change
2010-05-26Merge branch 'for-linus' of ↵Linus Torvalds13-102/+219
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: emu10k1: allow high-resolution mixer controls ALSA: pcm: fix delta calculation at boundary wraparound ALSA: hda_intel: fix handling of non-completion stream interrupts ALSA: usb/caiaq: fix Traktor Kontrol X1 ABS_HAT2X axis ALSA: hda: Fix model quirk for Dell M1730 ALSA: hda - iMac9,1 sound fixes ALSA: hda: Use LPIB for Toshiba A100-259 ALSA: hda: Use LPIB for Acer Aspire 5110 ALSA: aw2-alsa.c: use pci_ids.h defines and fix checkpatch.pl noise ALSA: usb-audio: add support for Akai MPD16 ALSA: pcm: fix the fix of the runtime->boundary calculation
2010-05-26Revert "endian: #define __BYTE_ORDER"Linus Torvalds9-8/+31
This reverts commit b3b77c8caef1750ebeea1054e39e358550ea9f55, which was also totally broken (see commit 0d2daf5cc858 that reverted the crc32 version of it). As reported by Stephen Rothwell, it causes problems on big-endian machines: > In file included from fs/jfs/jfs_types.h:33, > from fs/jfs/jfs_incore.h:26, > from fs/jfs/file.c:22: > fs/jfs/endian24.h:36:101: warning: "__LITTLE_ENDIAN" is not defined The kernel has never had that crazy "__BYTE_ORDER == __LITTLE_ENDIAN" model. It's not how we do things, and it isn't how we _should_ do things. So don't go there. Requested-by: Stephen Rothwell <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-26nuc900: add maintainer entries for Wan ZongShunWan ZongShun1-0/+12
Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-26revert "crc32: use __BYTE_ORDER macro for endian detection"Andrew Morton1-1/+1
It doesn't work on big-endian - those architectures don't define __LITTLE_ENDIAN. Cc: Joakim Tjernlund <[email protected]> Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-26fs/fscache/object-list.c: fix warning on 32-bitAndrew Morton1-1/+1
fs/fscache/object-list.c: In function 'fscache_objlist_lookup': fs/fscache/object-list.c:105: warning: cast to pointer from integer of different size Acked-by: David Howells <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-26nommu: allow private mappings of read-only devicesBernd Schmidt1-14/+18
Slightly rearrange the logic that determines capabilities and vm_flags. Disable BDI_CAP_MAP_DIRECT in all cases if the device can't support the protections. Allow private readonly mappings of readonly backing devices. Signed-off-by: Bernd Schmidt <[email protected]> Signed-off-by: Mike Frysinger <[email protected]> Acked-by: David McCullough <[email protected]> Acked-by: Greg Ungerer <[email protected]> Acked-by: Paul Mundt <[email protected]> Acked-by: David Howells <[email protected]> Cc: Hugh Dickins <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-26mempolicy: ERR_PTR dereference in mpol_shared_policy_init()Dan Carpenter1-1/+2
The original code called mpol_put(new) while "new" was an ERR_PTR. Signed-off-by: Dan Carpenter <[email protected]> Cc: Lee Schermerhorn <[email protected]> Cc: KOSAKI Motohiro <[email protected]> Cc: Christoph Lameter <[email protected]> Acked-by: David Rientjes <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-26Btrfs: avoid ENOSPC errors in btrfs_dirty_inodeChris Mason1-3/+11
btrfs_dirty_inode tries to sneak in without much waiting or space reservation, mostly for performance reasons. This usually works well but can cause problems when there are many many writers. When btrfs_update_inode fails with ENOSPC, we fallback to a slower btrfs_start_transaction call that will reserve some space. Signed-off-by: Chris Mason <[email protected]>
2010-05-26Btrfs: move O_DIRECT space reservation to btrfs_direct_IOChris Mason2-6/+8
This moves the delalloc space reservation done for O_DIRECT into btrfs_direct_IO. This way we don't leak reserved space if the generic O_DIRECT write code errors out before it calls into btrfs_direct_IO. Signed-off-by: Chris Mason <[email protected]>
2010-05-26NFS: Fix another nfs_wb_page() deadlockTrond Myklebust1-2/+5
J.R. Okajima reports that the call to sync_inode() in nfs_wb_page() can deadlock with other writeback flush calls. It boils down to the fact that we cannot ever call writeback_single_inode() while holding a page lock (even if we do set nr_to_write to zero) since another process may already be waiting in the call to do_writepages(), and so will deny us the I_SYNC lock. Signed-off-by: Trond Myklebust <[email protected]>
2010-05-26NFS: Ensure that we mark the inode as dirty if we exit early from commitTrond Myklebust1-2/+11
If we exit from nfs_commit_inode() without ensuring that the COMMIT rpc call has been completed, we must re-mark the inode as dirty. Otherwise, future calls to sync_inode() with the WB_SYNC_ALL flag set will fail to ensure that the data is on the disk. Signed-off-by: Trond Myklebust <[email protected]>
2010-05-26NFS: Fix a lock imbalance typo in nfs_access_cache_shrinkerTrond Myklebust1-0/+1
Commit 9c7e7e23371e629dbb3b341610a418cdf1c19d91 (NFS: Don't call iput() in nfs_access_cache_shrinker) unintentionally removed the spin unlock for the inode->i_lock. Reported-by: David Howells <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2010-05-26sunrpc: fix leak on error on socket xprt setupJ. Bruce Fields1-11/+18
Also collect exit code together while we're at it. Signed-off-by: J. Bruce Fields <[email protected]> Cc: Trond Myklebust <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2010-05-26backlight: adp8860: add support for ADP8861 & ADP8863Michael Hennerich3-20/+61
Signed-off-by: Michael Hennerich <[email protected]> Signed-off-by: Mike Frysinger <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: mbp_nvidia_bl - Fix DMI_SYS_VENDOR for MacBook1,1Steffen Röcker1-1/+1
Fix DMI_SYS_VENDOR for MacBook1,1. When the MacBook1,1 came out Apple was still named Apple Computer, I am not sure if this applies to older MacBook2,1 versions aswell. Signed-off-by: Steffen Röcker <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: Add Cirrus EP93xx backlight driverH Hartley Sweeten3-0/+171
The EP9307, EP9312, and EP9315 processors include a framebuffer peripheral. This peripheral has a dedicated pwm output called BRIGHT that can be used to control the backlight on an LCD. Signed-off-by: H Hartley Sweeten <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: l4f00242t03: Fix regulators handling code in remove functionAlberto Panizzo1-2/+2
Simple swap of regulator free Signed-off-by: Alberto Panizzo <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: fix adp8860_bl build errorsRandy Dunlap1-1/+6
Add slab.h to fix part of build. Add a parameter in backlight_device_register() call to fix part of build. drivers/video/backlight/adp8860_bl.c:215: error: implicit declaration of function 'kzalloc' drivers/video/backlight/adp8860_bl.c:215: warning: assignment makes pointer from integer without a cast drivers/video/backlight/adp8860_bl.c:285: error: implicit declaration of function 'kfree' drivers/video/backlight/adp8860_bl.c:673: warning: assignment makes pointer from integer without a cast drivers/video/backlight/adp8860_bl.c:689: error: too few arguments to function 'backlight_device_register' Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: new driver for the ADP8860 backlight partsMichael Hennerich4-0/+959
The ADP8860 combines a programmable backlight LED charge pump driver with automatic phototransistor control. Signed-off-by: Michael Hennerich <[email protected]> Signed-off-by: Mike Frysinger <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: 88pm860x_bl - potential memory leakDan Carpenter1-0/+1
I added a kfree() on the error path. I don't really expect it to affect anyone, but it's easy and makes the static checkers happy. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: mbp_nvidia_bl - add support for older MacBookPro and MacBook 6,1.Mario Schwalbe1-0/+45
Add support for all remaining models not yet present in Linus'/Richard Purdie's tree nor Evan McClain's patch to finally complete the list. Signed-off-by: Mario Schwalbe <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: Kconfig cleanupH Hartley Sweeten1-44/+35
Cleanup the "depends on" logic by wrapping the affected config options in appropriate if/endif blocks. Remove all the "default n" since that is the default default. Signed-off-by: H Hartley Sweeten <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: backlight_device_register() return ERR_PTR()Dan Carpenter1-2/+2
backlight_device_register() returns a valid pointer or ERR_PTR() never NULL. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26leds: Add mx31moboard MC13783 led supportPhilippe Rétornaz1-1/+44
Add two RGB led on mx31moboard using MC13783 led subsystem Signed-off-by: Philippe Rétornaz <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26leds: Add mc13783 LED supportPhilippe Rétornaz5-0/+481
This add basic led support for Freescale MC13783 PMIC. Signed-off-by: Philippe Rétornaz <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26leds: leds-ss4200: fix led_classdev_unregister twice in error handlingAxel Lin1-1/+1
In current implementation, if device_create_file failed in register_nasgpio_led, led_classdev_unregister will be executed twice. ( in register_nasgpio_led it calls led_classdev_unregister before return and in nas_gpio_init out_err ) This patch fixes it by only unregistering those that were successfully registered in out_err. ( not including last failed register_nasgpio_led call ) Signed-off-by: Axel Lin <[email protected]> Acked-by: Dave Hansen <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26leds: leds-lp3944: properly handle lp3944_configure fail in lp3944_probeAxel Lin1-2/+7
In current implementation, lp3944_probe return 0 even if lp3944_configure fail. Therefore, led_classdev_unregister will be executed twice ( in error handling of lp3944_configure and lp3944_remove ). This patch properly handles lp3944_configure fail in lp3944_probe. Signed-off-by: Axel Lin <[email protected]> Acked-by: Wolfram Sang <[email protected]> Acked-by: Antonio Ospite <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26leds: led-class: set permissions on max_brightness file to 0444Axel Lin1-1/+1
max_brightness is not writable, thus set permissions to 0444. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26leds: leds-gpio: Change blink_set callback to be able to turn off blinkingBenjamin Herrenschmidt3-21/+44
The leds-gpio blink_set() callback follows the same prototype as the main leds subsystem blink_set() one. The problem is that to stop blink, normally, a leds driver does it in the brightness_set() callback when asked to set a new fixed value. However, with leds-gpio, the platform has no hook to do so, as this later callback results in a standard GPIO manipulation. This changes the leds-gpio specific callback to take a new argument that indicates whether the LED should be blinking or not and in what state it should be set if not. We also update the dns323 platform which seems to be the only user of this so far. Signed-off-by: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26leds: Add LED driver for the Soekris net5501 boardBjarke Istrup Pedersen3-0/+105
It is based on the previously submitted code by Alessandro Zummo, but is changed to use the new GPIO driver with 2.6.33, and the driver has been moved to drivers/leds where it belongs. [[email protected]: coding-style fixes] [[email protected]: fix net5501 kconfig] Signed-off-by: Bjarke Istrup Pedersen <[email protected]> Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Alessandro Zummo <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26leds: 88pm860x - fix checking in probe functionChristoph Fritz1-3/+8
Improve device and platform data checks in probe function. Signed-off-by: Haojian Zhuang <[email protected]> Signed-off-by: Christoph Fritz <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26ARM: Merge next-samsungBen Dooks9-33/+42
Merge branch 'next-samsung' into for-linus/2634-git-updates
2010-05-26ARM: S5PC100: Fixup cross tree merge problemsBen Dooks1-5/+2
The commit 45c79433c02b8fe7b8a1cbf60548a9798d0502ed got things building but then commit 17d2f877ae8b68b09bf88a9949ee64fbbda5ee10 and others where merged in from a seperate tree and this has resulted from a build failure due to the redefinition of IRQ_EINT(). Fix this by merging a new commit. Signed-off-by: Ben Dooks <[email protected]>
2010-05-26ARM: S5P: Fix the platform external interrupt issues.Pannaga Bhushan8-28/+40
This patch does the following: 1. Corrects the common platform code for external interrupts for using the VIC mask/unmask bits also. 2. Moves the common defines related to external interrupt for plat-s5p to common files. 3. Based on the new common defines, corresponding changes are made in the affected platforms (S5P6440, S5P6442 and S5PC100). Signed-off-by: Pannaga Bhushan <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2010-05-26ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34-gitBen Dooks1-6/+27
Update the s5pv210_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <[email protected]>
2010-05-26ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34-gitBen Dooks1-6/+24
Update the s5pc110_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <[email protected]>
2010-05-26ARM: s5pc100_defconfig: Update s5pc100_defconfig to v2.6.34-gitBen Dooks1-49/+184
Update the s5pc100_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <[email protected]>
2010-05-26ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34-gitBen Dooks1-6/+18
Update the s5p6442_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <[email protected]>
2010-05-26ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34-gitBen Dooks1-6/+23
Update the s5p6440_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <[email protected]>
2010-05-26ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34-gitBen Dooks1-7/+28
Update the s3c6400_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <[email protected]>
2010-05-26ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34-gitBen Dooks1-9/+61
Update the s3c2410_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <[email protected]>
2010-05-26Merge branch 'fix/hda' into for-linusTakashi Iwai3-47/+48
2010-05-26agp: amd64, fix pci reference leaksJiri Slaby1-10/+18
Stanse found pci reference leaks in uli_agp_init and nforce3_agp_init initialization functions. The PCI devices are bridges, so it's not critical, but still worth fixing. Signed-off-by: Jiri Slaby <[email protected]> Cc: Jesse Barnes <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-25Btrfs: rework O_DIRECT enospc handlingChris Mason4-30/+49
This changes O_DIRECT write code to mark extents as delalloc while it is processing them. Yan Zheng has reworked the enospc accounting based on tracking delalloc extents and this makes it much easier to track enospc in the O_DIRECT code. There are a few space cases with the O_DIRECT code though, it only sets the EXTENT_DELALLOC bits, instead of doing EXTENT_DELALLOC | EXTENT_DIRTY | EXTENT_UPTODATE, because we don't want to mess with clearing the dirty and uptodate bits when things go wrong. This is important because there are no pages in the page cache, so any extent state structs that we put in the tree won't get freed by releasepage. We have to clear them ourselves as the DIO ends. With this commit, we reserve space at in btrfs_file_aio_write, and then as each btrfs_direct_IO call progresses it sets EXTENT_DELALLOC on the range. btrfs_get_blocks_direct is responsible for clearing the delalloc at the same time it drops the extent lock. Signed-off-by: Chris Mason <[email protected]>
2010-05-26drm/edid: Allow non-fatal checksum errors in CEA blocksAdam Jackson1-1/+4
Switches will try to update the topology address and not correctly fix up the checksum, so just let it slide. https://bugs.freedesktop.org/28229 Signed-off-by: Adam Jackson <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-26drm/radeon/kms: suppress a build warning (unused variable)Stefan Richter1-0/+1
At least 'make CONFIG_DEBUG_SECTION_MISMATCH=y' causes drivers/gpu/drm/radeon/atombios_crtc.c: In function 'atombios_crtc_set_pll': drivers/gpu/drm/radeon/atombios_crtc.c:684: warning: 'pll' may be used uninitialized in this function which has the looks of a falso positive. Add a default: case so that gcc rests assured that all possible pll_id's are covered. Keep the present cases that fall through to the default one for self-documentation. Signed-off-by: Stefan Richter <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-26squashfs: update documentation to include description of xattr layoutPhillip Lougher1-5/+27
Signed-off-by: Phillip Lougher <[email protected]>
2010-05-25Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds75-360/+679
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (63 commits) drivers/net/usb/asix.c: Fix pointer cast. be2net: Bug fix to avoid disabling bottom half during firmware upgrade. proc_dointvec: write a single value hso: add support for new products Phonet: fix potential use-after-free in pep_sock_close() ath9k: remove VEOL support for ad-hoc ath9k: change beacon allocation to prefer the first beacon slot sock.h: fix kernel-doc warning cls_cgroup: Fix build error when built-in macvlan: do proper cleanup in macvlan_common_newlink() V2 be2net: Bug fix in init code in probe net/dccp: expansion of error code size ath9k: Fix rx of mcast/bcast frames in PS mode with auto sleep wireless: fix sta_info.h kernel-doc warnings wireless: fix mac80211.h kernel-doc warnings iwlwifi: testing the wrong variable in iwl_add_bssid_station() ath9k_htc: rare leak in ath9k_hif_usb_alloc_tx_urbs() ath9k_htc: dereferencing before check in hif_usb_tx_cb() rt2x00: Fix rt2800usb TX descriptor writing. rt2x00: Fix failed SLEEP->AWAKE and AWAKE->SLEEP transitions. ...
Powered by cgit, Gruvboxed by Blaster4385.