[pull request] brcmsmac and apple-gmux updates for quantal

Seth Forshee seth.forshee at canonical.com
Wed Aug 22 21:08:37 UTC 2012


I've queued up a batch of updates for brcmsmac and apple-gmux that I'd
like to sneak into quantal before the freeze.

For brcmsmac I've got a couple of patches to fix a situation where it
should be holding cfg80211_mutex, except that this lock isn't visible to
the wireless drivers. Both are cherry picks from upstream.

For apple-gmux I've got a series of patches which get the gmux working
on the retina Macbook and add vga_switcheroo support, along with a
couple of bug fixes and some required updates to vga_switcheroo. Most
are cherry picks or trivial backports. One is a sauce patch, but it's an
obviously-correct bug fix that has been submitted upstream.

Thanks,
Seth

The following changes since commit d3a67dbe37d32ba10da0de2f14151d606856e5d2:

  UBUNTU: Ubuntu-3.5.0-11.11 (2012-08-16 13:45:37 -0700)

are available in the git repository at:

  git://kernel.ubuntu.com/sforshee/ubuntu-quantal.git quantal-updates

for you to fetch changes up to 0d6c41196a01712bfddb1ac59f3ec763cb6caf30:

  UBUNTU: SAUCE: apple-gmux: Fix port address calculation in gmux_pio_write32() (2012-08-22 15:49:35 -0500)

----------------------------------------------------------------
Andreas Heider (1):
      apple-gmux: Add display mux support

Matthew Garrett (3):
      gmux: Add generic write32 function
      apple_gmux: Add support for newer hardware
      apple_gmux: Fix ACPI video unregister

Seth Forshee (6):
      cfg80211: add channel flag to prohibit OFDM operation
      brcmsmac: use channel flags to restrict OFDM
      apple-gmux: Fix kconfig dependencies
      vga_switcheroo: Don't require handler init callback
      vga_switcheroo: Remove assumptions about registration/unregistration ordering
      UBUNTU: SAUCE: apple-gmux: Fix port address calculation in gmux_pio_write32()

 drivers/gpu/drm/nouveau/nouveau_acpi.c             |    6 -
 drivers/gpu/vga/vga_switcheroo.c                   |   61 +--
 drivers/net/wireless/brcm80211/brcmsmac/channel.c  |    5 +-
 .../net/wireless/brcm80211/brcmsmac/mac80211_if.c  |    3 +-
 drivers/platform/x86/Kconfig                       |    5 +-
 drivers/platform/x86/apple-gmux.c                  |  426 +++++++++++++++++++-
 include/net/cfg80211.h                             |    2 +
 net/wireless/reg.c                                 |    2 +
 8 files changed, 453 insertions(+), 57 deletions(-)




More information about the kernel-team mailing list