05 Feb, 2011

2 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (68 commits)
    net: can: janz-ican3: world-writable sysfs termination file
    net: can: at91_can: world-writable sysfs files
    MAINTAINERS: update email ids of the be2net driver maintainers.
    bridge: Don't put partly initialized fdb into hash
    r8169: prevent RxFIFO induced loops in the irq handler.
    r8169: RxFIFO overflow oddities with 8168 chipsets.
    r8169: use RxFIFO overflow workaround for 8168c chipset.
    include/net/genetlink.h: Allow genlmsg_cancel to accept a NULL argument
    net: Provide compat support for SIOCGETMIFCNT_IN6 and SIOCGETSGCNT_IN6.
    net: Support compat SIOCGETVIFCNT ioctl in ipv4.
    net: Fix bug in compat SIOCGETSGCNT handling.
    niu: Fix races between up/down and get_stats.
    tcp_ecn is an integer not a boolean
    atl1c: Add missing PCI device ID
    s390: Fix possibly wrong size in strncmp (smsgiucv)
    s390: Fix wrong size in memcmp (netiucv)
    qeth: allow OSA CHPARM change in suspend state
    qeth: allow HiperSockets framesize change in suspend
    qeth: add more strict MTU checking
    qeth: show new mac-address if its setting fails
    ...

    Linus Torvalds
     
  • Signed-off-by: Ajit Khaparde
    Signed-off-by: David S. Miller

    Ajit Khaparde
     

03 Feb, 2011

