Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
tag: v2.6.35-rc3-gi…
Commits on Jun 27, 2010
  1. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/tj/percpu
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
      percpu: fix first chunk match in per_cpu_ptr_to_phys()
      percpu: fix trivial bugs in pcpu_build_alloc_info()
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (52 commits)
      phylib: Add autoload support for the LXT973 phy.
      ISDN: hysdn, fix potential NULL dereference
      vxge: fix memory leak in vxge_alloc_msix() error path
      isdn/gigaset: correct CAPI connection state storage
      isdn/gigaset: encode HLC and BC together
      isdn/gigaset: correct CAPI DATA_B3 Delivery Confirmation
      isdn/gigaset: correct CAPI voice connection encoding
      isdn/gigaset: honor CAPI application's buffer size request
      cpmac: do not leak struct net_device on phy_connect errors
      smc91c92_cs: fix the problem that lan & modem does not work simultaneously
      ipv6: fix NULL reference in proxy neighbor discovery
      Bluetooth: Bring back var 'i' increment
      xfrm: check bundle policy existance before dereferencing it
      sky2: enable rx/tx in sky2_phy_reinit()
      cnic: Disable statistics initialization for eth clients that do not support statistics
      net: add dependency on fw class module to qlcnic and netxen_nic
      snmp: fix SNMP_ADD_STATS()
      hso: remove setting of low_latency flag
      udp: Fix bogus UFO packet generation
      lasi82596: fix netdev_mc_count conversion
      ...
  3. @torvalds

    Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/n…

    torvalds authored
    …fs-2.6
    
    * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
      NFSv4: Fix an embarassing typo in encode_attrs()
      NFSv4: Ensure that /proc/self/mountinfo displays the minor version number
      NFSv4.1: Ensure that we initialise the session when following a referral
      SUNRPC: Fix a re-entrancy bug in xs_tcp_read_calldir()
      nfs4 use mandatory attribute file type in nfs4_get_root
  4. @torvalds

    Merge branch 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    torvalds authored
    …nel/git/lethal/sh-2.6
    
    * 'sh/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      clocksource: sh_cmt: Fix up bogus shift value.
      arch/sh/mm: Eliminate a double lock
      sh: Fix up IORESOURCE_PCI_FIXED usage in pcibios_fixup_device_resources().
      sh: remove duplicated #include
  5. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      MAINTAINERS - Add an entry for the input MT protocol
      Input: wacom - fix serial number handling on Cintiq 21UX2
      Input: fixup X86_MRST selects
      Input: sysrq - fix "stuck" SysRq mode
      Input: ad7877 - fix spi word size to 16 bit
      Input: pcf8574_keypad - fix off by one in pcf8574_kp_irq_handler()
  6. @torvalds

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/jack/linux-fs-2.6
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
      ext3: update ctime when changing the file's permission by setfacl
      ext2: update ctime when changing the file's permission by setfacl
  7. @torvalds

    Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds authored
    …t/rusty/linux-2.6
    
    * 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6:
      virtio-pci: disable msi at startup
      virtio: return ENOMEM on out of memory
  8. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI/PM: Do not use native PCIe PME by default
  9. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: usb/endpoint, fix dangling pointer use
      ALSA: asihpi - Get rid of incorrect "long" types and casts.
      ASoC: DaVinci: Fix McASP hardware FIFO configuration
      ALSA: hda - Fix line-in for mb5 model MacBook (Pro) 5,1 / 5,2
      ALSA: usb-audio: fix UAC2 control value queries
      ALSA: usb-audio: parse UAC2 sample rate ranges correctly
      ALSA: usb-audio: fix control messages for USB_RECIP_INTERFACE
      ALSA: usb-audio: add check for faulty clock in parse_audio_format_rates_v2()
      ALSA: hda - Don't check capture source mixer if no ADC is available
  10. @torvalds

    Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    torvalds authored
    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: (k8temp) Bypass core swapping on single-core processors
      hwmon: (i5k_amb) Fix sysfs attribute for lockdep
      hwmon: (k10temp) Do not blacklist known working CPU models
  11. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    torvalds authored
    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      watchdog: at32ap700x_wdt: register misc device last in probe() function
      watchdog: [PATCH 3/3] imx2_wdt: fix section mismatch
  12. @torvalds

    Merge git://git.infradead.org/iommu-2.6

    torvalds authored
    * git://git.infradead.org/iommu-2.6:
      intel-iommu: Force-disable IOMMU for iGFX on broken Cantiga revisions.
      intel-iommu: Fix double lock in get_domain_for_dev()
      intel-iommu: Fix reference by physical address in intel_iommu_attach_device()
  13. @torvalds

    Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

    torvalds authored
    * 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
      OMAP: OMAPFB: fix rfbi.c compile error
      OMAPFB: LCDC: change update_mode to DISABLED when going suspend
  14. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      MAINTAINERS: change mailing list address for CIFS
      cifs: remove bogus first_time check in NTLMv2 session setup code
      cifs: don't call cifs_new_fileinfo unless cifs_open succeeds
      cifs: don't ignore cifs_posix_open_inode_helper return value
      cifs: clean up arguments to cifs_open_inode_helper
      cifs: pass instantiated filp back after open call
      cifs: move cifs_new_fileinfo call out of cifs_posix_open
      cifs: implement drop_inode superblock op
      cifs: don't attempt busy-file rename unless it's in same directory
  15. @torvalds

    Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6

    torvalds authored
    * 'merge' of git://git.secretlab.ca/git/linux-2.6:
      powerpc/5200: fix lite5200 ethernet phy address
      powerpc/5200: Fix build error in sound code.
      powerpc/5200: fix oops during going to standby
      powerpc/5200: add lite5200 onboard I2C eeprom and flash
      maintainers: Add git trees for SPI and device tree
      of: Drop properties with "/" in their name
  16. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/mattst88/alpha-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
      alpha: Fix de2104x driver failing to readout MAC address correctly
      alpha: Detect Super IO chip, no IDE on Avanti, enable EPP19
      alpha: fix pci_mmap_resource API breakage
      alpha: fix __arch_hweight32 typo
  17. @torvalds

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    torvalds authored
    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc: Fix mpic_resume on early G5 macs
      powerpc: rtas_flash needs to use rtas_data_buf
      powerpc: Unconditionally enabled irq stacks
      powerpc/kexec: Wait for online/possible CPUs only.
      powerpc: Disable CONFIG_SYSFS_DEPRECATED
      powerpc/boot: Remove addRamdisk.c since it is now unused
      powerpc: Move kdump default base address to 64MB on 64bit
      powerpc: Remove dead CONFIG_HIGHPTE
      powerpc/fsl-booke: Move loadcam_entry back to asm code to fix SMP ftrace
      powerpc/fsl-booke: Fix InstructionTLBError execute permission check
  18. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
      TPM: ReadPubEK output struct fix
  19. @torvalds

    Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds authored
    …git/mmarek/kbuild-2.6
    
    * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
      kbuild: fix LOCALVERSION handling to match description
      kbuild: Fix modpost segfault
  20. @torvalds

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds authored
    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      ACPI / PM: Do not enable GPEs for system wakeup in advance
      ACPICA: Truncate I/O addresses to 16 bits for Windows compatibility
      ACPICA: Limit maximum time for Sleep() operator
      ACPICA: Fix namestring associated with AE_NO_HANDLER exception
      ACPI / ACPICA: Fix sysfs GPE interface
      ACPI / ACPICA: Fix GPE initialization
      ACPI / ACPICA: Avoid writing full enable masks to GPE registers
      ACPI / ACPICA: Fix low-level GPE manipulation code
      ACPI / ACPICA: Use helper function for computing GPE masks
      ACPI / ACPICA: Do not attempt to disable GPE when installing handler
      ACPI: Disable Vista compatibility for Sony VGN-NS50B_L
      ACPI: fan: fix unbalanced code block
      ACPI: Store NVS state even when entering suspend to RAM
      suspend: Move NVS save/restore code to generic suspend functionality
      ACPI: Do not try to set up acpi processor stuff on cores exceeding maxcpus=
      ACPI: acpi_pad: Don't needlessly mark LAPIC unstable
  21. @error27 @torvalds

    KEYS: Propagate error code instead of returning -EINVAL

    error27 authored torvalds committed
    This is from a Smatch check I'm writing.
    
    strncpy_from_user() returns -EFAULT on error so the first change just
    silences a warning but doesn't change how the code works.
    
    The other change is a bug fix because install_thread_keyring_to_cred()
    can return a variety of errors such as -EINVAL, -EEXIST, -ENOMEM or
    -EKEYREVOKED.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22. @dwmw2 @davem330

    phylib: Add autoload support for the LXT973 phy.

    dwmw2 authored davem330 committed
    Commit e13647c (phylib: Add support for the LXT973 phy.) added a new ID
    but neglected to also add it to the MODULE_DEVICE_TABLE.
    
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  23. @davem330

    ISDN: hysdn, fix potential NULL dereference

    Jiri Slaby authored davem330 committed
    Stanse found that lp is dereferenced earlier than checked for being
    NULL in hysdn_rx_netpkt. Move the initialization below the test.
    
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Cc: Karsten Keil <isdn@linux-pingi.de>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Stephen Hemminger <shemminger@vyatta.com>
    Cc: Patrick McHardy <kaber@trash.net>
    Cc: netdev@vger.kernel.org
    Signed-off-by: David S. Miller <davem@davemloft.net>
  24. @michich @davem330

    vxge: fix memory leak in vxge_alloc_msix() error path

    michich authored davem330 committed
    When pci_enable_msix() returned ret<0, entries and vxge_entries were leaked.
    While at it, use the centralized exit idiom in the function.
    
    Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
    Acked-by: Ram Vepa <ram.vepa@exar.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Jun 26, 2010
  1. @davem330

    isdn/gigaset: correct CAPI connection state storage

    Tilman Schmidt authored davem330 committed
    CAPI applications can handle several connections in parallel,
    so one connection state per application isn't sufficient.
    Store the connection state in the channel structure instead.
    
    Impact: bugfix
    Signed-off-by: Tilman Schmidt <tilman@imap.cc>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. @davem330

    isdn/gigaset: encode HLC and BC together

    Tilman Schmidt authored davem330 committed
    Adapt to buggy device firmware which accepts setting HLC only in the
    same command line as BC, by encoding HLC and BC in a single command
    if both are specified, and rejecting HLC without BC.
    
    Impact: bugfix
    Signed-off-by: Tilman Schmidt <tilman@imap.cc>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. @davem330

    isdn/gigaset: correct CAPI DATA_B3 Delivery Confirmation

    Tilman Schmidt authored davem330 committed
    The Gigaset CAPI driver handled all DATA_B3_REQ messages as if the
    Delivery Confirmation flag bit was set, delaying the emission of the
    DATA_B3_CONF reply until the data was actually transmitted. Some
    CAPI applications (notably Asterisk) aren't happy with that
    behaviour. Change it to actually evaluate the Delivery Confirmation
    flag as described the CAPI specification.
    
    Impact: bugfix
    Signed-off-by: Tilman Schmidt <tilman@imap.cc>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  4. @davem330

    isdn/gigaset: correct CAPI voice connection encoding

    Tilman Schmidt authored davem330 committed
    Make the Gigaset CAPI driver select L2_VOICE (AT^SBPR=2) as the
    layer 2 encoding for transparent connections, like the ISDN4Linux
    variant.  L2_BITSYNC (AT^SBPR=0) mutes internal connections and
    distorts external ones.
    
    Impact: bugfix
    Signed-off-by: Tilman Schmidt <tilman@imap.cc>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  5. @davem330

    isdn/gigaset: honor CAPI application's buffer size request

    Tilman Schmidt authored davem330 committed
    Fix the Gigaset CAPI driver to limit the length of a connection's
    payload data receive buffers to the corresponding CAPI application's
    data buffer size, as some real-life CAPI applications tend to be
    rather unhappy if they receive bigger data blocks than requested.
    
    Impact: bugfix
    Signed-off-by: Tilman Schmidt <tilman@imap.cc>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  6. @ffainelli @davem330

    cpmac: do not leak struct net_device on phy_connect errors

    ffainelli authored davem330 committed
    If the call to phy_connect fails, we will return directly instead of freeing
    the previously allocated struct net_device.
    
    Signed-off-by: Florian Fainelli <florian@openwrt.org>
    CC: stable@kernel.org
    Signed-off-by: David S. Miller <davem@davemloft.net>
  7. @davem330

    smc91c92_cs: fix the problem that lan & modem does not work simultane…

    Ken Kawasaki authored davem330 committed
    …ously
    
    smc91c92_cs:
      Fix the problem that lan & modem does not work simultaneously
      in the Megahertz multi-function card.
      We need to write MEGAHERTZ_ISR to retrigger interrupt.
    
    Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  8. @davem330

    ipv6: fix NULL reference in proxy neighbor discovery

    stephen hemminger authored davem330 committed
    The addition of TLLAO option created a kernel OOPS regression
    for the case where neighbor advertisement is being sent via
    proxy path.  When using proxy, ipv6_get_ifaddr() returns NULL
    causing the NULL dereference.
    
    Change causing the bug was:
    commit f7734fd
    Author: Octavian Purdila <opurdila@ixiacom.com>
    Date:   Fri Oct 2 11:39:15 2009 +0000
    
        make TLLAO option for NA packets configurable
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Jun 25, 2010
  1. @davem330

    Bluetooth: Bring back var 'i' increment

    Gustavo F. Padovan authored davem330 committed
    commit ff6e216 accidentally added a
    regression on the bnep code. Fixing it.
    
    Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. @rydberg @dtor

    MAINTAINERS - Add an entry for the input MT protocol

    rydberg authored dtor committed
    This patch adds a maintainer for the input multitouch (MT) protocol,
    such that get_maintainer.pl selects it whenever an MT event is present
    in the patch.
    
    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Commits on Jun 24, 2010
  1. @miaoxie @jankara

    ext3: update ctime when changing the file's permission by setfacl

    miaoxie authored jankara committed
    ext3 didn't update the ctime of the file when its permission was changed.
    
    Steps to reproduce:
     # touch aaa
     # stat -c %Z aaa
     1275289822
     # setfacl -m  'u::x,g::x,o::x' aaa
     # stat -c %Z aaa
     1275289822				<- unchanged
    
    But, according to the spec of the ctime, ext3 must update it.
    
    Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
    Signed-off-by: Jan Kara <jack@suse.cz>
Something went wrong with that request. Please try again.