1. 14 Oct, 2013 15 commits
  2. 06 Sep, 2013 8 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 2e515bf0
      Linus Torvalds authored
      Pull trivial tree from Jiri Kosina:
       "The usual trivial updates all over the tree -- mostly typo fixes and
        documentation updates"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (52 commits)
        doc: Documentation/cputopology.txt fix typo
        treewide: Convert retrun typos to return
        Fix comment typo for init_cma_reserved_pageblock
        Documentation/trace: Correcting and extending tracepoint documentation
        mm/hotplug: fix a typo in Documentation/memory-hotplug.txt
        power: Documentation: Update s2ram link
        doc: fix a typo in Documentation/00-INDEX
        Documentation/printk-formats.txt: No casts needed for u64/s64
        doc: Fix typo "is is" in Documentations
        treewide: Fix printks with 0x%#
        zram: doc fixes
        Documentation/kmemcheck: update kmemcheck documentation
        doc: documentation/hwspinlock.txt fix typo
        PM / Hibernate: add section for resume options
        doc: filesystems : Fix typo in Documentations/filesystems
        scsi/megaraid fixed several typos in comments
        ppc: init_32: Fix error typo "CONFIG_START_KERNEL"
        treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks
        page_isolation: Fix a comment typo in test_pages_isolated()
        doc: fix a typo about irq affinity
        ...
      2e515bf0
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 22e04f6b
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       "Highlights:
      
         - conversion of HID subsystem to use devm-based resource management,
           from Benjamin Tissoires
      
         - i2c-hid support for DT bindings, from Benjamin Tissoires
      
         - much improved support for Win8-multitouch devices, from Benjamin
           Tissoires
      
         - cleanup of core code using common hidinput_input_event(), from
           David Herrmann
      
         - fix for bug in implement() access to the bit stream (causing oops)
           that has been present in the code for ages, but devices that are
           able to trigger it have started to appear only now, from Jiri
           Kosina
      
         - fixes for CVE-2013-2899, CVE-2013-2898, CVE-2013-2896,
           CVE-2013-2892, CVE-2013-2888 (all triggerable only by specially
           crafted malicious HW devices plugged into the system), from Kees
           Cook
      
         - hidraw oops fix, from Manoj Chourasia
      
         - various smaller fixes here and there, support for a bunch of new
           devices by various contributors"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (53 commits)
        HID: MAINTAINERS: add roccat drivers
        HID: hid-sensor-hub: change kmalloc + memcpy by kmemdup
        HID: hid-sensor-hub: move to devm_kzalloc
        HID: hid-sensor-hub: fix indentation accross the code
        HID: move HID_REPORT_TYPES closer to the report-definitions
        HID: check for NULL field when setting values
        HID: picolcd_core: validate output report details
        HID: sensor-hub: validate feature report details
        HID: ntrig: validate feature report details
        HID: pantherlord: validate output report details
        HID: hid-wiimote: print small buffers via %*phC
        HID: uhid: improve uhid example client
        HID: Correct the USB IDs for the new Macbook Air 6
        HID: wiimote: add support for Guitar-Hero guitars
        HID: wiimote: add support for Guitar-Hero drums
        Input: introduce BTN/ABS bits for drums and guitars
        HID: battery: don't do DMA from stack
        HID: roccat: add support for KonePureOptical v2
        HID: picolcd: Prevent NULL pointer dereference on _remove()
        HID: usbhid: quirk for N-Trig DuoSense Touch Screen
        ...
      22e04f6b
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · ec0ad730
      Linus Torvalds authored
      Pull ext3, reiserfs, udf & isofs fixes from Jan Kara:
       "The contains a bunch of ext3 cleanups and minor improvements, major
        reiserfs locking changes which should hopefully fix deadlocks
        introduced by BKL removal, and udf/isofs changes to refuse mounting fs
        rw instead of mounting it ro automatically which makes eject button
        work as expected for all media (see the changelog for why userspace
        should be ok with this change)"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        jbd: use a single printk for jbd_debug()
        reiserfs: locking, release lock around quota operations
        reiserfs: locking, handle nested locks properly
        reiserfs: locking, push write lock out of xattr code
        jbd: relocate assert after state lock in journal_commit_transaction()
        udf: Refuse RW mount of the filesystem instead of making it RO
        udf: Standardize return values in mount sequence
        isofs: Refuse RW mount of the filesystem instead of making it RO
        ext3: allow specifying external journal by pathname mount option
        jbd: remove unneeded semicolon
      ec0ad730
    • Linus Torvalds's avatar
      Merge tag 'for-f2fs-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · eb97a784
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "This patch-set includes the following major enhancement patches:
         - support inline xattrs
         - add sysfs support to control GCs explicitly
         - add proc entry to show the current segment usage information
         - improve the GC/SSR performance
      
        The other bug fixes are as follows:
         - avoid the overflow on status calculation
         - fix some error handling routines
         - fix inconsistent xattr states after power-off-recovery
         - fix incorrect xattr node offset definition
         - fix deadlock condition in fsync
         - fix the fdatasync routine for power-off-recovery"
      
      * tag 'for-f2fs-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (40 commits)
        f2fs: optimize gc for better performance
        f2fs: merge more bios of node block writes
        f2fs: avoid an overflow during utilization calculation
        f2fs: trigger GC when there are prefree segments
        f2fs: use strncasecmp() simplify the string comparison
        f2fs: fix omitting to update inode page
        f2fs: support the inline xattrs
        f2fs: add the truncate_xattr_node function
        f2fs: introduce __find_xattr for readability
        f2fs: reserve the xattr space dynamically
        f2fs: add flags for inline xattrs
        f2fs: fix error return code in init_f2fs_fs()
        f2fs: fix wrong BUG_ON condition
        f2fs: fix memory leak when init f2fs filesystem fail
        f2fs: fix a compound statement label error
        f2fs: avoid writing inode redundantly when creating a file
        f2fs: alloc_page() doesn't return an ERR_PTR
        f2fs: should cover i_xattr_nid with its xattr node page lock
        f2fs: check the free space first in new_node_page
        f2fs: clean up the needless end 'return' of void function
        ...
      eb97a784
    • Jiri Kosina's avatar
      Merge branch 'for-3.12/sensor-hub' into for-linus · 4e5a494e
      Jiri Kosina authored
      Conflicts:
      	drivers/hid/hid-sensor-hub.c
      4e5a494e
    • Jiri Kosina's avatar
      Merge branches 'for-3.12/devm', 'for-3.12/i2c-hid', 'for-3.12/i2c-hid-dt',... · 63faf15d
      Jiri Kosina authored
      Merge branches 'for-3.12/devm', 'for-3.12/i2c-hid', 'for-3.12/i2c-hid-dt', 'for-3.12/logitech', 'for-3.12/multitouch-win8', 'for-3.12/trasnport-driver-cleanup', 'for-3.12/uhid', 'for-3.12/upstream' and 'for-3.12/wiimote' into for-linus
      63faf15d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · 2e032852
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "This set includes adding support for Neon acceleration of RAID6 XOR
        code from Ard Biesheuvel, cache flushing and barrier updates from Will
        Deacon, and a cleanup to the ARM debug code which reduces the amount
        of code by about 500 lines.
      
        A few other cleanups, such as constifying the machine descriptors
        which already shouldn't be written to, cleaning up the printing of the
        L2 cache size"
      
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (55 commits)
        ARM: 7826/1: debug: support debug ll on hisilicon soc
        ARM: 7830/1: delay: don't bother reporting bogomips in /proc/cpuinfo
        ARM: 7829/1: Add ".text.unlikely" and ".text.hot" to arm unwind tables
        ARM: 7828/1: ARMv7-M: implement restart routine common to all v7-M machines
        ARM: 7827/1: highbank: fix debug uart virtual address for LPAE
        ARM: 7823/1: errata: workaround Cortex-A15 erratum 773022
        ARM: 7806/1: allow DEBUG_UNCOMPRESS for Tegra
        ARM: 7793/1: debug: use generic option for ep93xx PL10x debug port
        ARM: debug: move SPEAr debug to generic PL01x code
        ARM: debug: move davinci debug to generic 8250 code
        ARM: debug: move keystone debug to generic 8250 code
        ARM: debug: remove DEBUG_ROCKCHIP_UART
        ARM: debug: provide generic option choices for 8250 and PL01x ports
        ARM: debug: move PL01X debug include into arch/arm/include/debug/
        ARM: debug: provide PL01x debug uart phys/virt address configuration options
        ARM: debug: add support for word accesses to debug/8250.S
        ARM: debug: move 8250 debug include into arch/arm/include/debug/
        ARM: debug: provide 8250 debug uart phys/virt address configuration options
        ARM: debug: provide 8250 debug uart register shift configuration option
        ARM: debug: provide 8250 debug uart flow control configuration option
        ...
      2e032852
    • Olof Johansson's avatar
      net: stmmac: fix bad merge conflict resolution · 356f9e74
      Olof Johansson authored
      Merge commit 06c54055 did a bad conflict resolution accidentally
      leaving out a closing brace.  Add it back.
      
      This breaks a handful of defconfigs on ARM, so it'd be good to see it
      applied pretty quickly.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Cc: David S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      356f9e74
  3. 05 Sep, 2013 17 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · fc8cc677
      Linus Torvalds authored
      Pull IDE changes from David Miller:
       "Mostly cleanups, and changes part of tree-wide adjustments, this code
        is in deep freeze so that's pretty much what we expect these days"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: sgiioc4: Staticize ioc4_ide_attach_one()
        ide: palm_bk3710: add missing __iomem annotation
        ide: use dev_get_platdata()
        ide-disk_proc: use macro to replace magic number
        ide: replace strict_strtol() with kstrtol()
      fc8cc677
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · b14662ca
      Linus Torvalds authored
      Pull sparc changes from David Miller:
       "Several bug fixes (from Kirill Tkhai, Geery Uytterhoeven, and Alexey
        Dobriyan) and some support for Fujitsu sparc64x chips (from Allen
        Pais)"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Export flush_ptrace_access() (needed by lustre)
        sparc: fix PCI device proc file mmap(2)
        sparc64: Remove RWSEM export leftovers
        sparc64: Fix off by one in trampoline TLB mapping installation loop.
        sparc64: Fix ITLB handler of null page
        esp_scsi: Fix tag state corruption when autosensing.
        sparc64: Fix not SRA'ed %o5 in 32-bit traced syscall
        sparc64: cleanup: Rename ret_from_syscall to ret_from_fork
        sparc32: Fix exit flag passed from traced sys_sigreturn
        sparc64: Fix wrong syscall return value passed to trace_sys_exit()
        support sparc64x chip type in cpumap.c
        cpu hw caps support for sparc64x
      b14662ca
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · cc998ff8
      Linus Torvalds authored
      Pull networking changes from David Miller:
       "Noteworthy changes this time around:
      
         1) Multicast rejoin support for team driver, from Jiri Pirko.
      
         2) Centralize and simplify TCP RTT measurement handling in order to
            reduce the impact of bad RTO seeding from SYN/ACKs.  Also, when
            both timestamps and local RTT measurements are available prefer
            the later because there are broken middleware devices which
            scramble the timestamp.
      
            From Yuchung Cheng.
      
         3) Add TCP_NOTSENT_LOWAT socket option to limit the amount of kernel
            memory consumed to queue up unsend user data.  From Eric Dumazet.
      
         4) Add a "physical port ID" abstraction for network devices, from
            Jiri Pirko.
      
         5) Add a "suppress" operation to influence fib_rules lookups, from
            Stefan Tomanek.
      
         6) Add a networking development FAQ, from Paul Gortmaker.
      
         7) Extend the information provided by tcp_probe and add ipv6 support,
            from Daniel Borkmann.
      
         8) Use RCU locking more extensively in openvswitch data paths, from
            Pravin B Shelar.
      
         9) Add SCTP support to openvswitch, from Joe Stringer.
      
        10) Add EF10 chip support to SFC driver, from Ben Hutchings.
      
        11) Add new SYNPROXY netfilter target, from Patrick McHardy.
      
        12) Compute a rate approximation for sending in TCP sockets, and use
            this to more intelligently coalesce TSO frames.  Furthermore, add
            a new packet scheduler which takes advantage of this estimate when
            available.  From Eric Dumazet.
      
        13) Allow AF_PACKET fanouts with random selection, from Daniel
            Borkmann.
      
        14) Add ipv6 support to vxlan driver, from Cong Wang"
      
      Resolved conflicts as per discussion.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1218 commits)
        openvswitch: Fix alignment of struct sw_flow_key.
        netfilter: Fix build errors with xt_socket.c
        tcp: Add missing braces to do_tcp_setsockopt
        caif: Add missing braces to multiline if in cfctrl_linkup_request
        bnx2x: Add missing braces in bnx2x:bnx2x_link_initialize
        vxlan: Fix kernel panic on device delete.
        net: mvneta: implement ->ndo_do_ioctl() to support PHY ioctls
        net: mvneta: properly disable HW PHY polling and ensure adjust_link() works
        icplus: Use netif_running to determine device state
        ethernet/arc/arc_emac: Fix huge delays in large file copies
        tuntap: orphan frags before trying to set tx timestamp
        tuntap: purge socket error queue on detach
        qlcnic: use standard NAPI weights
        ipv6:introduce function to find route for redirect
        bnx2x: VF RSS support - VF side
        bnx2x: VF RSS support - PF side
        vxlan: Notify drivers for listening UDP port changes
        net: usbnet: update addr_assign_type if appropriate
        driver/net: enic: update enic maintainers and driver
        driver/net: enic: Exposing symbols for Cisco's low latency driver
        ...
      cc998ff8
    • Jesse Gross's avatar
      openvswitch: Fix alignment of struct sw_flow_key. · 0d40f75b
      Jesse Gross authored
      sw_flow_key alignment was declared as " __aligned(__alignof__(long))".
      However, this breaks on the m68k architecture where long is 32 bit in
      size but 16 bit aligned by default. This aligns to the size of a long to
      ensure that we can always do comparsions in full long-sized chunks. It
      also adds an additional build check to catch any reduction in alignment.
      
      CC: Andy Zhou <azhou@nicira.com>
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0d40f75b
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 57d73092
      Linus Torvalds authored
      Pull cputime fix from Ingo Molnar:
       "This fixes a longer-standing cputime accounting bug that Stanislaw
        Gruszka finally managed to track down"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/cputime: Do not scale when utime == 0
      57d73092
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 050ba07c
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "Fix for the annoying paravirt.o build warning under allmodconfig, and
        a MAINTAINERS file update"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, doc: Add an entry in MAINTAINERS for arch/x86/kernel/cpu/vmware.c
        x86, paravirt: Remove duplicate definition for DEF_NATIVE
      050ba07c
    • Jingoo Han's avatar
      ide: sgiioc4: Staticize ioc4_ide_attach_one() · 64110c16
      Jingoo Han authored
      ioc4_ide_attach_one() is used only in this file.
      Fix the following sparse warnings:
      
      drivers/ide/sgiioc4.c:603:5: warning: symbol 'ioc4_ide_attach_one' was not declared. Should it be static?
      Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      64110c16
    • Jingoo Han's avatar
      ide: palm_bk3710: add missing __iomem annotation · 70ddce83
      Jingoo Han authored
      Added missing __iomem annotation in order to fix the following
      sparse warnings:
      
      drivers/ide/palm_bk3710.c:194:31: warning: incorrect type in initializer (different address spaces)
      drivers/ide/palm_bk3710.c:194:31:    expected void [noderef] <asn:2>*base
      drivers/ide/palm_bk3710.c:194:31:    got void *<noident>
      drivers/ide/palm_bk3710.c:212:31: warning: incorrect type in initializer (different address spaces)
      drivers/ide/palm_bk3710.c:212:31:    expected void [noderef] <asn:2>*base
      drivers/ide/palm_bk3710.c:212:31:    got void *<noident>
      Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      70ddce83
    • Jingoo Han's avatar
      ide: use dev_get_platdata() · 7b6b5612
      Jingoo Han authored
      Use the wrapper function for retrieving the platform data instead of
      accessing dev->platform_data directly.
      Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7b6b5612
    • Xinghai Yu's avatar
      6fcf0497
    • Jingoo Han's avatar
      ide: replace strict_strtol() with kstrtol() · 79c8fa0b
      Jingoo Han authored
      The usage of strict_strtol() is not preferred, because
      strict_strtol() is obsolete. Thus, kstrtol() should be
      used.
      Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      79c8fa0b
    • Geert Uytterhoeven's avatar
      sparc64: Export flush_ptrace_access() (needed by lustre) · dc76f9ca
      Geert Uytterhoeven authored
      ERROR: "flush_ptrace_access" [drivers/staging/lustre/lustre/libcfs/libcfs.ko]
      undefined!
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      dc76f9ca
    • Alexey Dobriyan's avatar
      sparc: fix PCI device proc file mmap(2) · c4fe2448
      Alexey Dobriyan authored
      Commit 786d7e16 "Fix rmmod/read/write races in /proc entries"
      must have broken mmapping of PCI device proc files on Sparc.
      
      Notice how it adds wrapper around ->mmap but doesn't do it around ->get_unmapped_area.
      Add wrapper around ->get_unmapped_area.
      Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c4fe2448
    • Kirill Tkhai's avatar
      sparc64: Remove RWSEM export leftovers · 61d9b935
      Kirill Tkhai authored
      The functions
      
      			__down_read
      			__down_read_trylock
      			__down_write
      			__down_write_trylock
      			__up_read
      			__up_write
      			__downgrade_write
      
      are implemented inline, so remove corresponding EXPORT_SYMBOLs
      (They lead to compile errors on RT kernel).
      Signed-off-by: default avatarKirill Tkhai <tkhai@yandex.ru>
      CC: David Miller <davem@davemloft.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      61d9b935
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 06c54055
      David S. Miller authored
      Conflicts:
      	drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
      	net/bridge/br_multicast.c
      	net/ipv6/sit.c
      
      The conflicts were minor:
      
      1) sit.c changes overlap with change to ip_tunnel_xmit() signature.
      
      2) br_multicast.c had an overlap between computing max_delay using
         msecs_to_jiffies and turning MLDV2_MRC() into an inline function
         with a name using lowercase instead of uppercase letters.
      
      3) stmmac had two overlapping changes, one which conditionally allocated
         and hooked up a dma_cfg based upon the presence of the pbl OF property,
         and another one handling store-and-forward DMA made.  The latter of
         which should not go into the new of_find_property() basic block.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      06c54055
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 27c053aa
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
       "This series contains:
         - Exynos s5p-mfc driver got support for VP8 encoder
         - Some SoC drivers gained support for asynchronous registration
           (needed for DT)
         - The RC subsystem gained support for RC activity LED;
         - New drivers added: a video decoder(adv7842), a video encoder
           (adv7511), a new GSPCA driver (stk1135) and support for Renesas
           R-Car (vsp1)
         - the first SDR kernel driver: mirics msi3101.  Due to some troubles
           with the driver, and because the API is still under discussion, it
           will be merged at staging for 3.12.  Need to rework on it
         - usual new boards additions, fixes, cleanups and driver
           improvements"
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (242 commits)
        [media] cx88: Fix regression: CX88_AUDIO_WM8775 can't be 0
        [media] exynos4-is: Fix entity unregistration on error path
        [media] exynos-gsc: Register v4l2 device
        [media] exynos4-is: Fix fimc-lite bayer formats
        [media] em28xx: fix assignment of the eeprom data
        [media] hdpvr: fix iteration over uninitialized lists in hdpvr_probe()
        [media] usbtv: Throw corrupted frames away
        [media] usbtv: Fix deinterlacing
        [media] v4l2: added missing mutex.h include to v4l2-ctrls.h
        [media] DocBook: upgrade media_api DocBook version to 4.2
        [media] ml86v7667: fix compile warning: 'ret' set but not used
        [media] s5p-g2d: Fix registration failure
        [media] media: coda: Fix DT driver data pointer for i.MX27
        [media] s5p-mfc: Fix input/output format reporting
        [media] v4l: vsp1: Fix mutex double lock at streamon time
        [media] v4l: vsp1: Add support for RT clock
        [media] v4l: vsp1: Initialize media device bus_info field
        [media] davinci: vpif_capture: fix error return code in vpif_probe()
        [media] davinci: vpif_display: fix error return code in vpif_probe()
        [media] MAINTAINERS: add entries for adv7511 and adv7842
        ...
      27c053aa
    • David S. Miller's avatar
      netfilter: Fix build errors with xt_socket.c · 1a5bbfc3
      David S. Miller authored
      As reported by Randy Dunlap:
      
      ====================
      when CONFIG_IPV6=m
      and CONFIG_NETFILTER_XT_MATCH_SOCKET=y:
      
      net/built-in.o: In function `socket_mt6_v1_v2':
      xt_socket.c:(.text+0x51b55): undefined reference to `udp6_lib_lookup'
      net/built-in.o: In function `socket_mt_init':
      xt_socket.c:(.init.text+0x1ef8): undefined reference to `nf_defrag_ipv6_enable'
      ====================
      
      Like several other modules under net/netfilter/ we have to
      have a dependency "IPV6 disabled or set compatibly with this
      module" clause.
      Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1a5bbfc3