30 Jan, 2011

1 commit


14 Jan, 2011

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (46 commits)
    hwrng: via_rng - Fix memory scribbling on some CPUs
    crypto: padlock - Move padlock.h into include/crypto
    hwrng: via_rng - Fix asm constraints
    crypto: n2 - use __devexit not __exit in n2_unregister_algs
    crypto: mark crypto workqueues CPU_INTENSIVE
    crypto: mv_cesa - dont return PTR_ERR() of wrong pointer
    crypto: ripemd - Set module author and update email address
    crypto: omap-sham - backlog handling fix
    crypto: gf128mul - Remove experimental tag
    crypto: af_alg - fix af_alg memory_allocated data type
    crypto: aesni-intel - Fixed build with binutils 2.16
    crypto: af_alg - Make sure sk_security is initialized on accept()ed sockets
    net: Add missing lockdep class names for af_alg
    include: Install linux/if_alg.h for user-space crypto API
    crypto: omap-aes - checkpatch --file warning fixes
    crypto: omap-aes - initialize aes module once per request
    crypto: omap-aes - unnecessary code removed
    crypto: omap-aes - error handling implementation improved
    crypto: omap-aes - redundant locking is removed
    crypto: omap-aes - DMA initialization fixes for OMAP off mode
    ...

    Linus Torvalds
     

11 Jan, 2011