3 commits

  • The support@simtec.co.uk address is for direct customer support only, the
    EB2410ITX and EB110ATX entries should direct to the Simtec Linux Team
    address of linux@simtec.co.uk

    Also add correct email address for Vincent Sanders

    [akpm@linux-foundation.org: fix Vincent's address]
    Signed-off-by: Ben Dooks
    Cc: Vincent Sanders
    Cc: Simtec Support
    Cc: Simtec Linux Team
    Cc: Jack Stone
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ben Dooks
     
  • Add the correct files for the Simtec BAST machine, ensuring the IDE and
    IRQ routing are added, and move to the machine specific file instead of
    trying to catch all of arch/arm/mach-s3c2410

    Signed-off-by: Ben Dooks
    Cc: Simtec Linux Team
    Cc: Simtec Support
    Cc: Jack Stone
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ben Dooks
     
  • There are currently two entries under the "SIMTEC EB2410ITX (BAST)"
    machine entry for drivers/*/*s3c2410*, which is catching everything
    s3c2410 driver related.

    This entry is for a specific S3C2410 based machine, so move these two file
    entries to the "ARM/SAMSUNG ARM ARCHITECTURES" entry, where it will reach
    a wider audience of interested parties.

    Signed-off-by: Ben Dooks
    Cc: Simtec Linux Team
    Acked-by: Kukjin Kim
    Cc: Jack Stone
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ben Dooks
     

02 Feb, 2011

1 commit


01 Feb, 2011

2 commits

  • Patches should keep coming through Rusty but it helps if I'm Cc'd as
    well.

    Signed-off-by: Michael S. Tsirkin
    Signed-off-by: Rusty Russell
    Signed-off-by: Linus Torvalds

    Michael S. Tsirkin
     
  • * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (42 commits)
    usb: gadget: composite: avoid access beyond array max length
    USB: serial: handle Data Carrier Detect changes
    USB: gadget: Fix endpoint representation in ci13xxx_udc
    USB: gadget: Fix error path in ci13xxx_udc gadget probe function
    usb: pch_udc: Fix the worning log issue at gadget driver remove
    USB: serial: Updated support for ICOM devices
    USB: ehci-mxc: add work-around for efika mx/sb bug
    USB: unbreak ehci-mxc on otg port of i.MX27
    drivers: update to pl2303 usb-serial to support Motorola cables
    USB: adding USB support for Cinterion's HC2x, EU3 and PH8 products
    USB serial: add missing .usb_driver field in serial drivers
    USB: ehci-fsl: Fix 'have_sysif_regs' detection
    USB: g_printer: fix bug in module parameter definitions
    USB: g_printer: fix bug in unregistration
    USB: uss720: remove duplicate USB device
    MAINTAINERS: add ueagle-atm entry
    USB: EHCI: fix DMA deallocation bug
    USB: pch_udc: support new device ML7213 IOH
    usb: pch_udc: Fixed issue which does not work with g_serial
    usb: set ep_dev async suspend should be later than device_initialize
    ...

    Linus Torvalds
     

28 Jan, 2011

1 commit


27 Jan, 2011

1 commit


26 Jan, 2011

1 commit


24 Jan, 2011

1 commit


23 Jan, 2011

1 commit


22 Jan, 2011

1 commit


21 Jan, 2011

3 commits

  • * akpm:
    kernel/smp.c: consolidate writes in smp_call_function_interrupt()
    kernel/smp.c: fix smp_call_function_many() SMP race
    memcg: correctly order reading PCG_USED and pc->mem_cgroup
    backlight: fix 88pm860x_bl macro collision
    drivers/leds/ledtrig-gpio.c: make output match input, tighten input checking
    MAINTAINERS: update Atmel AT91 entry
    mm: fix truncate_setsize() comment
    memcg: fix rmdir, force_empty with THP
    memcg: fix LRU accounting with THP
    memcg: fix USED bit handling at uncharge in THP
    memcg: modify accounting function for supporting THP better
    fs/direct-io.c: don't try to allocate more than BIO_MAX_PAGES in a bio
    mm: compaction: prevent division-by-zero during user-requested compaction
    mm/vmscan.c: remove duplicate include of compaction.h
    memblock: fix memblock_is_region_memory()
    thp: keep highpte mapped until it is no longer needed
    kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

    Linus Torvalds
     
  • Add two co-maintainers and update the entry with new information.

    Signed-off-by: Nicolas Ferre
    Acked-by: Andrew Victor
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Cc: Russell King
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Nicolas Ferre
     
  • * 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
    tty: update MAINTAINERS file due to driver movement
    tty: move drivers/serial/ to drivers/tty/serial/
    tty: move hvc drivers to drivers/tty/hvc/

    Linus Torvalds
     

15 Jan, 2011

2 commits


14 Jan, 2011

8 commits

  • Since the original maintainer-Joseph Chan (josephchan@via.com.tw) doesn't
    handle the Linux driver for VIA now, I would like to request to update the
    maintainer for the SD/MMC CARD CONTROLLER DRIVER and VIA
    UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER before we find a better one.

    Signed-off-by: Bruce Chang
    Signed-off-by: Florian Tobias Schandinat
    Cc: Joseph Chan
    Cc: Geert Uytterhoeven
    Cc: Harald Welte
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Bruce Chang
     
  • This fixes up the MAINTAINERS file due to moving the serial
    drivers to the drivers/tty/ directory.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (348 commits)
    ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection
    ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO
    ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO
    ALSA: oxygen: fix Xonar DG input
    ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low
    ALSA: hda - Fix missing EAPD for Acer 4930G
    ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.
    ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser
    ALSA: hda - Don't refer ELD when unplugged
    ASoC: tpa6130a2: Fix compiler warning
    ASoC: tlv320dac33: Add DAPM selection for LOM invert
    ASoC: DMIC codec: Adding a generic DMIC codec
    ALSA: snd-usb-us122l: Fix missing NULL checks
    ALSA: snd-usb-us122l: Fix MIDI output
    ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync()
    ASoC: Fix section mismatch in wm8995.c
    ALSA: oxygen: add S/PDIF source selection for Claro cards
    ALSA: oxygen: fix CD/MIDI for X-Meridian (2G)
    ASoC: fix migor audio build
    ALSA: include delay.h for msleep in Xonar DG support
    ...

    Linus Torvalds
     
  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
    Documentation/trace/events.txt: Remove obsolete sched_signal_send.
    writeback: fix global_dirty_limits comment runtime -> real-time
    ppc: fix comment typo singal -> signal
    drivers: fix comment typo diable -> disable.
    m68k: fix comment typo diable -> disable.
    wireless: comment typo fix diable -> disable.
    media: comment typo fix diable -> disable.
    remove doc for obsolete dynamic-printk kernel-parameter
    remove extraneous 'is' from Documentation/iostats.txt
    Fix spelling milisec -> ms in snd_ps3 module parameter description
    Fix spelling mistakes in comments
    Revert conflicting V4L changes
    i7core_edac: fix typos in comments
    mm/rmap.c: fix comment
    sound, ca0106: Fix assignment to 'channel'.
    hrtimer: fix a typo in comment
    init/Kconfig: fix typo
    anon_inodes: fix wrong function name in comment
    fix comment typos concerning "consistent"
    poll: fix a typo in comment
    ...

    Fix up trivial conflicts in:
    - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
    - fs/ext4/ext4.h

    Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.

    Linus Torvalds
     
  • People stumble across the entry for the legacy PC specific RTC driver
    entry in MAINTAINERS when they really want the multi-arch, multi-driver
    RTC subsystem. So just delete the old entry that is causing the
    confusion.

    Signed-off-by: Paul Gortmaker
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Paul Gortmaker
     
  • This driver is PPC only, and I am no longer able to test it.

    Signed-off-by: Stelian Pop
    Cc: Michael Hanselmann
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stelian Pop
     
  • I don't even remember when it was that I sold this laptop, but
    it has been a few years...

    Signed-off-by: Stelian Pop
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stelian Pop
     
  • Signed-off-by: Lennert Buytenhek
    Cc: Florian Fainelli
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Lennert Buytenhek
     

13 Jan, 2011

3 commits


12 Jan, 2011

2 commits

  • Holger will take over the zcrypt driver maintainer work. Update the
    MAINTAINERS entry accordingly.

    Signed-off-by: Holger Dengler
    Signed-off-by: Felix Beck

    Holger Dengler
     
  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (22 commits)
    MAINTAINERS: Update Joel Becker's email address
    ocfs2: Remove unused truncate function from alloc.c
    ocfs2/cluster: dereferencing before checking in nst_seq_show()
    ocfs2: fix build for OCFS2_FS_STATS not enabled
    ocfs2/cluster: Show o2net timing statistics
    ocfs2/cluster: Track process message timing stats for each socket
    ocfs2/cluster: Track send message timing stats for each socket
    ocfs2/cluster: Use ktime instead of timeval in struct o2net_sock_container
    ocfs2/cluster: Replace timeval with ktime in struct o2net_send_tracking
    ocfs2: Add DEBUG_FS dependency
    ocfs2/dlm: Hard code the values for enums
    ocfs2/dlm: Minor cleanup
    ocfs2/dlm: Cleanup dlmdebug.c
    ocfs2: Release buffer_head in case of error in ocfs2_double_lock.
    ocfs2/cluster: Pin the local node when o2hb thread starts
    ocfs2/cluster: Show pin state for each o2hb region
    ocfs2/cluster: Pin/unpin o2hb regions
    ocfs2/cluster: Remove dropped region from o2hb quorum region bitmap
    ocfs2/cluster: Pin the remote node item in configfs
    ocfs2/dlm: make existing convertion precedent over new lock
    ...

    Linus Torvalds
     

11 Jan, 2011

6 commits

  • * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    i2c: Constify i2c_client where possible
    i2c-algo-bit: Complain about masters which can't read SCL
    i2c-algo-bit: Refactor adapter registration
    i2c: Add generic I2C multiplexer using GPIO API
    i2c-nforce2: Remove unnecessary cast of pci_get_drvdata
    i2c-i801: Include

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (52 commits)
    Blackfin: encode cpu-rev into uImage name
    Blackfin: bf54x: don't ack GPIO ints when unmasking them
    Blackfin: sram_free_with_lsl: do not ignore return value of sram_free
    Blackfin: boards: add missing "static" to peripheral lists
    Blackfin: DNP5370: new board port
    Blackfin: bf518f-ezbrd: fix dsa resources
    Blackfin: move "-m elf32bfin" to general LDFLAGS
    Blackfin: kgdb_test: make sure to initialize num2
    Blackfin: kgdb: disable preempt schedule when running single step in kgdb
    Blackfin: kgdb: disable interrupt when single stepping in ADEOS
    Blackfin: SMP: kgdb: apply anomaly 257 work around
    Blackfin: fix building IPIPE code when XIP is enabled
    Blackfin: SMP: kgdb: flush core internal write buffer before flushinv
    Blackfin: sport_uart resources: remove unused secondary RX/TX pins
    Blackfin: tll6527m: fix spelling in unused code (struct name)
    Blackfin: bf527-ezkit: add adau1373 chip address
    Blackfin: no-mpu: fix masking of small uncached dma region
    Blackfin: pm: drop irq save/restore in standby and suspend to mem callback
    MAINTAINERS: update Analog Devices support info
    Blackfin: dpmc.h: pull in new pll.h
    ...

    Linus Torvalds
     
  • * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
    staging: speakup: fix failure handling
    staging: usbip: remove double giveback of URB
    Staging: batman-adv: Remove batman-adv from staging
    Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
    staging: hv: remove unneeded osd_schedule_callback
    staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
    staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
    staging: brcm80211: Fix WL_ logging macros
    Staging: IIO: DDS: AD9833 / AD9834 driver
    Staging: IIO: dds.h convenience macros
    Staging: IIO: Direct digital synthesis abi documentation
    staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
    staging: brcm80211: Remove unused ETHER_TYPE_ #defines
    staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
    staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
    staging: brcm80211: Convert ETHER_IS to is__ether_addr
    staging: brcm80211: Remove unused ether_ #defines and struct
    staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
    staging: brcm80211: Remove unused #defines ETHER__LOCALADDR
    Staging: comedi: Fix checkpatch.pl issues in file s526.c
    ...

    Fix up trivial conflict in drivers/video/udlfb.c

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (36 commits)
    sony-laptop: support new hotkeys on the P, Z and EC series
    platform/x86: Consistently select LEDS Kconfig options
    sony-laptop: fix sparse non-ANSI function warning
    intel_ips: fix sparse non-ANSI function warning
    Support KHLB2 in the compal laptop driver
    acer-wmi: Enabled Acer Launch Manager mode
    [PATCH] intel_pmic_gpio: modify EOI handling following change of kernel irq subsystem
    ACPI Thinkpad: We must always call va_end() after va_start() but do not do so in thinkpad_acpi.c::acpi_evalf()
    acer-wmi: Initialize wlan/bluetooth/wwan rfkill software block state
    acer-wmi: Detect the WiFi/Bluetooth/3G devices available
    acer-wmi: Add 3G rfkill sysfs file
    acer-wmi: Add acer wmi hotkey events support
    platform/x86: Kconfig: Replace select by depends on ACPI_WMI
    ideapad: pass ideapad_priv as argument (part 2)
    ideapad: pass ideapad_priv as argument (part 1)
    ideapad: add markups, unify comments and return result when init
    ideapad: add hotkey support
    ideapad: let camera power control entry under platform driver
    ideapad: add platform driver for ideapad
    fujitsu-laptop: fix compiler warning on pnp_ids
    ...

    Linus Torvalds
     
  • Add an i2c mux driver providing access to i2c bus segments using a
    hardware MUX sitting on a master bus and controlled through gpio pins.

    E.G. something like:

    ---------- ---------- Bus segment 1 - - - - -
    | | SCL/SDA | |-------------- | |
    | |------------| |
    | | | | Bus segment 2 | |
    | Linux | GPIO 1..N | MUX |--------------- Devices
    | |------------| | | |
    | | | | Bus segment M
    | | | |---------------| |
    ---------- ---------- - - - - -

    SCL/SDA of the master I2C bus is multiplexed to bus segment 1..M
    according to the settings of the GPIO pins 1..N.

    Signed-off-by: Peter Korsgaard
    Signed-off-by: Jean Delvare

    Peter Korsgaard
     
  • …s/security-testing-2.6

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (30 commits)
    MAINTAINERS: Add tomoyo-dev-en ML.
    SELinux: define permissions for DCB netlink messages
    encrypted-keys: style and other cleanup
    encrypted-keys: verify datablob size before converting to binary
    trusted-keys: kzalloc and other cleanup
    trusted-keys: additional TSS return code and other error handling
    syslog: check cap_syslog when dmesg_restrict
    Smack: Transmute labels on specified directories
    selinux: cache sidtab_context_to_sid results
    SELinux: do not compute transition labels on mountpoint labeled filesystems
    This patch adds a new security attribute to Smack called SMACK64EXEC. It defines label that is used while task is running.
    SELinux: merge policydb_index_classes and policydb_index_others
    selinux: convert part of the sym_val_to_name array to use flex_array
    selinux: convert type_val_to_struct to flex_array
    flex_array: fix flex_array_put_ptr macro to be valid C
    SELinux: do not set automatic i_ino in selinuxfs
    selinux: rework security_netlbl_secattr_to_sid
    SELinux: standardize return code handling in selinuxfs.c
    SELinux: standardize return code handling in selinuxfs.c
    SELinux: standardize return code handling in policydb.c
    ...

    Linus Torvalds
     

10 Jan, 2011

2 commits