14 Aug, 2012

1 commit


31 Jul, 2012

1 commit

  • VFIO is a secure user level driver for use with both virtual machines
    and user level drivers. VFIO makes use of IOMMU groups to ensure the
    isolation of devices in use, allowing unprivileged user access. It's
    intended that VFIO will replace KVM device assignment and UIO drivers
    (in cases where the target platform includes a sufficiently capable
    IOMMU).

    New in this version of VFIO is support for IOMMU groups managed
    through the IOMMU core as well as a rework of the API, removing the
    group merge interface. We now go back to a model more similar to
    original VFIO with UIOMMU support where the file descriptor obtained
    from /dev/vfio/vfio allows access to the IOMMU, but only after a
    group is added, avoiding the previous privilege issues with this type
    of model. IOMMU support is also now fully modular as IOMMUs have
    vastly different interface requirements on different platforms. VFIO
    users are able to query and initialize the IOMMU model of their
    choice.

    Please see the follow-on Documentation commit for further description
    and usage example.

    Signed-off-by: Alex Williamson

    Alex Williamson
     

10 May, 2012

1 commit


03 Apr, 2012

1 commit

  • Pull HSI (High Speed Synchronous Serial Interface) framework from Carlos Chinea:
    "The High Speed Synchronous Serial Interface (HSI) is a serial
    interface mainly used for connecting application engines (APE) with
    cellular modem engines (CMT) in cellular handsets.

    The framework is currently being used for some people and we would
    like to see it integrated into the kernel for 3.3. There is no HW
    controller drivers in this pull, but some people have already some of
    them pending which they would like to push as soon as this integrated.
    I am also working on the acceptance for an TI OMAP one, based on a
    compatible legacy version of the interface called SSI."

    Ok, so it didn't get into 3.3, but here it is pulled into 3.4.

    Several people piped up to say "yeah, we want this".

    * 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi:
    HSI: hsi_char: Update ioctl-number.txt
    HSI: Add HSI API documentation
    HSI: hsi_char: Add HSI char device kernel configuration
    HSI: hsi_char: Add HSI char device driver
    HSI: hsi: Introducing HSI framework

    Linus Torvalds
     

22 Mar, 2012

1 commit

  • Pull vfs pile 1 from Al Viro:
    "This is _not_ all; in particular, Miklos' and Jan's stuff is not there
    yet."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (64 commits)
    ext4: initialization of ext4_li_mtx needs to be done earlier
    debugfs-related mode_t whack-a-mole
    hfsplus: add an ioctl to bless files
    hfsplus: change finder_info to u32
    hfsplus: initialise userflags
    qnx4: new helper - try_extent()
    qnx4: get rid of qnx4_bread/qnx4_getblk
    take removal of PF_FORKNOEXEC to flush_old_exec()
    trim includes in inode.c
    um: uml_dup_mmap() relies on ->mmap_sem being held, but activate_mm() doesn't hold it
    um: embed ->stub_pages[] into mmu_context
    gadgetfs: list_for_each_safe() misuse
    ocfs2: fix leaks on failure exits in module_init
    ecryptfs: make register_filesystem() the last potential failure exit
    ntfs: forgets to unregister sysctls on register_filesystem() failure
    logfs: missing cleanup on register_filesystem() failure
    jfs: mising cleanup on register_filesystem() failure
    make configfs_pin_fs() return root dentry on success
    configfs: configfs_create_dir() has parent dentry in dentry->d_parent
    configfs: sanitize configfs_create()
    ...

    Linus Torvalds
     

21 Mar, 2012