1 commit

  • * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
    mkuboot.sh: Fail if mkimage is missing
    gen_init_cpio: checkpatch fixes
    gen_init_cpio: Avoid race between call to stat() and call to open()
    modpost: Fix address calculation in reloc_location()
    Make fixdep error handling more explicit
    checksyscalls: Fix stand-alone usage
    modpost: Put .zdebug* section on white list
    kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG
    kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all
    kbuild: introduce HDR_ARCH_LIST for headers_install_all
    headers_install: check exit status of unifdef
    gen_init_cpio: remove leading `/' from file names
    scripts/genksyms: fix header usage
    fixdep: use hash table instead of a single array

    Linus Torvalds
     

29 Dec, 2010

1 commit


15 Dec, 2010

1 commit


03 Dec, 2010

1 commit


29 Oct, 2010

4 commits

  • We disabled the ability to build fanotify in commit 7c5347733dcc4ba0ba.
    This reverts that commit and allows people to build fanotify.

    Signed-off-by: Eric Paris

    Eric Paris
     
  • * 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
     
  • This merges the staging-next tree to Linus's tree and resolves
    some conflicts that were present due to changes in other trees that were
    affected by files here.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     
  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits)
    [media] af9015: Fix max I2C message size when used with tda18271
    [media] IR: initialize ir_raw_event in few more drivers
    [media] Guard a divide in v4l1 compat layer
    [media] imon: fix nomouse modprobe option
    [media] imon: remove redundant change_protocol call
    [media] imon: fix my egregious brown paper bag w/rdev/idev split
    [media] cafe_ccic: Configure ov7670 correctly
    [media] ov7670: allow configuration of image size, clock speed, and I/O method
    [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016]
    [media] af9015: map DigitalNow TinyTwin v2 remote
    [media] DigitalNow TinyTwin remote controller
    [media] af9015: RC fixes and improvements
    videodev2.h.xml: Update to reflect the latest changes at videodev2.h
    [media] v4l: document new Bayer and monochrome pixel formats
    [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028
    [media] firedtv: add parameter to fake ca_system_ids in CA_INFO
    [media] tm6000: fix a macro coding style issue
    tm6000: Remove some ugly debug code
    [media] Nova-S-Plus audio line input
    [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers
    ...

    Linus Torvalds
     

21 Oct, 2010

2 commits

  • Conflicts:
    net/core/dev.c

    David S. Miller
     
  • Remove the vtx (aka videotext aka teletext) API from the v4l2 core.
    This API was scheduled for removal in kernel 2.6.35.

    The vtx device nodes have been superseded by vbi device nodes
    for many years. No applications exist that use the vtx support.
    Of the two i2c drivers that actually support this API the saa5249
    has been impossible to use for a year now and no known hardware
    that supports this device exists. The saa5246a is theoretically
    supported by the old mxb boards, but it never actually worked.

    In summary: there is no hardware that can use this API and there
    are no applications actually implementing this API.

    The vtx support still reserves minors 192-223 and we would really
    like to reuse those for upcoming new functionality. In the unlikely
    event that new hardware appears that wants to use the functionality
    provided by the vtx API, then that functionality should be build
    around the sliced VBI API instead.

    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     

12 Oct, 2010

1 commit

  • This patch disables the fanotify syscalls by just not building them and
    letting the cond_syscall() statements in kernel/sys_ni.c redirect them
    to sys_ni_syscall().

    It was pointed out by Tvrtko Ursulin that the fanotify interface did not
    include an explicit prioritization between groups. This is necessary
    for fanotify to be usable for hierarchical storage management software,
    as they must get first access to the file, before inotify-like notifiers
    see the file.

    This feature can be added in an ABI compatible way in the next release
    (by using a number of bits in the flags field to carry the info) but it
    was suggested by Alan that maybe we should just hold off and do it in
    the next cycle, likely with an (new) explicit argument to the syscall.
    I don't like this approach best as I know people are already starting to
    use the current interface, but Alan is all wise and noone on list backed
    me up with just using what we have. I feel this is needlessly ripping
    the rug out from under people at the last minute, but if others think it
    needs to be a new argument it might be the best way forward.

    Three choices:
    Go with what we got (and implement the new feature next cycle). Add a
    new field right now (and implement the new feature next cycle). Wait
    till next cycle to release the ABI (and implement the new feature next
    cycle). This is number 3.

    Signed-off-by: Eric Paris
    Signed-off-by: Linus Torvalds

    Eric Paris
     

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
     

09 Sep, 2010

1 commit


15 Aug, 2010

1 commit


11 Aug, 2010

2 commits

  • * 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block: (149 commits)
    block: make sure that REQ_* types are seen even with CONFIG_BLOCK=n
    xen-blkfront: fix missing out label
    blkdev: fix blkdev_issue_zeroout return value
    block: update request stacking methods to support discards
    block: fix missing export of blk_types.h
    writeback: fix bad _bh spinlock nesting
    drbd: revert "delay probes", feature is being re-implemented differently
    drbd: Initialize all members of sync_conf to their defaults [Bugz 315]
    drbd: Disable delay probes for the upcomming release
    writeback: cleanup bdi_register
    writeback: add new tracepoints
    writeback: remove unnecessary init_timer call
    writeback: optimize periodic bdi thread wakeups
    writeback: prevent unnecessary bdi threads wakeups
    writeback: move bdi threads exiting logic to the forker thread
    writeback: restructure bdi forker loop a little
    writeback: move last_active to bdi
    writeback: do not remove bdi from bdi_list
    writeback: simplify bdi code a little
    writeback: do not lose wake-ups in bdi threads
    ...

    Fixed up pretty trivial conflicts in drivers/block/virtio_blk.c and
    drivers/scsi/scsi_error.c as per Jens.

    Linus Torvalds
     
  • * 'for-linus' of git://git.infradead.org/users/eparis/notify: (132 commits)
    fanotify: use both marks when possible
    fsnotify: pass both the vfsmount mark and inode mark
    fsnotify: walk the inode and vfsmount lists simultaneously
    fsnotify: rework ignored mark flushing
    fsnotify: remove global fsnotify groups lists
    fsnotify: remove group->mask
    fsnotify: remove the global masks
    fsnotify: cleanup should_send_event
    fanotify: use the mark in handler functions
    audit: use the mark in handler functions
    dnotify: use the mark in handler functions
    inotify: use the mark in handler functions
    fsnotify: send fsnotify_mark to groups in event handling functions
    fsnotify: Exchange list heads instead of moving elements
    fsnotify: srcu to protect read side of inode and vfsmount locks
    fsnotify: use an explicit flag to indicate fsnotify_destroy_mark has been called
    fsnotify: use _rcu functions for mark list traversal
    fsnotify: place marks on object in order of group memory address
    vfs/fsnotify: fsnotify_close can delay the final work in fput
    fsnotify: store struct file not struct path
    ...

    Fix up trivial delete/modify conflict in fs/notify/inotify/inotify.c.

    Linus Torvalds
     

08 Aug, 2010

1 commit

  • Stephen reports:

    After merging the block tree, today's linux-next build (x86_64
    allmodconfig) failed like this:

    usr/include/linux/fs.h:11: included file 'linux/blk_types.h' is not exported

    Caused by commit 9d3dbbcd9a84518ff5e32ffe671d06a48cf84fd9 ("bio, fs:
    separate out bio_types.h and define READ/WRITE constants in terms of
    BIO_RW_* flags").

    Reported-by: Stephen Rothwell
    Signed-off-by: Jens Axboe

    Jens Axboe
     

03 Aug, 2010

1 commit

  • The header file l2tp.h should be exported to the installed include/linux/
    tree for userspace programs.

    This patch fixes compilation errors in L2TP userspace apps which want to
    use the new L2TP support introduced in 2.6.35.

    Signed-off-by: James Chapman
    Signed-off-by: Andrew Morton
    Signed-off-by: David S. Miller

    James Chapman
     

28 Jul, 2010

1 commit

  • fanotify is a novel file notification system which bases notification on
    giving userspace both an event type (open, close, read, write) and an open
    file descriptor to the object in question. This should address a number of
    races and problems with other notification systems like inotify and dnotify
    and should allow the future implementation of blocking or access controlled
    notification. These are useful for on access scanners or hierachical storage
    management schemes.

    This patch just implements the basics of the fsnotify functions.

    Signed-off-by: Eric Paris

    Eric Paris
     

23 Apr, 2010

1 commit

  • V2 Feedback from John Hughes.
    - Add header for userspace implementations such as xot/xoe to use
    - Use explicit values for interface stability
    - No changes to driver patches

    V1
    - Use identifiers instead of magic numbers for X25 layer 3 to device interface.
    - Also fixed checkpatch notes on updated code.

    [ Add new user header to include/linux/Kbuild -DaveM ]

    Signed-off-by: Andrew Hendry
    Signed-off-by: David S. Miller

    Andrew Hendry
     

03 Mar, 2010

1 commit

  • * 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: (49 commits)
    OMAP: DSS2: Taal: Fix TE when resuming
    OMAP: DSS2: Taal: Fix ESD check
    OMAP: DSS2: OMAPFB: Constify some function parameters
    OMAP: DSS2: OMAPFB: install omapfb.h
    OMAP: DSS2: DSI: add error prints
    OMAP: DSS2: TPO-TD03MTEA1: fix function names
    OMAP: DSS2: DSI: add dsi_vc_dcs_read_2() helper
    OMAP: DSS2: OMAPFB: Remove FB_OMAP2_FORCE_AUTO_UPDATE
    OMAP: DSS2: DSI: remove external TE support
    OMAP: DSS2: move timing functions
    OMAP: DSS2: move set/get_wss()
    OMAP: DSS2: move enable/disable/suspend/resume
    OMAP: DSS2: move update() and sync()
    OMAP: DSS2: move set/get_update_mode()
    OMAP: DSS2: move enable/get_te()
    OMAP: DSS2: move get_recommended_bpp()
    OMAP: DSS2: move get_resolution()
    OMAP: DSS2: move enable/disable_channel to overlay manager
    OMAP: DSS2: move wait_vsync()
    OMAP: DSS2: move get/set_rotate()
    ...

    Linus Torvalds
     

02 Mar, 2010

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1341 commits)
    virtio_net: remove forgotten assignment
    be2net: fix tx completion polling
    sis190: fix cable detect via link status poll
    net: fix protocol sk_buff field
    bridge: Fix build error when IGMP_SNOOPING is not enabled
    bnx2x: Tx barriers and locks
    scm: Only support SCM_RIGHTS on unix domain sockets.
    vhost-net: restart tx poll on sk_sndbuf full
    vhost: fix get_user_pages_fast error handling
    vhost: initialize log eventfd context pointer
    vhost: logging thinko fix
    wireless: convert to use netdev_for_each_mc_addr
    ethtool: do not set some flags, if others failed
    ipoib: returned back addrlen check for mc addresses
    netlink: Adding inode field to /proc/net/netlink
    axnet_cs: add new id
    bridge: Make IGMP snooping depend upon BRIDGE.
    bridge: Add multicast count/interval sysfs entries
    bridge: Add hash elasticity/max sysfs entries
    bridge: Add multicast_snooping sysfs toggle
    ...

    Trivial conflicts in Documentation/feature-removal-schedule.txt

    Linus Torvalds
     

01 Mar, 2010

1 commit


23 Feb, 2010

1 commit

  • 'make headers_check' began to fail after cciss_defs.h was introduced in:
    429c42c9d246f5bda868495c09974312a0177328

    usr/include/linux/cciss_ioctl.h:6: included file 'linux/cciss_defs.h' is not exported

    Fix this by exporting cciss_defs.h

    Signed-off-by: dann frazier
    Signed-off-by: Jens Axboe

    dann frazier
     

15 Jan, 2010

1 commit

  • What it is: vhost net is a character device that can be used to reduce
    the number of system calls involved in virtio networking.
    Existing virtio net code is used in the guest without modification.

    There's similarity with vringfd, with some differences and reduced scope
    - uses eventfd for signalling
    - structures can be moved around in memory at any time (good for
    migration, bug work-arounds in userspace)
    - write logging is supported (good for migration)
    - support memory table and not just an offset (needed for kvm)

    common virtio related code has been put in a separate file vhost.c and
    can be made into a separate module if/when more backends appear. I used
    Rusty's lguest.c as the source for developing this part : this supplied
    me with witty comments I wouldn't be able to write myself.

    What it is not: vhost net is not a bus, and not a generic new system
    call. No assumptions are made on how guest performs hypercalls.
    Userspace hypervisors are supported as well as kvm.

    How it works: Basically, we connect virtio frontend (configured by
    userspace) to a backend. The backend could be a network device, or a tap
    device. Backend is also configured by userspace, including vlan/mac
    etc.

    Status: This works for me, and I haven't see any crashes.
    Compared to userspace, people reported improved latency (as I save up to
    4 system calls per packet), as well as better bandwidth and CPU
    utilization.

    Features that I plan to look at in the future:
    - mergeable buffers
    - zero copy
    - scalability tuning: figure out the best threading model to use

    Note on RCU usage (this is also documented in vhost.h, near
    private_pointer which is the value protected by this variant of RCU):
    what is happening is that the rcu_dereference() is being used in a
    workqueue item. The role of rcu_read_lock() is taken on by the start of
    execution of the workqueue item, of rcu_read_unlock() by the end of
    execution of the workqueue item, and of synchronize_rcu() by
    flush_workqueue()/flush_work(). In the future we might need to apply
    some gcc attribute or sparse annotation to the function passed to
    INIT_WORK(). Paul's ack below is for this RCU usage.

    (Includes fixes by Alan Cox ,
    David L Stevens ,
    Chris Wright )

    Acked-by: Rusty Russell
    Acked-by: Arnd Bergmann
    Acked-by: "Paul E. McKenney"
    Signed-off-by: Michael S. Tsirkin
    Signed-off-by: David S. Miller

    Michael S. Tsirkin
     

12 Dec, 2009

2 commits


03 Dec, 2009

1 commit


30 Oct, 2009

1 commit

  • Hi James, would you mind taking the following into
    security-testing?

    The securebits are used by passing them to prctl with the
    PR_{S,G}ET_SECUREBITS commands. But the defines must be
    shifted to be used in prctl, which begs to be confused and
    misused by userspace. So define some more convenient
    values for userspace to specify. This way userspace does

    prctl(PR_SET_SECUREBITS, SECBIT_NOROOT);

    instead of

    prctl(PR_SET_SECUREBITS, 1 << SECURE_NOROOT);

    (Thanks to Michael for the idea)

    This patch also adds include/linux/securebits to the installed headers.
    Then perhaps it can be included by glibc's sys/prctl.h.

    Changelog:
    Oct 29: Stephen Rothwell points out that issecure can
    be under __KERNEL__.
    Oct 14: (Suggestions by Michael Kerrisk):
    1. spell out SETUID in SECBIT_NO_SETUID*
    2. SECBIT_X_LOCKED does not imply SECBIT_X
    3. add definitions for keepcaps
    Oct 14: As suggested by Michael Kerrisk, don't
    use SB_* as that convention is already in
    use. Use SECBIT_ prefix instead.

    Signed-off-by: Serge E. Hallyn
    Acked-by: Andrew G. Morgan
    Acked-by: Michael Kerrisk
    Cc: Ulrich Drepper
    Cc: James Morris
    Signed-off-by: James Morris

    Serge E. Hallyn
     

22 Oct, 2009

1 commit

  • Rusty,

    commit 3ca4f5ca73057a617f9444a91022d7127041970a
    virtio: add virtio IDs file
    moved all device IDs into a single file. While the change itself is
    a very good one, it can break userspace applications. For example
    if a userspace tool wanted to get the ID of virtio_net it used to
    include virtio_net.h. This does no longer work, since virtio_net.h
    does not include virtio_ids.h.
    This patch moves all "#include " from the C
    files into the header files, making the header files compatible with
    the old ones.

    In addition, this patch exports virtio_ids.h to userspace.

    CC: Fernando Luis Vazquez Cao
    Signed-off-by: Christian Borntraeger
    Signed-off-by: Rusty Russell

    Christian Borntraeger
     

06 Oct, 2009

1 commit


10 Sep, 2009

1 commit


22 Jun, 2009

1 commit

  • This patch contains a device-mapper mirror log module that forwards
    requests to userspace for processing.

    The structures used for communication between kernel and userspace are
    located in include/linux/dm-log-userspace.h. Due to the frequency,
    diversity, and 2-way communication nature of the exchanges between
    kernel and userspace, 'connector' was chosen as the interface for
    communication.

    The first log implementations written in userspace - "clustered-disk"
    and "clustered-core" - support clustered shared storage. A userspace
    daemon (in the LVM2 source code repository) uses openAIS/corosync to
    process requests in an ordered fashion with the rest of the nodes in the
    cluster so as to prevent log state corruption. Other implementations
    with no association to LVM or openAIS/corosync, are certainly possible.

    (Imagine if two machines are writing to the same region of a mirror.
    They would both mark the region dirty, but you need a cluster-aware
    entity that can handle properly marking the region clean when they are
    done. Otherwise, you might clear the region when the first machine is
    done, not the second.)

    Signed-off-by: Jonathan Brassow
    Cc: Evgeniy Polyakov
    Signed-off-by: Alasdair G Kergon

    Jonthan Brassow
     

19 Jun, 2009

1 commit

  • This patch adds the kernel side of the PPS support currently named
    "LinuxPPS".

    PPS means "pulse per second" and a PPS source is just a device which
    provides a high precision signal each second so that an application can
    use it to adjust system clock time.

    Common use is the combination of the NTPD as userland program with a GPS
    receiver as PPS source to obtain a wallclock-time with sub-millisecond
    synchronisation to UTC.

    To obtain this goal the userland programs shoud use the PPS API
    specification (RFC 2783 - Pulse-Per-Second API for UNIX-like Operating
    Systems, Version 1.0) which in part is implemented by this patch. It
    provides a set of chars devices, one per PPS source, which can be used to
    get the time signal. The RFC's functions can be implemented by accessing
    to these char devices.

    Signed-off-by: Rodolfo Giometti
    Cc: David Woodhouse
    Cc: Greg KH
    Cc: Randy Dunlap
    Cc: Kay Sievers
    Acked-by: Alan Cox
    Cc: Michael Kerrisk
    Cc: Christoph Hellwig
    Cc: Roman Zippel
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Rodolfo Giometti
     

15 Jun, 2009

1 commit


12 Jun, 2009

1 commit


04 Jun, 2009

1 commit

  • This patch completely rewrites the rfkill core to address
    the following deficiencies:

    * all rfkill drivers need to implement polling where necessary
    rather than having one central implementation

    * updating the rfkill state cannot be done from arbitrary
    contexts, forcing drivers to use schedule_work and requiring
    lots of code

    * rfkill drivers need to keep track of soft/hard blocked
    internally -- the core should do this

    * the rfkill API has many unexpected quirks, for example being
    asymmetric wrt. alloc/free and register/unregister

    * rfkill can call back into a driver from within a function the
    driver called -- this is prone to deadlocks and generally
    should be avoided

    * rfkill-input pointlessly is a separate module

    * drivers need to #ifdef rfkill functions (unless they want to
    depend on or select RFKILL) -- rfkill should provide inlines
    that do nothing if it isn't compiled in

    * the rfkill structure is not opaque -- drivers need to initialise
    it correctly (lots of sanity checking code required) -- instead
    force drivers to pass the right variables to rfkill_alloc()

    * the documentation is hard to read because it always assumes the
    reader is completely clueless and contains way TOO MANY CAPS

    * the rfkill code needlessly uses a lot of locks and atomic
    operations in locked sections

    * fix LED trigger to actually change the LED when the radio state
    changes -- this wasn't done before

    Tested-by: Alan Jenkins
    Signed-off-by: Henrique de Moraes Holschuh [thinkpad]
    Signed-off-by: Johannes Berg
    Signed-off-by: John W. Linville

    Johannes Berg
     

09 May, 2009

1 commit