1. 07 5月, 2012 2 次提交
  2. 06 5月, 2012 6 次提交
    • C
      Btrfs: avoid sleeping in verify_parent_transid while atomic · b9fab919
      Chris Mason 提交于
      verify_parent_transid needs to lock the extent range to make
      sure no IO is underway, and so it can safely clear the
      uptodate bits if our checks fail.
      
      But, a few callers are using it with spinlocks held.  Most
      of the time, the generation numbers are going to match, and
      we don't want to switch to a blocking lock just for the error
      case.  This adds an atomic flag to verify_parent_transid,
      and changes it to return EAGAIN if it needs to block to
      properly verifiy things.
      Signed-off-by: NChris Mason <chris.mason@oracle.com>
      b9fab919
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha · 03cb00b3
      Linus Torvalds 提交于
      Pull alpha fixes from Matt Turner:
       "My alpha tree is back up (after taking quite some time to get my GPG
        key signed).  It contains just some simple fixes."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
        alpha: silence 'const' warning in sys_marvel.c
        alpha: include module.h to fix modpost on Tsunami
        alpha: properly define get/set_rtc_time on Marvel/SMP
        alpha: VGA_HOSE depends on VGA_CONSOLE
      03cb00b3
    • J
      TTY: pdc_cons, fix regression in close · 49a5f3cf
      Jiri Slaby 提交于
      The test in pdc_console_tty_close '!tty->count' was always wrong
      because tty->count is decremented after tty->ops->close is called and
      thus can never be zero. Hence the 'then' branch was never executed and
      the timer never deleted.
      
      This did not matter until commit 5dd5bc40 ("TTY: pdc_cons, use
      tty_port").  There we needed to set TTY in tty_port to NULL, but this
      never happened due to the bug above.
      
      So change the test to really trigger at the last close by changing the
      condition to 'tty->count == 1'.
      
      Well, the driver should not touch tty->count at all.  It should use
      tty_port->count and count open count there itself.
      Signed-off-by: NJiri Slaby <jslaby@suse.cz>
      Reported-and-tested-by: NMikulas Patocka <mpatocka@redhat.com>
      Cc: Kyle McMartin <kyle@mcmartin.ca>
      Cc: Helge Deller <deller@gmx.de>
      Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      49a5f3cf
    • L
      Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 1c2f9548
      Linus Torvalds 提交于
      Pull sound sound fixes from Takashi Iwai:
       "As good as nothing exciting here; just a few trivial fixes for various
        ASoC stuff."
      
      * tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ASoC: omap-pcm: Free dma buffers in case of error.
        ASoC: s3c2412-i2s: Fix dai registration
        ASoC: wm8350: Don't use locally allocated codec struct
        ASoC: tlv312aic23: unbreak resume
        ASoC: bf5xx-ssm2602: Set DAI format
        ASoC: core: check of_property_count_strings failure
        ASoC: dt: sgtl5000.txt: Add description for 'reg' field
        ASoC: wm_hubs: Make sure we don't disable differential line outputs
      1c2f9548
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux · 59068e36
      Linus Torvalds 提交于
      Pull an ACPI patch from Len Brown:
       "It fixes a D3 issue new in 3.4-rc1."
      
      By Lin Ming via Len Brown:
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
        ACPI: Fix D3hot v D3cold confusion
      59068e36
    • S
      init: don't try mounting device as nfs root unless type fully matches · 377485f6
      Sasha Levin 提交于
      Currently, we'll try mounting any device who's major device number is
      UNNAMED_MAJOR as NFS root.  This would happen for non-NFS devices as
      well (such as 9p devices) but it wouldn't cause any issues since
      mounting the device as NFS would fail quickly and the code proceeded to
      doing the proper mount:
      
             [  101.522716] VFS: Unable to mount root fs via NFS, trying floppy.
             [  101.534499] VFS: Mounted root (9p filesystem) on device 0:18.
      
      Commit 6829a048102a ("NFS: Retry mounting NFSROOT") introduced retries
      when mounting NFS root, which means that now we don't immediately fail
      and instead it takes an additional 90+ seconds until we stop retrying,
      which has revealed the issue this patch fixes.
      
      This meant that it would take an additional 90 seconds to boot when
      we're not using a device type which gets detected in order before NFS.
      
      This patch modifies the NFS type check to require device type to be
      'Root_NFS' instead of requiring the device to have an UNNAMED_MAJOR
      major.  This makes boot process cleaner since we now won't go through
      the NFS mounting code at all when the device isn't an NFS root
      ("/dev/nfs").
      Signed-off-by: NSasha Levin <levinsasha928@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      377485f6
  3. 05 5月, 2012 14 次提交
  4. 04 5月, 2012 18 次提交
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · f0f376f2
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Some minor fixes from Intel and a radeon fix.
      
        I have the nouveau fix for the i2c regression queued for next week,
        its mostly a revert and seems to work on the system it was originally
        introduced for thanks to some i2c core changes."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: clarify and extend wb setup on APUs and NI+ asics
        drm/i915: enable dip before writing data on gen4
        fixing dmi match for hp t5745 and hp st5747 thin client
        drm/i915: Only enable IPS polling for gen5
        drm/i915: Do not read non-existent DPLL registers on PCH hardware
      f0f376f2
    • L
      Merge tag 'md-3.4-fixes' of git://neil.brown.name/md · 08542241
      Linus Torvalds 提交于
      Pull one small fix for md/bitmaps from NeilBrown:
       "This fixes a regression that was introduced in the merge window."
      
      * tag 'md-3.4-fixes' of git://neil.brown.name/md:
        md/bitmap: fix calculation of 'chunks' - missing shift.
      08542241
    • L
      Merge branch 'fix-unmapped-word-at-a-time' · f4622045
      Linus Torvalds 提交于
      Jana Saout confirmed that this fixes the page faults he saw.
      
      His problem was triggered by ocfs2 and autofs symlink lookups, where the
      symlink allocation was at the end of a page.  But the deeper reason
      seems to be the use of Xen-PV, which is what then causes him to have all
      these unmapped pages, which is what then makes it a problem when the
      unaligned word-at-a-time code fetches data past the end of a page.
      
      * fix-unmapped-word-at-a-time:
        vfs: make word-at-a-time accesses handle a non-existing page
      f4622045
    • O
    • A
      drm/radeon: clarify and extend wb setup on APUs and NI+ asics · c994ead6
      Alex Deucher 提交于
      Use family rather than DCE check for clarity, also always use
      wb on APUs, there will never be AGP variants.
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      Reviewed-by: NMichel Dänzer <michel.daenzer@amd.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      c994ead6
    • N
      md/bitmap: fix calculation of 'chunks' - missing shift. · b16b1b6c
      NeilBrown 提交于
      commit 61a0d80c "md/bitmap: discard CHUNK_BLOCK_SHIFT macro"
      replaced CHUNK_BLOCK_RATIO() by the same text that was
      replacing CHUNK_BLOCK_SHIFT() - which is clearly wrong.
      
      The result is that 'chunks' is often too small by 1,
      which can sometimes result in a crash (not sure how).
      
      So use the correct replacement, and get rid of CHUNK_BLOCK_RATIO
      which is no longe used.
      Reported-by: NKarl Newman <siliconfiend@gmail.com>
      Tested-by: NKarl Newman <siliconfiend@gmail.com>
      Signed-off-by: NNeilBrown <neilb@suse.de>
      b16b1b6c
    • S
      fs/cifs: fix parsing of dfs referrals · d8f2799b
      Stefan Metzmacher 提交于
      The problem was that the first referral was parsed more than once
      and so the caller tried the same referrals multiple times.
      
      The problem was introduced partly by commit
      066ce689,
      where 'ref += le16_to_cpu(ref->Size);' got lost,
      but that was also wrong...
      
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NStefan Metzmacher <metze@samba.org>
      Tested-by: NBjörn Jacke <bj@sernet.de>
      Reviewed-by: NJeff Layton <jlayton@redhat.com>
      Signed-off-by: NSteve French <sfrench@us.ibm.com>
      d8f2799b
    • L
      Merge tag 'mfd-for-linus-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · 0a6ba092
      Linus Torvalds 提交于
      Pull second set of MFD fixes from Samuel Ortiz:
       "This time we only have a one liner fixing an omap-usb build error."
      
      * tag 'mfd-for-linus-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
        mfd: Fix build breakage in omap-usb-host.c
      0a6ba092
    • L
      Merge branch 'efi-vars' from Matthew Garrett · 65e62b50
      Linus Torvalds 提交于
      * efi-vars:
        efivars: Improve variable validation
      65e62b50
    • M
      efivars: Improve variable validation · 54b3a4d3
      Matthew Garrett 提交于
      Ben Hutchings pointed out that the validation in efivars was inadequate -
      most obviously, an entry with size 0 would server as a DoS against the
      kernel. Improve this based on his suggestions.
      Signed-off-by: NMatthew Garrett <mjg@redhat.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      54b3a4d3
    • L
      Merge tag 'tag/upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 6b4c555a
      Linus Torvalds 提交于
      Pull libata fixes from Jeff Garzik:
      
      1) Fix regression that could cause a misdiagnosis, which in turn could
         lead to an erroneous 3.0 Gbps -> 1.5 downshift, particularly when hotplug
         and suspend/resume is involved.
      
      2) Fix a regression that led to ata%d controller ids being numbered one
         larger than in <= 3.4-rc3 (oh, the horror!).  Controller ids should now be
         as expected.
      
      3) add some DT, PCI id's
      
      4) ata/pata_arasan_cf: minor cpp fixing/cleaning
      
      * tag 'tag/upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        ata: ahci_platform: Add synopsys ahci controller in DT's compatible list
        ata/pata_arasan_cf: Move arasan_cf_pm_ops out of #ifdef, #endif macros
        libata: init ata_print_id to 0
        ahci: Detect Marvell 88SE9172 SATA controller
        libata: skip old error history when counting probe trials
      6b4c555a
    • L
      Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux · 4e78f002
      Linus Torvalds 提交于
      Pull i2c embedded fixes from Wolfram Sang:
       "Here are some typical i2c driver bugfixes for 3.4.  Missed clock
        handling, improper timeout fixes, hardware wrokarounds...  All
        patches have been in linux-next for a few days, too."
      
      * 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
        i2c: mxs: disable QUEUE when sending is done
        i2c: mxs: handle spurious interrupt
        i2c-eg20t: Modify MODULE_AUTHOR's email address
        i2c-eg20t: change timeout value 50msec to 1000msec
        i2c: tegra: Add delay before resetting the controller after NACK
        i2c: pnx: Disable clk in suspend
      4e78f002
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · f5645b59
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Just some regression fixes from Ben along with a variable that gcc
        failed to spot is uninitialised."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        nouveau: initialise has_optimus variable.
        drm/nv10/gpio: fix thinko in mask for gpio lines 2-9
        nvc0/fb: shut up PMFB interrupt after the first occurrence
        drm/nouveau/hdmi: use correct hdmi regs for nvaa/nvac
        drm/nouveau/bios: fix regression on some nv4x board
      f5645b59
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · c42f1d4b
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Transfer padding was wrong for full-speed USB in ASIX driver, fix
          from Ingo van Lil.
      
       2) Propagate the negative packet offset fix into the PowerPC BPF JIT.
          From Jan Seiffert.
      
       3) dl2k driver's private ioctls were letting unprivileged tasks make
          MII writes and other ugly bits like that.  Fix from Jeff Mahoney.
      
       4) Fix TX VLAN and RX packet drops in ucc_geth, from Joakim Tjernlund.
      
       5) OOPS and network namespace fixes in IPVS from Hans Schillstrom and
          Julian Anastasov.
      
       6) Fix races and sleeping in locked context bugs in drop_monitor, from
          Neil Horman.
      
       7) Fix link status indication in smsc95xx driver, from Paolo Pisati.
      
       8) Fix bridge netfilter OOPS, from Peter Huang.
      
       9) L2TP sendmsg can return on error conditions with the socket lock
          held, oops.  Fix from Sasha Levin.
      
      10) udp_diag should return meaningful values for socket memory usage,
          from Shan Wei.
      
      11) Eric Dumazet is so awesome he gets his own section:
      
             Socket memory cgroup code (I never should have applied those
             patches, grumble...) made erroneous changes to
             sk_sockets_allocated_read_positive().  It was changed to
             use percpu_counter_sum_positive (which requires BH disabling)
             instead of percpu_counter_read_positive (which does not).
             Revert back to avoid crashes and lockdep warnings.
      
             Adjust the default tcp_adv_win_scale and tcp_rmem[2] values
             to fix throughput regressions.  This is necessary as a result
             of our more precise skb->truesize tracking.
      
             Fix SKB leak in netem packet scheduler.
      
      12) New device IDs for various bluetooth devices, from Manoj Iyer,
          AceLan Kao, and Steven Harms.
      
      13) Fix command completion race in ipw2200, from Stanislav Yakovlev.
      
      14) Fix rtlwifi oops on unload, from Larry Finger.
      
      15) Fix hard_mtu when adjusting hard_header_len in smsc95xx driver.
          From Stephane Fillod.
      
      16) ehea driver registers it's IRQ before all the necessary state is
          setup, resulting in crashes.  Fix from Thadeu Lima de Souza
          Cascardo.
      
      17) Fix PHY connection failures in davinci_emac driver, from Anatolij
          Gustschin.
      
      18) Missing break; in switch statement in bluetooth's
          hci_cmd_complete_evt().  Fix from Szymon Janc.
      
      19) Fix queue programming in iwlwifi, from Johannes Berg.
      
      20) Interrupt throttling defaults not being actually programmed into the
          hardware, fix from Jeff Kirsher and Ying Cai.
      
      21) TLAN driver SKB encoding in descriptor busted on 64-bit, fix from
          Benjamin Poirier.
      
      22) Fix blind status block RX producer pointer deref in TG3 driver, from
          Matt Carlson.
      
      23) Promisc and multicast are busted on ehea, fixes from Thadeu Lima de
          Souza Cascardo.
      
      24) Fix crashes in 6lowpan, from Alexander Smirnov.
      
      25) tcp_complete_cwr() needs to be careful to not rewind the CWND to
          ssthresh if ssthresh has the "infinite" value.  Fix from Yuchung
          Cheng.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (81 commits)
        sungem: Fix WakeOnLan
        tcp: change tcp_adv_win_scale and tcp_rmem[2]
        net: l2tp: unlock socket lock before returning from l2tp_ip_sendmsg
        drop_monitor: prevent init path from scheduling on the wrong cpu
        usbnet: fix failure handling in usbnet_probe
        usbnet: fix leak of transfer buffer of dev->interrupt
        ucc_geth: Add 16 bytes to max TX frame for VLANs
        net: ucc_geth, increase no. of HW RX descriptors
        netem: fix possible skb leak
        sky2: fix receive length error in mixed non-VLAN/VLAN traffic
        sky2: propogate rx hash when packet is copied
        net: fix two typos in skbuff.h
        cxgb3: Don't call cxgb_vlan_mode until q locks are initialized
        ixgbe: fix calling skb_put on nonlinear skb assertion bug
        ixgbe: Fix a memory leak in IEEE DCB
        igbvf: fix the bug when initializing the igbvf
        smsc75xx: enable mac to detect speed/duplex from phy
        smsc75xx: declare smsc75xx's MII as GMII capable
        smsc75xx: fix phy interrupt acknowledge
        smsc75xx: fix phy init reset loop
        ...
      c42f1d4b
    • L
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 913a9041
      Linus Torvalds 提交于
      Pull hwmon fixes from Guenter Roeck:
       "Fix OOPS seen in coretemp driver if the CPU core ID is too large"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (coretemp) Increase CPU core limit
        hwmon: (coretemp) fix oops on cpu unplug
      913a9041
    • L
      vfs: make word-at-a-time accesses handle a non-existing page · e419b4cc
      Linus Torvalds 提交于
      It turns out that there are more cases than CONFIG_DEBUG_PAGEALLOC that
      can have holes in the kernel address space: it seems to happen easily
      with Xen, and it looks like the AMD gart64 code will also punch holes
      dynamically.
      
      Actually hitting that case is still very unlikely, so just do the
      access, and take an exception and fix it up for the very unlikely case
      of it being a page-crosser with no next page.
      
      And hey, this abstraction might even help other architectures that have
      other issues with unaligned word accesses than the possible missing next
      page.  IOW, this could do the byte order magic too.
      
      Peter Anvin fixed a thinko in the shifting for the exception case.
      Reported-and-tested-by: NJana Saout <jana@saout.de>
      Cc:  Peter Anvin <hpa@zytor.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e419b4cc
    • J
      cifs: make sure we ignore the credentials= and cred= options · a557b976
      Jeff Layton 提交于
      Older mount.cifs programs passed this on to the kernel after parsing
      the file. Make sure the kernel ignores that option.
      
      Should fix:
      
          https://bugzilla.kernel.org/show_bug.cgi?id=43195
      
      Cc: Sachin Prabhu <sprabhu@redhat.com>
      Reported-by: NRonald <ronald645@gmail.com>
      Signed-off-by: NJeff Layton <jlayton@redhat.com>
      Signed-off-by: NSteve French <sfrench@us.ibm.com>
      a557b976
    • S
      [CIFS] Update cifs version to 1.78 · f966424e
      Steve French 提交于
      Signed-off-by: NSteve French <sfrench@us.ibm.com>
      f966424e