18 Sep, 2009

2 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (66 commits)
    be2net: fix some cmds to use mccq instead of mbox
    atl1e: fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
    pkt_sched: Fix qstats.qlen updating in dump_stats
    ipv6: Log the affected address when DAD failure occurs
    wl12xx: Fix print_mac() conversion.
    af_iucv: fix race when queueing skbs on the backlog queue
    af_iucv: do not call iucv_sock_kill() twice
    af_iucv: handle non-accepted sockets after resuming from suspend
    af_iucv: fix race in __iucv_sock_wait()
    iucv: use correct output register in iucv_query_maxconn()
    iucv: fix iucv_buffer_cpumask check when calling IUCV functions
    iucv: suspend/resume error msg for left over pathes
    wl12xx: switch to %pM to print the mac address
    b44: the poll handler b44_poll must not enable IRQ unconditionally
    ipv6: Ignore route option with ROUTER_PREF_INVALID
    bonding: make ab_arp select active slaves as other modes
    cfg80211: fix SME connect
    rc80211_minstrel: fix contention window calculation
    ssb/sdio: fix printk format warnings
    p54usb: add Zcomax XG-705A usbid
    ...

    Linus Torvalds
     
  • * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
    uwb: avoid radio controller reset loops
    uwb: stop uwbd thread if rc->start() fails
    uwb: handle radio controller events with out-of-range IDs correctly

    Linus Torvalds
     

16 Sep, 2009