3 commits

  • Pull trivial tree from Jiri Kosina:
    "It's indeed trivial -- mostly documentation updates and a bunch of
    typo fixes from Masanari.

    There are also several linux/version.h include removals from Jesper."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
    kcore: fix spelling in read_kcore() comment
    constify struct pci_dev * in obvious cases
    Revert "char: Fix typo in viotape.c"
    init: fix wording error in mm_init comment
    usb: gadget: Kconfig: fix typo for 'different'
    Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
    writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
    writeback: fix typo in the writeback_control comment
    Documentation: Fix multiple typo in Documentation
    tpm_tis: fix tis_lock with respect to RCU
    Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
    Doc: Update numastat.txt
    qla4xxx: Add missing spaces to error messages
    compiler.h: Fix typo
    security: struct security_operations kerneldoc fix
    Documentation: broken URL in libata.tmpl
    Documentation: broken URL in filesystems.tmpl
    mtd: simplify return logic in do_map_probe()
    mm: fix comment typo of truncate_inode_pages_range
    power: bq27x00: Fix typos in comment
    ...

    Linus Torvalds
     
  • Pull networking merge from David Miller:
    "1) Move ixgbe driver over to purely page based buffering on receive.
    From Alexander Duyck.

    2) Add receive packet steering support to e1000e, from Bruce Allan.

    3) Convert TCP MD5 support over to RCU, from Eric Dumazet.

    4) Reduce cpu usage in handling out-of-order TCP packets on modern
    systems, also from Eric Dumazet.

    5) Support the IP{,V6}_UNICAST_IF socket options, making the wine
    folks happy, from Erich Hoover.

    6) Support VLAN trunking from guests in hyperv driver, from Haiyang
    Zhang.

    7) Support byte-queue-limtis in r8169, from Igor Maravic.

    8) Outline code intended for IP_RECVTOS in IP_PKTOPTIONS existed but
    was never properly implemented, Jiri Benc fixed that.

    9) 64-bit statistics support in r8169 and 8139too, from Junchang Wang.

    10) Support kernel side dump filtering by ctmark in netfilter
    ctnetlink, from Pablo Neira Ayuso.

    11) Support byte-queue-limits in gianfar driver, from Paul Gortmaker.

    12) Add new peek socket options to assist with socket migration, from
    Pavel Emelyanov.

    13) Add sch_plug packet scheduler whose queue is controlled by
    userland daemons using explicit freeze and release commands. From
    Shriram Rajagopalan.

    14) Fix FCOE checksum offload handling on transmit, from Yi Zou."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1846 commits)
    Fix pppol2tp getsockname()
    Remove printk from rds_sendmsg
    ipv6: fix incorrent ipv6 ipsec packet fragment
    cpsw: Hook up default ndo_change_mtu.
    net: qmi_wwan: fix build error due to cdc-wdm dependecy
    netdev: driver: ethernet: Add TI CPSW driver
    netdev: driver: ethernet: add cpsw address lookup engine support
    phy: add am79c874 PHY support
    mlx4_core: fix race on comm channel
    bonding: send igmp report for its master
    fs_enet: Add MPC5125 FEC support and PHY interface selection
    net: bpf_jit: fix BPF_S_LDX_B_MSH compilation
    net: update the usage of CHECKSUM_UNNECESSARY
    fcoe: use CHECKSUM_UNNECESSARY instead of CHECKSUM_PARTIAL on tx
    net: do not do gso for CHECKSUM_UNNECESSARY in netif_needs_gso
    ixgbe: Fix issues with SR-IOV loopback when flow control is disabled
    net/hyperv: Fix the code handling tx busy
    ixgbe: fix namespace issues when FCoE/DCB is not enabled
    rtlwifi: Remove unused ETH_ADDR_LEN defines
    igbvf: Use ETH_ALEN
    ...

    Fix up fairly trivial conflicts in drivers/isdn/gigaset/interface.c and
    drivers/net/usb/{Kconfig,qmi_wwan.c} as per David.

    Linus Torvalds
     
  • Making an hfsplus partition bootable requires the ability to "bless" a
    file by putting its inode number in the volume header. Doing this from
    userspace on a mounted filesystem is impractical since the kernel will
    write back the original values on unmount. Add an ioctl to allow userspace
    to update the volume header information based on the target file.

    Signed-off-by: Matthew Garrett
    Signed-off-by: Christoph Hellwig
    Signed-off-by: Al Viro

    Matthew Garrett
     

07 Mar, 2012

1 commit


05 Mar, 2012

1 commit

  • This moves the definitions of the ioctls, constants and structures
    relating to the ppp_generic interface to userspace out from if_ppp.h
    to a new file, ppp-ioctl.h. The new file has my copyright since I
    designed and implemented the ppp_generic interface in the late 1990s.
    None of the contents of this file comes from the original if_ppp.h
    published by Carnegie Mellon University.

    Of the remainder of if_ppp.h, only the PPP_MTU definition was being
    used, and this replaces the uses of it with PPP_MRU (which is identical).
    Therefore, this replaces the entire file with the single line

    #include

    which clearly doesn't contain any CMU code. Thus I have removed the
    CMU copyright notice with its problematic advertising clause, and in
    fact since it's only one trivial line I have not added any other
    copyright notice.

    Signed-off-by: Paul Mackerras
    Signed-off-by: David S. Miller

    Paul Mackerras
     

16 Feb, 2012

