1. 29 5月, 2011 2 次提交
    • L
      Merge branch 'setns' · 571503e1
      Linus Torvalds 提交于
      * setns:
        ns: Wire up the setns system call
      
      Done as a merge to make it easier to fix up conflicts in arm due to
      addition of sendmmsg system call
      571503e1
    • E
      ns: Wire up the setns system call · 7b21fddd
      Eric W. Biederman 提交于
      32bit and 64bit on x86 are tested and working.  The rest I have looked
      at closely and I can't find any problems.
      
      setns is an easy system call to wire up.  It just takes two ints so I
      don't expect any weird architecture porting problems.
      
      While doing this I have noticed that we have some architectures that are
      very slow to get new system calls.  cris seems to be the slowest where
      the last system calls wired up were preadv and pwritev.  avr32 is weird
      in that recvmmsg was wired up but never declared in unistd.h.  frv is
      behind with perf_event_open being the last syscall wired up.  On h8300
      the last system call wired up was epoll_wait.  On m32r the last system
      call wired up was fallocate.  mn10300 has recvmmsg as the last system
      call wired up.  The rest seem to at least have syncfs wired up which was
      new in the 2.6.39.
      
      v2: Most of the architecture support added by Daniel Lezcano <dlezcano@fr.ibm.com>
      v3: ported to v2.6.36-rc4 by: Eric W. Biederman <ebiederm@xmission.com>
      v4: Moved wiring up of the system call to another patch
      v5: ported to v2.6.39-rc6
      v6: rebased onto parisc-next and net-next to avoid syscall  conflicts.
      v7: ported to Linus's latest post 2.6.39 tree.
      
      >  arch/blackfin/include/asm/unistd.h     |    3 ++-
      >  arch/blackfin/mach-common/entry.S      |    1 +
      Acked-by: NMike Frysinger <vapier@gentoo.org>
      
      Oh - ia64 wiring looks good.
      Acked-by: NTony Luck <tony.luck@intel.com>
      Signed-off-by: NEric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7b21fddd
  2. 28 5月, 2011 32 次提交
    • L
      Merge git://git.infradead.org/mtd-2.6 · 29a6ccca
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6: (97 commits)
        mtd: kill CONFIG_MTD_PARTITIONS
        mtd: remove add_mtd_partitions, add_mtd_device and friends
        mtd: convert remaining users to mtd_device_register()
        mtd: samsung onenand: convert to mtd_device_register()
        mtd: omap2 onenand: convert to mtd_device_register()
        mtd: txx9ndfmc: convert to mtd_device_register()
        mtd: tmio_nand: convert to mtd_device_register()
        mtd: socrates_nand: convert to mtd_device_register()
        mtd: sharpsl: convert to mtd_device_register()
        mtd: s3c2410 nand: convert to mtd_device_register()
        mtd: ppchameleonevb: convert to mtd_device_register()
        mtd: orion_nand: convert to mtd_device_register()
        mtd: omap2: convert to mtd_device_register()
        mtd: nomadik_nand: convert to mtd_device_register()
        mtd: ndfc: convert to mtd_device_register()
        mtd: mxc_nand: convert to mtd_device_register()
        mtd: mpc5121_nfc: convert to mtd_device_register()
        mtd: jz4740_nand: convert to mtd_device_register()
        mtd: h1910: convert to mtd_device_register()
        mtd: fsmc_nand: convert to mtd_device_register()
        ...
      
      Fixed up trivial conflicts in
       - drivers/mtd/maps/integrator-flash.c: removed in ARM tree
       - drivers/mtd/maps/physmap.c: addition of afs partition probe type
         clashing with removal of CONFIG_MTD_PARTITIONS
      29a6ccca
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 42604831
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (60 commits)
        [SCSI] lpfc 8.3.24: Extend BSG infrastructure and add link diagnostics
        [SCSI] lpfc 8.3.24: Add resource extent support
        [SCSI] lpfc 8.3.24: Add request-firmware support
        [SCSI] lpfc 8.3.24: Add SR-IOV control
        [SCSI] lpfc 8.3.24: Extended hardware support and support dump images
        [SCSI] lpfc 8.3.24: Miscellaneous Fixes and Corrections
        [SCSI] libsas: Add option for SATA soft reset
        [SCSI] libsas: check dev->gone before submitting sata i/o
        [SCSI] libsas: fix/amend device gone notification in sas_deform_port()
        [SCSI] MAINTAINERS update for SCSI (new email address)
        [SCSI] Fix Ultrastor asm snippet
        [SCSI] osst: fix warning
        [SCSI] osst: wrong index used in inner loop
        [SCSI] aic94xx: world-writable sysfs update_bios file
        [SCSI] MAINTAINERS: Add drivers/target/ entry
        [SCSI] target: Convert TASK_ATTR to scsi_tcq.h definitions
        [SCSI] target: Convert REPORT_LUNs to use int_to_scsilun
        [SCSI] target: Fix task->task_execute_queue=1 clear bug + LUN_RESET OOPs
        [SCSI] target: Fix bug with task_sg chained transport_free_dev_tasks release
        [SCSI] target: Fix interrupt context bug with stats_lock and core_tmr_alloc_req
        ...
      42604831
    • L
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 2a56d222
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)
        ARM: 6945/1: Add unwinding support for division functions
        ARM: kill pmd_off()
        ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks
        ARM: 6943/1: mm: use TTBR1 instead of reserved context ID
        ARM: 6942/1: mm: make TTBR1 always point to swapper_pg_dir on ARMv6/7
        ARM: 6941/1: cache: ensure MVA is cacheline aligned in flush_kern_dcache_area
        ARM: add sendmmsg syscall
        ARM: 6863/1: allow hotplug on msm
        ARM: 6832/1: mmci: support for ST-Ericsson db8500v2
        ARM: 6830/1: mach-ux500: force PrimeCell revisions
        ARM: 6829/1: amba: make hardcoded periphid override hardware
        ARM: 6828/1: mach-ux500: delete SSP PrimeCell ID
        ARM: 6827/1: mach-netx: delete hardcoded periphid
        ARM: 6940/1: fiq: Briefly document driver responsibilities for suspend/resume
        ARM: 6938/1: fiq: Refactor {get,set}_fiq_regs() for Thumb-2
        ARM: 6914/1: sparsemem: fix highmem detection when using SPARSEMEM
        ARM: 6913/1: sparsemem: allow pfn_valid to be overridden when using SPARSEMEM
        at91: drop at572d940hf support
        at91rm9200: introduce at91rm9200_set_type to specficy cpu package
        at91: drop boot_params and PLAT_PHYS_OFFSET
        ...
      2a56d222
    • L
      ALSA: fix hda AZX_DCAPS_NO_TCSEL quirk check in driver_caps · 46f2cc80
      Linus Torvalds 提交于
      Commit 9477c58e ("ALSA: hda - Reorganize controller quriks with bit
      flags") changed the driver type compares into various quirk bits.
      However, the check for AZX_DCAPS_NO_TCSEL got reverted: instead of
      clearing TCSEL for chipsets that have that standard capability, it
      cleared then when the NO_TCSEL bit was set.
      
      This can lead to noise and repeated sounds - a weird "echo" behavior.
      As the comment just above says: "Ensuring these bits are 0 clears
      playback static on some HD Audio codecs".  Which is definitely true at
      least on my Core i5 Westmere system.
      
      Cc: Takashi Iwai <tiwai@suse.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      46f2cc80
    • R
      239df0fd
    • L
      ARM: 6945/1: Add unwinding support for division functions · 81479c24
      Laura Abbott 提交于
      The software division functions never had unwinding annotations
      added. Currently, when a division by zero occurs the backtrace shown
      will stop at Ldiv0 or some completely unrelated function. Add
      unwinding annotations in hopes of getting a more useful backtrace
      when a division by zero occurs.
      Signed-off-by: NLaura Abbott <lauraa@codeaurora.org>
      Acked-by: NDave Martin <dave.martin@linaro.org>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      81479c24
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · f23a5e14
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
        PM: Fix PM QOS's user mode interface to work with ASCII input
        PM / Hibernate: Update kerneldoc comments in hibernate.c
        PM / Hibernate: Remove arch_prepare_suspend()
        PM / Hibernate: Update some comments in core hibernate code
      f23a5e14
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · d24c2af4
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] Follow on to cifsacl endian patch (__constant_cpu_to_le32 was required)
      d24c2af4
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · a0c30610
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (58 commits)
        Btrfs: use the device_list_mutex during write_dev_supers
        Btrfs: setup free ino caching in a more asynchronous way
        btrfs scrub: don't coalesce pages that are logically discontiguous
        Btrfs: return -ENOMEM in clear_extent_bit
        Btrfs: add mount -o auto_defrag
        Btrfs: using rcu lock in the reader side of devices list
        Btrfs: drop unnecessary device lock
        Btrfs: fix the race between remove dev and alloc chunk
        Btrfs: fix the race between reading and updating devices
        Btrfs: fix bh leak on __btrfs_open_devices path
        Btrfs: fix unsafe usage of merge_state
        Btrfs: allocate extent state and check the result properly
        fs/btrfs: Add missing btrfs_free_path
        Btrfs: check return value of btrfs_inc_extent_ref()
        Btrfs: return error to caller if read_one_inode() fails
        Btrfs: BUG_ON is deleted from the caller of btrfs_truncate_item & btrfs_extend_item
        Btrfs: return error code to caller when btrfs_del_item fails
        Btrfs: return error code to caller when btrfs_previous_item fails
        btrfs: fix typo 'testeing' -> 'testing'
        btrfs: typo: 'btrfS' -> 'btrfs'
        ...
      a0c30610
    • S
      [CIFS] Follow on to cifsacl endian patch (__constant_cpu_to_le32 was required) · 4f61258f
      Steve French 提交于
      As Jeff just pointed out, __constant_cpu_to_le32 was required instead of
      cpu_to_le32 in previous patch to cifsacl.c 383c5535
      (Fix endian error comparing authusers when cifsacl enabled)
      
      CC: Stable <stable@kernel.org>
      Reviewed-by: NJeff Layton <jlayton@redhat.com>
      CC: Shirish Pargaonkar <shirishp@us.ibm.com>
      Signed-off-by: NSteve French <sfrench@us.ibm.com>
      4f61258f
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 10799db6
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        net: Kill ratelimit.h dependency in linux/net.h
        net: Add linux/sysctl.h includes where needed.
        net: Kill ether_table[] declaration.
        inetpeer: fix race in unused_list manipulations
        atm: expose ATM device index in sysfs
        IPVS: bug in ip_vs_ftp, same list heaad used in all netns.
        bug.h: Move ratelimit warn interfaces to ratelimit.h
        bonding: cleanup module option descriptions
        net:8021q:vlan.c Fix pr_info to just give the vlan fullname and version.
        net: davinci_emac: fix dev_err use at probe
        can: convert to %pK for kptr_restrict support
        net: fix ETHTOOL_SFEATURES compatibility with old ethtool_ops.set_flags
        netfilter: Fix several warnings in compat_mtw_from_user().
        netfilter: ipset: fix ip_set_flush return code
        netfilter: ipset: remove unused variable from type_pf_tdel()
        netfilter: ipset: Use proper timeout value to jiffies conversion
      10799db6
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6 · aaab1842
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
        MAINTAINERS: Update eCryptfs mailing list
        eCryptfs: Allow 2 scatterlist entries for encrypted filenames
        eCryptfs: Clear i_nlink in rmdir
      aaab1842
    • D
      net: Kill ratelimit.h dependency in linux/net.h · c5c177b4
      David S. Miller 提交于
      Ingo Molnar noticed that we have this unnecessary ratelimit.h
      dependency in linux/net.h, which hid compilation problems from
      people doing builds only with CONFIG_NET enabled.
      
      Move this stuff out to a seperate net/net_ratelimit.h file and
      include that in the only two places where this thing is needed.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      Acked-by: NIngo Molnar <mingo@elte.hu>
      c5c177b4
    • D
      net: Add linux/sysctl.h includes where needed. · bee95250
      David S. Miller 提交于
      Several networking headers were depending upon the implicit
      linux/sysctl.h include they get when including linux/net.h
      
      Add explicit includes.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bee95250
    • D
      net: Kill ether_table[] declaration. · 9d931dd2
      David S. Miller 提交于
      This got missed back in 2006 when Jes Sorensen deleted
      net/ethernet/sysctl_net_ether.c
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9d931dd2
    • E
      inetpeer: fix race in unused_list manipulations · 686a7e32
      Eric Dumazet 提交于
      Several crashes in cleanup_once() were reported in recent kernels.
      
      Commit d6cc1d64 (inetpeer: various changes) added a race in
      unlink_from_unused().
      
      One way to avoid taking unused_peers.lock before doing the list_empty()
      test is to catch 0->1 refcnt transitions, using full barrier atomic
      operations variants (atomic_cmpxchg() and atomic_inc_return()) instead
      of previous atomic_inc() and atomic_add_unless() variants.
      
      We then call unlink_from_unused() only for the owner of the 0->1
      transition.
      
      Add a new atomic_add_unless_return() static helper
      
      With help from Arun Sharma.
      
      Refs: https://bugzilla.kernel.org/show_bug.cgi?id=32772Reported-by: NArun Sharma <asharma@fb.com>
      Reported-by: NMaximilian Engelhardt <maxi@daemonizer.de>
      Reported-by: NYann Dupont <Yann.Dupont@univ-nantes.fr>
      Reported-by: NDenys Fedoryshchenko <denys@visp.net.lb>
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      686a7e32
    • L
      Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs · e52e713e
      Linus Torvalds 提交于
      * 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs:
        Create Documentation/security/, move LSM-, credentials-, and keys-related files from Documentation/   to Documentation/security/, add Documentation/security/00-INDEX, and update all occurrences of Documentation/<moved_file>   to Documentation/security/<moved_file>.
      e52e713e
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · bdf7cf1c
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        loop: export module parameters
        block: export blk_{get,put}_queue()
        block: remove unused variable in bio_attempt_front_merge()
        block: always allocate genhd->ev if check_events is implemented
        brd: export module parameters
        brd: fix comment on initial device creation
        brd: handle on-demand devices correctly
        brd: limit 'max_part' module param to DISK_MAX_PARTS
        brd: get rid of unused members from struct brd_device
        block: fix oops on !disk->queue and sysfs discard alignment display
      bdf7cf1c
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 40efeb4d
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] Fix endian error comparing authusers when cifsacl enabled
        [CIFS] Rename three structures to avoid camel case
        Fix extended security auth failure
        CIFS: Add rwpidforward mount option
        CIFS: Migrate to shared superblock model
        [CIFS] Migrate from prefixpath logic
        CIFS: Fix memory leak in cifs_do_mount
        [CIFS] When mandatory encryption on share, fail mount
        CIFS: Use pid saved from cifsFileInfo in writepages and set_file_size
        cifs: add cifs_async_writev
        cifs: clean up wsize negotiation and allow for larger wsize
        cifs: convert cifs_writepages to use async writes
        CIFS: Fix undefined behavior when mount fails
        cifs: don't call mid_q_entry->callback under the Global_MidLock (try #5)
        CIFS: Simplify mount code for further shared sb capability
        CIFS: Simplify connection structure search calls
        cifs: remove unused SMB2 config and mount options
        cifs: add ignore_pend flag to cifs_call_async
        cifs: make cifs_send_async take a kvec array
        cifs: consolidate SendReceive response checks
      40efeb4d
    • L
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · 81faae7f
      Linus Torvalds 提交于
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
        Ocfs2/move_extents: Validate moving goal after the adjustment.
        Ocfs2/move_extents: Avoid doing division in extent moving.
      81faae7f
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 95948c31
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
        [S390] mm: add ZONE_DMA to 31-bit config again
        [S390] mm: add page fault retry handling
        [S390] mm: handle kernel caused page fault oom situations
        [S390] delay: implement ndelay
        [S390] topology,sched: fix cpu_coregroup_mask/cpu_book_mask definitions
        [S390] hwsampler: allow cpu hotplug
        [S390] uaccess: turn __access_ok() into a define
        [S390] irq: merge irq.c and s390_ext.c
        [S390] irq: fix service signal external interrupt handling
        [S390] pfault: always enable service signal interrupt
      95948c31
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 45acab01
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/fsl_rio: Error interrupt handler for sRIO on MPC85xx
        powerpc/fsl_rio: move machine_check handler
        powerpc/fsl_lbc: Add workaround for ELBC-A001 erratum
      45acab01
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · c0880dcd
      Linus Torvalds 提交于
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
        [media] v1.88 DM04/QQBOX Move remote to use rc_core dvb-usb-remote
        [media] Add missing include guard to header file
        [media] Inlined functions should be static
        [media] Remove invalid parameter description
        [media] cpia2: fix warning about invalid trigraph sequence
        [media] s5p-csis: Add missing dependency on PLAT_S5P
        [media] gspca/kinect: wrap gspca_debug with GSPCA_DEBUG
        [media] fintek-cir: new driver for Fintek LPC SuperIO CIR function
        [media] uvcvideo: Connect video devices to media entities
        [media] uvcvideo: Register subdevices for each entity
        [media] uvcvideo: Register a v4l2_device
        [media] add V4L2-PIX-FMT-SRGGB12 & friends to docbook
        [media] Documentation/DocBook: Rename media fops xml files
        [media] Media DocBook: fix validation errors
        [media] wl12xx: g_volatile_ctrl fix: wrong field set
        [media] fix kconfig dependency warning for VIDEO_TIMBERDALE
        [media] dm1105: GPIO handling added, I2C on GPIO added, LNB control through GPIO reworked
        [media] Add support for M-5MOLS 8 Mega Pixel camera ISP
      c0880dcd
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 · f7fc06e3
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (42 commits)
        regulator: Fix _regulator_get_voltage if get_voltage callback is NULL
        USB: TWL6025 allow different regulator name
        REGULATOR: TWL6025: add support to twl-regulator
        regulator: twl6030: do not write to _GRP for regulator disable
        regulator: twl6030: do not write to _GRP for regulator enable
        TPS65911: Comparator: Add comparator driver
        TPS65911: Add support for added GPIO lines
        GPIO: TPS65910: Move driver to drivers/gpio/
        TPS65911: Add new irq definitions
        regulator: tps65911: Add new chip version
        MFD: TPS65910: Add support for TPS65911 device
        regulator: Fix off-by-one value range checking for mc13xxx_regulator_get_voltage
        regulator: mc13892: Fix voltage unit in test case.
        regulator: Remove MAX8997_REG_BUCK1DVS/MAX8997_REG_BUCK2DVS/MAX8997_REG_BUCK5DVS macros
        mfd: Fix off-by-one value range checking for tps65910_i2c_write
        regulator: Only apply voltage constraints from consumers that set them
        regulator: If we can't configure optimum mode we're always in the best one
        regulator: max8997: remove useless code
        regulator: Fix memory leak in max8998_pmic_probe failure path
        regulator: Fix desc_id for tps65023/6507x/65910
        ...
      f7fc06e3
    • L
      Merge git://git.infradead.org/battery-2.6 · ea0ca3a8
      Linus Torvalds 提交于
      * git://git.infradead.org/battery-2.6:
        PXA: Use dev_pm_ops in z2_battery
        ds2760_battery: Fix rated capacity of the hx4700 1800mAh battery
        ds2760_battery: Fix indexing of the 4 active full EEPROM registers
        power: Make test_power driver more dynamic.
        bq27x00_battery: Name of cycle count property
        max8903_charger: Add GENERIC_HARDIRQS as a dependency (fixes S390 build)
        ARM: RX-51: Enable isp1704 power on/off
        isp1704_charger: Allow board specific powering routine
        gpio-charger: Add gpio_charger_resume
        power_supply: Add driver for MAX8903 charger
      ea0ca3a8
    • L
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging · 74e6392c
      Linus Torvalds 提交于
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
        hwmon: (coretemp) Fix section mismatch
        hwmon: (pmbus) Initialize sysfs attributes
        hwmon: (coretemp) Update comments describing the handling of HT CPUs
        hwmon: (coretemp) Initialize sysfs attributes
      74e6392c
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 09cefbb6
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (26 commits)
        ASoC: Fix power down for widgetless per-card DAPM context case
        ASoC: wm1250-ev1: Define "WM1250 Output" with SND_SOC_DAPM_OUTPUT
        ASoC: Remove duplicate linux/delay.h inclusion.
        ASoC: sam9g20_wm8731: use the proper SYSCKL value
        ASoC: wm8731: fix wm8731_check_osc() connected condition
        ALSA: hda - Reorganize controller quriks with bit flags
        ALSA: hda - Use snd_printd() in snd_hda_parse_pin_def_config()
        ALSA: core: remove unused variables.
        ALSA: HDA: Increase MAX_HDMI_PINS
        ALSA: PCM - Don't check DMA time-out too shortly
        MAINTAINERS: add FireWire audio maintainer
        ALSA: usb-audio: more control quirks for M-Audio FastTrack devices
        ALSA: usb-audio: add new quirk type QUIRK_AUDIO_STANDARD_MIXER
        ALSA: usb-audio: export snd_usb_feature_unit_ctl
        ALSA: usb-audio: rework add_control_to_empty()
        ALSA: usb-audio: move assignment of chip->ctrl_intf
        ALSA: hda - Use model=auto for Lenovo G555
        ALSA: HDA: Unify HDMI hotplug handling.
        ALSA: hda - Force AD1988_6STACK_DIG for Asus M3N-HT Deluxe
        ASoC: core - remove superfluous new line.
        ...
      09cefbb6
    • D
      atm: expose ATM device index in sysfs · e7a46b4d
      Dan Williams 提交于
      It's currently exposed only through /proc which, besides requiring
      screen-scraping, doesn't allow userspace to distinguish between two
      identical ATM adapters with different ATM indexes.  The ATM device index
      is required when using PPPoATM on a system with multiple ATM adapters.
      Signed-off-by: NDan Williams <dcbw@redhat.com>
      Reviewed-by: NEric Dumazet <eric.dumazet@gmail.com>
      Tested-by: NDavid Woodhouse <dwmw2@infradead.org>
      Cc: stable@kernel.org
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e7a46b4d
    • D
    • T
      MAINTAINERS: Update eCryptfs mailing list · a058bfbb
      Tyler Hicks 提交于
      The eCryptfs mailing list has moved from lists.launchpad.net to
      vger.kernel.org.
      Signed-off-by: NTyler Hicks <tyhicks@linux.vnet.ibm.com>
      a058bfbb
    • T
      eCryptfs: Allow 2 scatterlist entries for encrypted filenames · 8d08dab7
      Tyler Hicks 提交于
      The buffers allocated while encrypting and decrypting long filenames can
      sometimes straddle two pages. In this situation, virt_to_scatterlist()
      will return -ENOMEM, causing the operation to fail and the user will get
      scary error messages in their logs:
      
      kernel: ecryptfs_write_tag_70_packet: Internal error whilst attempting
      to convert filename memory to scatterlist; expected rc = 1; got rc =
      [-12]. block_aligned_filename_size = [272]
      kernel: ecryptfs_encrypt_filename: Error attempting to generate tag 70
      packet; rc = [-12]
      kernel: ecryptfs_encrypt_and_encode_filename: Error attempting to
      encrypt filename; rc = [-12]
      kernel: ecryptfs_lookup: Error attempting to encrypt and encode
      filename; rc = [-12]
      
      The solution is to allow up to 2 scatterlist entries to be used.
      Signed-off-by: NTyler Hicks <tyhicks@linux.vnet.ibm.com>
      Cc: <stable@kernel.org>
      8d08dab7
    • T
      eCryptfs: Clear i_nlink in rmdir · 07850552
      Tyler Hicks 提交于
      eCryptfs wasn't clearing the eCryptfs inode's i_nlink after a successful
      vfs_rmdir() on the lower directory. This resulted in the inode evict and
      destroy paths to be missed.
      
      https://bugs.launchpad.net/ecryptfs/+bug/723518Signed-off-by: NTyler Hicks <tyhicks@linux.vnet.ibm.com>
      Cc: <stable@kernel.org>
      07850552
  3. 27 5月, 2011 6 次提交