24 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
    Driver Core: devtmpfs - kernel-maintained tmpfs-based /dev
    debugfs: Modify default debugfs directory for debugging pktcdvd.
    debugfs: Modified default dir of debugfs for debugging UHCI.
    debugfs: Change debugfs directory of IWMC3200
    debugfs: Change debuhgfs directory of trace-events-sample.h
    debugfs: Fix mount directory of debugfs by default in events.txt
    hpilo: add poll f_op
    hpilo: add interrupt handler
    hpilo: staging for interrupt handling
    driver core: platform_device_add_data(): use kmemdup()
    Driver core: Add support for compatibility classes
    uio: add generic driver for PCI 2.3 devices
    driver-core: move dma-coherent.c from kernel to driver/base
    mem_class: fix bug
    mem_class: use minor as index instead of searching the array
    driver model: constify attribute groups
    UIO: remove 'default n' from Kconfig
    Driver core: Add accessor for device platform data
    Driver core: move dev_get/set_drvdata to drivers/base/dd.c
    Driver core: add new device to bus's list before probing

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6:
    pcmcia: document return value of pcmcia_loop_config
    pcmcia: dtl1_cs: fix pcmcia_loop_config logic
    pcmcia: drop non-existant includes
    pcmcia: disable prefetch/burst for OZ6933
    pcmcia: fix incorrect argument order to list_add_tail()
    pcmcia: drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolons
    pcmcia: Use phys_addr_t for physical addresses
    pcmcia: drivers/pcmcia: Make static

    Linus Torvalds
     
  • * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (75 commits)
    PCI hotplug: clean up acpi_run_hpp()
    PCI hotplug: acpiphp: use generic pci_configure_slot()
    PCI hotplug: shpchp: use generic pci_configure_slot()
    PCI hotplug: pciehp: use generic pci_configure_slot()
    PCI hotplug: add pci_configure_slot()
    PCI hotplug: clean up acpi_get_hp_params_from_firmware() interface
    PCI hotplug: acpiphp: don't cache hotplug_params in acpiphp_bridge
    PCI hotplug: acpiphp: remove superfluous _HPP/_HPX evaluation
    PCI: Clear saved_state after the state has been restored
    PCI PM: Return error codes from pci_pm_resume()
    PCI: use dev_printk in quirk messages
    PCI / PCIe portdrv: Fix pcie_portdrv_slot_reset()
    PCI Hotplug: convert acpi_pci_detect_ejectable() to take an acpi_handle
    PCI Hotplug: acpiphp: find bridges the easy way
    PCI: pcie portdrv: remove unused variable
    PCI / ACPI PM: Propagate wake-up enable for devices w/o ACPI support
    ACPI PM: Replace wakeup.prepared with reference counter
    PCI PM: Introduce device flag wakeup_prepared
    PCI / ACPI PM: Rework some debug messages
    PCI PM: Simplify PCI wake-up code
    ...

    Fixed up conflict in arch/powerpc/kernel/pci_64.c due to OF device tree
    scanning having been moved and merged for the 32- and 64-bit cases. The
    'needs_freset' initialization added in 6e19314cc ("PCI/powerpc: support
    PCIe fundamental reset") is now in arch/powerpc/kernel/pci_of_scan.c.

    Linus Torvalds
     
  • bdi_start_writeback() is currently split into two paths, one for
    WB_SYNC_NONE and one for WB_SYNC_ALL. Add bdi_sync_writeback()
    for WB_SYNC_ALL writeback and let bdi_start_writeback() handle
    only WB_SYNC_NONE.

    Push down the writeback_control allocation and only accept the
    parameters that make sense for each function. This cleans up
    the API considerably.

    Signed-off-by: Jens Axboe

    Jens Axboe
     
  • Now that bdi_writeback_all() no longer handles integrity writeback,
    it doesn't have to block anymore. This means that we can switch
    bdi_list reader side protection to RCU.

    Signed-off-by: Jens Axboe

    Jens Axboe
     
  • We do this automatically in get_sb_bdev() from the set_bdev_super()
    callback. Filesystems that have their own private backing_dev_info
    must assign that in ->fill_super().

    Note that ->s_bdi assignment is required for proper writeback!

    Acked-by: Christoph Hellwig
    Signed-off-by: Jens Axboe

    Jens Axboe
     
  • It's only set, it's never checked. Kill it.

    Acked-by: Jan Kara
    Signed-off-by: Jens Axboe

    Jens Axboe
     
  • It has been unused since it was introduced in:

    commit 520808bf20e90fdbdb320264ba7dd5cf9d47dcac
    Author: Andrew Morton
    Date: Fri May 21 00:46:17 2004 -0700

    [PATCH] block device layer: separate backing_dev_info infrastructure

    So lets just kill it.

    Acked-by: Jan Kara
    Signed-off-by: Jens Axboe

    Jens Axboe
     
  • Use uX rather than uintX_t types for consistency.

    Signed-off-by: David Howells
    Signed-off-by: David S. Miller

    David Howells
     
  • Physical addresses are currently represented as int or long types.
    However, this does not work for processors like the PPC440EPx, which
    is a 32-bit processor with a 36-bit address space. This patch uses
    the phys_addr_t type, which correctly holds a 36-bit address on
    this processor.

    Signed-off-by: Steven A. Falco
    Signed-off-by: Wolfram Sang
    Signed-off-by: Greg Kroah-Hartman

    Steven A. Falco
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6:
    ide: fixup for fujitsu disk
    ide: convert to ->proc_fops
    at91_ide: remove headers specific for at91sam9263
    IDE: palm_bk3710: convert clock usage after clkdev conversion
    ide: fix races in handling of user-space SET XFER commands
    ide: allow ide_dev_read_id() to be called from the IRQ context
    ide: ide-taskfile.c fix style problems
    drivers/ide/ide-cd.c: Use DIV_ROUND_CLOSEST
    ide-tape: fix handling of postponed rqs
    ide-tape: convert to ide_debug_log macro
    ide-tape: fix debug call
    ide: Fix annoying warning in ide_pio_bytes().
    IDE: Save a call to PageHighMem()

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (134 commits)
    powerpc/nvram: Enable use Generic NVRAM driver for different size chips
    powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline
    powerpc/ps3: Workaround for flash memory I/O error
    powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead
    powerpc/perf_counters: Reduce stack usage of power_check_constraints
    powerpc: Fix bug where perf_counters breaks oprofile
    powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops
    powerpc/irq: Improve nanodoc
    powerpc: Fix some late PowerMac G5 with PCIe ATI graphics
    powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT
    powerpc/book3e: Add missing page sizes
    powerpc/pseries: Fix to handle slb resize across migration
    powerpc/powermac: Thermal control turns system off too eagerly
    powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()
    powerpc/405ex: support cuImage via included dtb
    powerpc/405ex: provide necessary fixup function to support cuImage
    powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC
    powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support.
    powerpc/44x: Update Arches defconfig
    powerpc/44x: Update Arches dts
    ...

    Fix up conflicts in drivers/char/agp/uninorth-agp.c

    Linus Torvalds
     
  • Devtmpfs lets the kernel create a tmpfs instance called devtmpfs
    very early at kernel initialization, before any driver-core device
    is registered. Every device with a major/minor will provide a
    device node in devtmpfs.

    Devtmpfs can be changed and altered by userspace at any time,
    and in any way needed - just like today's udev-mounted tmpfs.
    Unmodified udev versions will run just fine on top of it, and will
    recognize an already existing kernel-created device node and use it.
    The default node permissions are root:root 0600. Proper permissions
    and user/group ownership, meaningful symlinks, all other policy still
    needs to be applied by userspace.

    If a node is created by devtmps, devtmpfs will remove the device node
    when the device goes away. If the device node was created by
    userspace, or the devtmpfs created node was replaced by userspace, it
    will no longer be removed by devtmpfs.

    If it is requested to auto-mount it, it makes init=/bin/sh work
    without any further userspace support. /dev will be fully populated
    and dynamic, and always reflect the current device state of the kernel.
    With the commonly used dynamic device numbers, it solves the problem
    where static devices nodes may point to the wrong devices.

    It is intended to make the initial bootup logic simpler and more robust,
    by de-coupling the creation of the inital environment, to reliably run
    userspace processes, from a complex userspace bootstrap logic to provide
    a working /dev.

    Signed-off-by: Kay Sievers
    Signed-off-by: Jan Blunck
    Tested-By: Harald Hoyer
    Tested-By: Scott James Remnant
    Signed-off-by: Greg Kroah-Hartman

    Kay Sievers
     
  • When turning class devices into bus devices, we may need to
    temporarily add links in sysfs so that user-space applications
    are not confused. This is done by adding the following API:

    * Functions to register and unregister compatibility classes.
    These appear in sysfs at the same location as regular classes, but
    instead of class devices, they contain links to bus devices.
    * Functions to create and delete such links. Additionally, the caller
    can optionally pass a target device to which a "device" link should
    point (typically that would be the device's parent), to fully emulate
    the original class device.

    The i2c subsystem will be the first user of this API, as i2c adapters
    are being converted from class devices to bus devices.

    Signed-off-by: Jean Delvare
    Signed-off-by: Kay Sievers

    Jean Delvare
     
  • This adds a generic uio driver that can bind to any PCI device. First
    user will be virtualization where a qemu userspace process needs to give
    guest OS access to the device.

    Interrupts are handled using the Interrupt Disable bit in the PCI
    command register and Interrupt Status bit in the PCI status register.
    All devices compliant to PCI 2.3 (circa 2002) and all compliant PCI
    Express devices should support these bits. Driver detects this support,
    and won't bind to devices which do not support the Interrupt Disable Bit
    in the command register.

    It's expected that more features of interest to virtualization will be
    added to this driver in the future. Possibilities are: mmap for device
    resources, MSI/MSI-X, eventfd (to interface with kvm), iommu.

    Signed-off-by: Michael S. Tsirkin
    Acked-by: Chris Wright
    Signed-off-by: Hans J. Koch
    Acked-by: Jesse Barnes
    Signed-off-by: Greg Kroah-Hartman

    Michael S. Tsirkin
     
  • Let attribute group vectors be declared "const". We'd
    like to let most attribute metadata live in read-only
    sections... this is a start.

    Signed-off-by: David Brownell
    Signed-off-by: Greg Kroah-Hartman

    David Brownell
     
  • For consistency with driver data provide a dev_get_platdata() accessor
    for reading the platform data from a device.

    Signed-off-by: Mark Brown
    Signed-off-by: Greg Kroah-Hartman

    Mark Brown
     
  • No one should directly access the driver_data field, so remove the field
    and make it private. We dynamically create the private field now if it
    is needed, to handle drivers that call get/set before they are
    registered with the driver core.

    Also update the copyright notices on these files while we are there.

    Cc: Kay Sievers
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (46 commits)
    powerpc64: convert to dynamic percpu allocator
    sparc64: use embedding percpu first chunk allocator
    percpu: kill lpage first chunk allocator
    x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA
    percpu: update embedding first chunk allocator to handle sparse units
    percpu: use group information to allocate vmap areas sparsely
    vmalloc: implement pcpu_get_vm_areas()
    vmalloc: separate out insert_vmalloc_vm()
    percpu: add chunk->base_addr
    percpu: add pcpu_unit_offsets[]
    percpu: introduce pcpu_alloc_info and pcpu_group_info
    percpu: move pcpu_lpage_build_unit_map() and pcpul_lpage_dump_cfg() upward
    percpu: add @align to pcpu_fc_alloc_fn_t
    percpu: make @dyn_size mandatory for pcpu_setup_first_chunk()
    percpu: drop @static_size from first chunk allocators
    percpu: generalize first chunk allocator selection
    percpu: build first chunk allocators selectively
    percpu: rename 4k first chunk allocator to page
    percpu: improve boot messages
    percpu: fix pcpu_reclaim() locking
    ...

    Fix trivial conflict as by Tejun Heo in kernel/sched.c

    Linus Torvalds
     
  • Due to problems at cam.org, my nico@cam.org email address is no longer
    valid. FRom now on, nico@fluxnic.net should be used instead.

    Signed-off-by: Nicolas Pitre
    Signed-off-by: Linus Torvalds

    Nicolas Pitre
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (213 commits)
    V4L/DVB (12720): em28xx-cards: Add vendor/product id for Kworld DVD Maker 2
    V4L/DVB (12713): em28xx: Cleanups at ir_i2c handler
    V4L/DVB (12712): em28xx: properly load ir-kbd-i2c when needed
    V4L/DVB (12701): saa7134: ir-kbd-i2c init data needs a persistent object
    V4L/DVB (12699): cx18: ir-kbd-i2c initialization data should point to a persistent object
    V4L/DVB (12698): em28xx: ir-kbd-i2c init data needs a persistent object
    V4L/DVB (12707): gspca - sn9c20x: Add SXGA support to MT9M111
    V4L/DVB (12706): gspca - sn9c20x: disable exposure/gain controls for MT9M111 sensors.
    V4L/DVB (12705): gspca - sn9c20x: Add SXGA support to SOI968
    V4L/DVB (12703): gspca - sn9c20x: Reduces size of object
    V4L/DVB (12704): gspca - sn9c20x: Fix exposure on SOI968 sensors
    V4L/DVB (12696): gspca - sonixj / sn9c102: Two drivers for 0c45:60fc and 0c45:613e.
    V4L/DVB (12695): gspca - vc032x: Do the LED work with the sensor hv7131r.
    V4L/DVB (12694): gspca - vc032x: Change the start exchanges of the sensor hv7131r.
    V4L/DVB (12693): gspca - sunplus: The brightness is signed.
    V4L/DVB (12692): gspca - sunplus: Optimize code.
    V4L/DVB (12691): gspca - sonixj: Don't use mdelay().
    V4L/DVB (12690): gspca - pac7311: Webcam 06f8:3009 added.
    V4L/DVB (12686): dvb-core: check supported QAM modulations
    V4L/DVB (12685): dvb-core: check fe->ops.set_frontend return value
    ...

    Linus Torvalds
     
  • * 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, pat: Fix cacheflush address in change_page_attr_set_clr()
    mm: remove !NUMA condition from PAGEFLAGS_EXTENDED condition set
    x86: Fix earlyprintk=dbgp for machines without NX
    x86, pat: Sanity check remap_pfn_range for RAM region
    x86, pat: Lookup the protection from memtype list on vm_insert_pfn()
    x86, pat: Add lookup_memtype to get the current memtype of a paddr
    x86, pat: Use page flags to track memtypes of RAM pages
    x86, pat: Generalize the use of page flag PG_uncached
    x86, pat: Add rbtree to do quick lookup in memtype tracking
    x86, pat: Add PAT reserve free to io_mapping* APIs
    x86, pat: New i/f for driver to request memtype for IO regions
    x86, pat: ioremap to follow same PAT restrictions as other PAT users
    x86, pat: Keep identity maps consistent with mmaps even when pat_disabled
    x86, mtrr: make mtrr_aps_delayed_init static bool
    x86, pat/mtrr: Rendezvous all the cpus for MTRR/PAT init
    generic-ipi: Allow cpus not yet online to call smp_call_function with irqs disabled
    x86: Fix an incorrect argument of reserve_bootmem()
    x86: Fix system crash when loading with "reservetop" parameter

    Linus Torvalds
     
  • * 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, intel_txt: clean up the impact on generic code, unbreak non-x86
    x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE
    x86, intel_txt: Fix typos in Kconfig help
    x86, intel_txt: Factor out the code for S3 setup
    x86, intel_txt: tboot.c needs
    intel_txt: Force IOMMU on for Intel TXT launch
    x86, intel_txt: Intel TXT Sx shutdown support
    x86, intel_txt: Intel TXT reboot/halt shutdown support
    x86, intel_txt: Intel TXT boot support

    Linus Torvalds
     
  • * 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
    agp/intel: remove restore in resume
    agp: fix uninorth build
    intel-agp: Set dma mask for i915
    agp: kill phys_to_gart() and gart_to_phys()
    intel-agp: fix sglist allocation to avoid vmalloc()
    intel-agp: Move repeated sglist free into separate function
    agp: Switch agp_{un,}map_page() to take struct page * argument
    agp: tidy up handling of scratch pages w.r.t. DMA API
    intel_agp: Use PCI DMA API correctly on chipsets new enough to have IOMMU
    agp: Add generic support for graphics dma remapping
    agp: Switch mask_memory() method to take address argument again, not page

    Linus Torvalds
     

15 Sep, 2009

14 commits

  • After the recent mq change there is the new select_queue qdisc class
    method used in tc_modify_qdisc, but it works OK only for direct child
    qdiscs of mq qdisc. Grandchildren always get the first tx queue, which
    would give wrong qdisc_root etc. results (e.g. for sch_htb as child of
    sch_prio). This patch fixes it by using parent's dev_queue for such
    grandchildren qdiscs. The select_queue method's return type is changed
    BTW.

    With feedback from: Patrick McHardy

    Signed-off-by: Jarek Poplawski
    Signed-off-by: David S. Miller

    Jarek Poplawski
     
  • Parse RxRPC security index 5 type keys (Kerberos 5 tokens).

    Signed-off-by: David Howells
    Signed-off-by: David S. Miller

    David Howells
     
  • Allow add_key() and KEYCTL_INSTANTIATE to accept key payloads in XDR form as
    described by openafs-1.4.10/src/auth/afs_token.xg. This provides a way of
    passing kaserver, Kerberos 4, Kerberos 5 and GSSAPI keys from userspace, and
    allows for future expansion.

    Signed-off-by: David Howells
    Signed-off-by: David S. Miller

    David Howells
     
  • Declare the security index constants symbolically rather than just referring
    to them numerically.

    Signed-off-by: David Howells
    Signed-off-by: David S. Miller

    David Howells
     
  • struct socket has a 16 bit hole that triggers kmemcheck warnings.

    As suggested by Ingo, use kmemcheck annotations

    Signed-off-by: Eric Dumazet
    Acked-by: Ingo Molnar
    Signed-off-by: David S. Miller

    Eric Dumazet
     
  • This patch fixes commit e36b9d16c6a6d0f59803b3ef04ff3c22c3844c10. The approach
    there is to call dev_close()/dev_open() whenever the device type is changed in
    order to remap the device IP multicast addresses to HW multicast addresses.
    This approach suffers from 2 drawbacks:

    *. It assumes tha the device is UP when calling dev_close(), or otherwise
    dev_close() has no affect. It is worth to mention that initscripts (Redhat)
    and sysconfig (Suse) doesn't act the same in this matter.
    *. dev_close() has other side affects, like deleting entries from the routing
    table, which might be unnecessary.

    The fix here is to directly remap the IP multicast addresses to HW multicast
    addresses for a bonding device that changes its type, and nothing else.

    Reported-by: Jason Gunthorpe
    Signed-off-by: Moni Shoua
    Signed-off-by: David S. Miller

    Moni Shoua
     
  • It was once upon time so that snd_sthresh was a 16-bit quantity.
    ...That has not been true for long period of time. I run across
    some ancient compares which still seem to trust such legacy.
    Put all that magic into a single place, I hopefully found all
    of them.

    Compile tested, though linking of allyesconfig is ridiculous
    nowadays it seems.

    Signed-off-by: Ilpo Järvinen
    Signed-off-by: David S. Miller

    Ilpo Järvinen
     
  • …is/security-testing-2.6

    * 'for-linus3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
    SELinux: inline selinux_is_enabled in !CONFIG_SECURITY_SELINUX
    KEYS: Fix garbage collector
    KEYS: Unlock tasklist when exiting early from keyctl_session_to_parent
    CRED: Allow put_cred() to cope with a NULL groups list
    SELinux: flush the avc before disabling SELinux
    SELinux: seperate avc_cache flushing
    Creds: creds->security can be NULL is selinux is disabled

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (23 commits)
    at_hdmac: Rework suspend_late()/resume_early()
    PM: Reset transition_started at dpm_resume_noirq
    PM: Update kerneldoc comments in drivers/base/power/main.c
    PM: Add convenience macro to make switching to dev_pm_ops less error-prone
    hp-wmi: Switch driver to dev_pm_ops
    floppy: Switch driver to dev_pm_ops
    PM: Trivial fixes
    PM / Hibernate / Memory hotplug: Always use for_each_populated_zone()
    PM/Hibernate: Do not try to allocate too much memory too hard (rev. 2)
    PM/Hibernate: Do not release preallocated memory unnecessarily (rev. 2)
    PM/Hibernate: Rework shrinking of memory
    PM: Fix typo in label name s/Platofrm_finish/Platform_finish/
    PM: Run-time PM platform device bus support
    PM: Introduce core framework for run-time PM of I/O devices (rev. 17)
    Driver Core: Make PM operations a const pointer
    PM: Remove platform device suspend_late()/resume_early() V2
    USB: Rework musb suspend()/resume_early()
    I2C: Rework i2c-s3c2410 suspend_late()/resume() V2
    I2C: Rework i2c-pxa suspend_late()/resume_early()
    DMA: Rework txx9dmac suspend_late()/resume_early()
    ...

    Fix trivial conflict in drivers/base/platform.c (due to same
    constification patch being merged in both sides, along with some other
    PM work in the PM branch)

    Linus Torvalds
     
  • Without this patch building a kernel emits millions of warning like:

    include/linux/selinux.h:92: warning: ?selinux_is_enabled? defined but not used

    When it is build without CONFIG_SECURITY_SELINUX. This is harmless, but
    the function should be inlined, so it gets compiled out.

    Reported-by: Linus Torvalds
    Signed-off-by: Eric Paris
    Signed-off-by: James Morris

    Eric Paris
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (52 commits)
    Input: bcm5974 - silence uninitialized variables warnings
    Input: wistron_btns - add keymap for AOpen 1557
    Input: psmouse - use boolean type
    Input: i8042 - use platform_driver_probe
    Input: i8042 - use boolean type where it makes sense
    Input: i8042 - try disabling and re-enabling AUX port at close
    Input: pxa27x_keypad - allow modifying keymap from userspace
    Input: sunkbd - fix formatting
    Input: i8042 - bypass AUX IRQ delivery test on laptops
    Input: wacom_w8001 - simplify querying logic
    Input: atkbd - allow setting force-release bitmap via sysfs
    Input: w90p910_keypad - move a dereference below a NULL test
    Input: add twl4030_keypad driver
    Input: matrix-keypad - add function to build device keymap
    Input: tosakbd - fix cleaning up KEY_STROBEs after error
    Input: joydev - validate axis/button maps before clobbering current ones
    Input: xpad - add USB ID for the drumkit controller from Rock Band
    Input: w90p910_keypad - rename driver name to match platform
    Input: add new driver for Sentelic Finger Sensing Pad
    Input: psmouse - allow defining read-only attributes
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
    HID: completely remove apple mightymouse from blacklist
    HID: support larger reports than 64 bytes in hiddev
    HID: local function should be static
    HID: ignore Philips IEEE802.15.4 RF Dongle
    HID: ignore all recent SoundGraph iMON devices
    HID: fix memory leak on error patch in debug code
    HID: fix overrun in quirks initialization
    HID: Drop NULL test on list_entry result
    HID: driver for Twinhan USB 6253:0100 remote control
    HID: adding __init/__exit macros to module init/exit functions
    HID: add rumble support for Thrustmaster Dual Trigger 3-in-1
    HID: ntrig tool separation and pen usages
    HID: Avoid double spin_lock_init on usbhid->lock
    HID: add force feedback support for Logitech WingMan Formula Force GP
    HID: Support new variants of Samsung USB IR receiver (0419:0001)
    HID: fix memory leak on error path in debug code
    HID: fix debugfs build with !CONFIG_DEBUG_FS
    HID: use debugfs for events/reports dumping
    HID: use debugfs for report dumping descriptor

    Linus Torvalds
     
  • * 'for-2.6.32' of git://git.kernel.dk/linux-2.6-block: (29 commits)
    block: use blkdev_issue_discard in blk_ioctl_discard
    Make DISCARD_BARRIER and DISCARD_NOBARRIER writes instead of reads
    block: don't assume device has a request list backing in nr_requests store
    block: Optimal I/O limit wrapper
    cfq: choose a new next_req when a request is dispatched
    Seperate read and write statistics of in_flight requests
    aoe: end barrier bios with EOPNOTSUPP
    block: trace bio queueing trial only when it occurs
    block: enable rq CPU completion affinity by default
    cfq: fix the log message after dispatched a request
    block: use printk_once
    cciss: memory leak in cciss_init_one()
    splice: update mtime and atime on files
    block: make blk_iopoll_prep_sched() follow normal 0/1 return convention
    cfq-iosched: get rid of must_alloc flag
    block: use interrupts disabled version of raise_softirq_irqoff()
    block: fix comment in blk-iopoll.c
    block: adjust default budget for blk-iopoll
    block: fix long lines in block/blk-iopoll.c
    block: add blk-iopoll, a NAPI like approach for block devices
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (209 commits)
    [SCSI] fix oops during scsi scanning
    [SCSI] libsrp: fix memory leak in srp_ring_free()
    [SCSI] libiscsi, bnx2i: make bound ep check common
    [SCSI] libiscsi: add completion function for drivers that do not need pdu processing
    [SCSI] scsi_dh_rdac: changes for rdac debug logging
    [SCSI] scsi_dh_rdac: changes to collect the rdac debug information during the initialization
    [SCSI] scsi_dh_rdac: move the init code from rdac_activate to rdac_bus_attach
    [SCSI] sg: fix oops in the error path in sg_build_indirect()
    [SCSI] mptsas : Bump version to 3.04.12
    [SCSI] mptsas : FW event thread and scsi mid layer deadlock in SYNCHRONIZE CACHE command
    [SCSI] mptsas : Send DID_NO_CONNECT for pending IOs of removed device
    [SCSI] mptsas : PAE Kernel more than 4 GB kernel panic
    [SCSI] mptsas : NULL pointer on big endian systems causing Expander not to tear off
    [SCSI] mptsas : Sanity check for phyinfo is added
    [SCSI] scsi_dh_rdac: Add support for Sun StorageTek ST2500, ST2510 and ST2530
    [SCSI] pmcraid: PMC-Sierra MaxRAID driver to support 6Gb/s SAS RAID controller
    [SCSI] qla2xxx: Update version number to 8.03.01-k6.
    [SCSI] qla2xxx: Properly delete rports attached to a vport.
    [SCSI] qla2xxx: Correct various NPIV issues.
    [SCSI] qla2xxx: Correct qla2x00_eh_wait_on_command() to wait correctly.
    ...

    Linus Torvalds