1 commit


05 Jan, 2012

1 commit


05 Nov, 2011

1 commit


13 Sep, 2011

1 commit

  • The LTTng 2.0 kernel tracer (stand-alone module package, available at
    http://lttng.org) uses the 0xF6 ioctl range for tracer control and
    transport operations.

    Signed-off-by: Mathieu Desnoyers
    Signed-off-by: Linus Torvalds

    Mathieu Desnoyers
     

03 Aug, 2011

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
    arch/tile/mm/init.c: trivial: use BUG_ON
    arch/tile: remove useless set_fixmap_nocache() macro
    arch/tile: add hypervisor-based character driver for SPI flash ROM
    ioctl-number.txt: add the tile hardwall ioctl range
    tile: use generic-y format for one-line asm-generic headers
    clocksource: tile: convert to use clocksource_register_hz

    Linus Torvalds
     

08 Jul, 2011

1 commit

  • Add the drivers/virt directory, which houses drivers that support
    virtualization environments, and add the Freescale hypervisor management
    driver.

    The Freescale hypervisor management driver provides several services to
    drivers and applications related to the Freescale hypervisor:

    1. An ioctl interface for querying and managing partitions

    2. A file interface to reading incoming doorbells

    3. An interrupt handler for shutting down the partition upon receiving the
    shutdown doorbell from a manager partition

    4. A kernel interface for receiving callbacks when a managed partition
    shuts down.

    Signed-off-by: Timur Tabi
    Acked-by: Arnd Bergmann
    Signed-off-by: Kumar Gala

    Timur Tabi
     

10 Jun, 2011

1 commit


26 May, 2011

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (75 commits)
    mmc: core: eMMC bus width may not work on all platforms
    mmc: sdhci: Auto-CMD23 fixes.
    mmc: sdhci: Auto-CMD23 support.
    mmc: core: Block CMD23 support for UHS104/SDXC cards.
    mmc: sdhci: Implement MMC_CAP_CMD23 for SDHCI.
    mmc: core: Use CMD23 for multiblock transfers when we can.
    mmc: quirks: Add/remove quirks conditional support.
    mmc: Add new VUB300 USB-to-SD/SDIO/MMC driver
    mmc: sdhci-pxa: Add quirks for DMA/ADMA to match h/w
    mmc: core: duplicated trial with same freq in mmc_rescan_try_freq()
    mmc: core: add support for eMMC Dual Data Rate
    mmc: core: eMMC signal voltage does not use CMD11
    mmc: sdhci-pxa: add platform code for UHS signaling
    mmc: sdhci: add hooks for setting UHS in platform specific code
    mmc: core: clear MMC_PM_KEEP_POWER flag on resume
    mmc: dw_mmc: fixed wrong regulator_enable in suspend/resume
    mmc: sdhi: allow powering down controller with no card inserted
    mmc: tmio: runtime suspend the controller, where possible
    mmc: sdhi: support up to 3 interrupt sources
    mmc: sdhi: print physical base address and clock rate
    ...

    Linus Torvalds
     

25 May, 2011

1 commit

  • Allows appropriately-privileged applications to send CMD (normal) and ACMD
    (application-specific; preceded with CMD55) commands to cards/devices on
    the mmc bus. This is primarily useful for enabling the security
    functionality built in to every SD card.

    It can also be used as a generic passthrough (e.g. to enable virtual
    machines to control mmc bus devices directly). However, this use case has
    not been tested rigorously. Generic passthrough testing was only conducted
    for a few non-security opcodes to prove the feasibility of the passthrough.

    Since any opcode can be sent using this passthrough, it is very possible to
    render the card/device unusable. Applications that use this ioctl must
    have CAP_SYS_RAWIO.

    Security commands tested on TI PCIxx12 (SDHCI), Sigma Designs SMP8652 SoC,
    TI OMAP3621/OMAP3630 SoC, Samsung S5PC110 SoC, Qualcomm MSM7200A SoC.

    Signed-off-by: John Calixto
    Reviewed-by: Andrei Warkentin
    Reviewed-by: Arnd Bergmann
    Signed-off-by: Chris Ball

    John Calixto
     

20 May, 2011

1 commit

  • Move the public API definitions to include/linux/uvcvideo.h and bump the
    version number to 1.1.0. Compatibility with the old API is kept,
    application can still be compiled against the private header and will
    not break.

    Signed-off-by: Laurent Pinchart
    Signed-off-by: Mauro Carvalho Chehab

    Laurent Pinchart
     

25 Mar, 2011

1 commit

  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits)
    [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
    [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
    [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
    [media] v4l: soc-camera: Store negotiated buffer settings
    [media] rc: interim support for 32-bit NEC-ish scancodes
    [media] mceusb: topseed 0x0011 needs gen3 init for tx to work
    [media] lirc_zilog: error out if buffer read bytes != chunk size
    [media] lirc: silence some compile warnings
    [media] hdpvr: use same polling interval as other OS
    [media] ir-kbd-i2c: pass device code w/key in hauppauge case
    [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
    [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
    [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
    [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
    [media] rc-rc5-hauppauge-new: Add support for the old Black RC
    [media] rc-rc5-hauppauge-new: Add the old control to the table
    [media] rc-winfast: Fix the keycode tables
    [media] a800: Fix a few wrong IR key assignments
    [media] opera1: Use multimedia keys instead of an app-specific mapping
    [media] dw2102: Use multimedia keys instead of an app-specific mapping
    ...

    Fix up trivial conflicts (remove/modify and some real conflicts) in:
    arch/arm/mach-omap2/devices.c
    drivers/staging/Kconfig
    drivers/staging/Makefile
    drivers/staging/dabusb/dabusb.c
    drivers/staging/dabusb/dabusb.h
    drivers/staging/easycap/easycap_ioctl.c
    drivers/staging/usbvideo/usbvideo.c
    drivers/staging/usbvideo/vicam.c

    Linus Torvalds
     

22 Mar, 2011

1 commit


03 Feb, 2011

2 commits


14 Jan, 2011

1 commit


29 Dec, 2010

3 commits


29 Oct, 2010

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (841 commits)
    Staging: brcm80211: fix usage of roundup in structures
    Staging: bcm: fix up network device reference counting
    Staging: keucr: fix up US_ macro change
    staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames.
    staging: brcm80211: Remove unnecessary header files.
    staging: brcm80211: Remove unnecessary includes from bcmutils.c
    staging: brcm80211: Removed unnecessary pktsetprio() function.
    Staging: brcm80211: remove typedefs.h
    Staging: brcm80211: remove uintptr typedef usage
    Staging: hv: remove struct vmbus_channel_interface
    Staging: hv: remove Open from struct vmbus_channel_interface
    Staging: hv: storvsc: call vmbus_open directly
    Staging: hv: netvsc: call vmbus_open directly
    Staging: hv: channel: export vmbus_open to modules
    Staging: hv: remove Close from struct vmbus_channel_interface
    Staging: hv: netvsc: call vmbus_close directly
    Staging: hv: storvsc: call vmbus_close directly
    Staging: hv: channel: export vmbus_close to modules
    Staging: hv: remove SendPacket from struct vmbus_channel_interface
    Staging: hv: storvsc: call vmbus_sendpacket directly
    ...

    Fix up conflicts in
    drivers/staging/cx25821/cx25821-audio-upstream.c
    drivers/staging/cx25821/cx25821-audio.h
    due to warring whitespace cleanups (neither of which were all that great)

    Linus Torvalds
     

21 Oct, 2010

1 commit


06 Oct, 2010

1 commit

  • smbfs has been scheduled for removal in 2.6.27, so
    maybe we can now move it to drivers/staging on the
    way out.

    smbfs still uses the big kernel lock and nobody
    is going to fix that, so we should be getting
    rid of it soon.

    This removes the 32 bit compat mount and ioctl
    handling code, which is implemented in common fs
    code, and moves all smbfs related files into
    drivers/staging/smbfs.

    Signed-off-by: Arnd Bergmann
    Acked-by: Jeff Layton
    Signed-off-by: Greg Kroah-Hartman

    Arnd Bergmann
     

08 Aug, 2010

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (82 commits)
    firewire: core: add forgotten dummy driver methods, remove unused ones
    firewire: add isochronous multichannel reception
    firewire: core: small clarifications in core-cdev
    firewire: core: remove unused code
    firewire: ohci: release channel in error path
    firewire: ohci: use memory barriers to order descriptor updates
    tools/firewire: nosy-dump: increment program version
    tools/firewire: nosy-dump: remove unused code
    tools/firewire: nosy-dump: use linux/firewire-constants.h
    tools/firewire: nosy-dump: break up a deeply nested function
    tools/firewire: nosy-dump: make some symbols static or const
    tools/firewire: nosy-dump: change to kernel coding style
    tools/firewire: nosy-dump: work around segfault in decode_fcp
    tools/firewire: nosy-dump: fix it on x86-64
    tools/firewire: add userspace front-end of nosy
    firewire: nosy: note ioctls in ioctl-number.txt
    firewire: nosy: use generic printk macros
    firewire: nosy: endianess fixes and annotations
    firewire: nosy: annotate __user pointers and __iomem pointers
    firewire: nosy: fix device shutdown with active client
    ...

    Linus Torvalds
     

04 Aug, 2010

1 commit

  • Below you will find an updated version from the original series bunching all patches into one big patch
    updating broken web addresses that are located in Documentation/*
    Some of the addresses date as far far back as 1995 etc... so searching became a bit difficult,
    the best way to deal with these is to use web.archive.org to locate these addresses that are outdated.
    Now there are also some addresses pointing to .spec files some are located, but some(after searching
    on the companies site)where still no where to be found. In this case I just changed the address
    to the company site this way the users can contact the company and they can locate them for the users.

    Signed-off-by: Justin P. Mattock
    Signed-off-by: Thomas Weber
    Signed-off-by: Mike Frysinger
    Cc: Paulo Marques
    Cc: Randy Dunlap
    Cc: Michael Neuling
    Signed-off-by: Jiri Kosina

    Justin P. Mattock
     

27 Jul, 2010

1 commit

  • These are the ioctls for the special-purpose misc device /dev/nosy, the
    interface to the IEEE 1394 packet sniffer/ protocol analyzer driver.
    Currently only the numbers 00...02 are in use; let's block a few more
    for unforeseen use cases.

    Cc: Randy Dunlap
    Signed-off-by: Stefan Richter

    Stefan Richter
     

20 Mar, 2010

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (205 commits)
    ceph: update for write_inode API change
    ceph: reset osd after relevant messages timed out
    ceph: fix flush_dirty_caps race with caps migration
    ceph: include migrating caps in issued set
    ceph: fix osdmap decoding when pools include (removed) snaps
    ceph: return EBADF if waiting for caps on closed file
    ceph: set osd request message front length correctly
    ceph: reset front len on return to msgpool; BUG on mismatched front iov
    ceph: fix snaptrace decoding on cap migration between mds
    ceph: use single osd op reply msg
    ceph: reset bits on connection close
    ceph: remove bogus mds forward warning
    ceph: remove fragile __map_osds optimization
    ceph: fix connection fault STANDBY check
    ceph: invalidate_authorizer without con->mutex held
    ceph: don't clobber write return value when using O_SYNC
    ceph: fix client_request_forward decoding
    ceph: drop messages on unregistered mds sessions; cleanup
    ceph: fix comments, locking in destroy_inode
    ceph: move dereference after NULL test
    ...

    Fix trivial conflicts in Documentation/ioctl/ioctl-number.txt

    Linus Torvalds
     

03 Mar, 2010

1 commit


12 Jan, 2010

1 commit


07 Oct, 2009

1 commit

  • A few Ceph ioctls for getting and setting file layout (striping)
    parameters, and learning the identity and network address of the OSD a
    given region of a file is stored on.

    Signed-off-by: Sage Weil

    Sage Weil
     

24 Sep, 2009

1 commit


15 Sep, 2009

1 commit

  • * 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (202 commits)
    MAINTAINERS: update KVM entry
    KVM: correct error-handling code
    KVM: fix compile warnings on s390
    KVM: VMX: Check cpl before emulating debug register access
    KVM: fix misreporting of coalesced interrupts by kvm tracer
    KVM: x86: drop duplicate kvm_flush_remote_tlb calls
    KVM: VMX: call vmx_load_host_state() only if msr is cached
    KVM: VMX: Conditionally reload debug register 6
    KVM: Use thread debug register storage instead of kvm specific data
    KVM guest: do not batch pte updates from interrupt context
    KVM: Fix coalesced interrupt reporting in IOAPIC
    KVM guest: fix bogus wallclock physical address calculation
    KVM: VMX: Fix cr8 exiting control clobbering by EPT
    KVM: Optimize kvm_mmu_unprotect_page_virt() for tdp
    KVM: Document KVM_CAP_IRQCHIP
    KVM: Protect update_cr8_intercept() when running without an apic
    KVM: VMX: Fix EPT with WP bit change during paging
    KVM: Use kvm_{read,write}_guest_virt() to read and write segment descriptors
    KVM: x86 emulator: Add adc and sbb missing decoder flags
    KVM: Add missing #include
    ...

    Linus Torvalds