15 Apr, 2015

1 commit

  • Pull trivial tree from Jiri Kosina:
    "Usual trivial tree updates. Nothing outstanding -- mostly printk()
    and comment fixes and unused identifier removals"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
    goldfish: goldfish_tty_probe() is not using 'i' any more
    powerpc: Fix comment in smu.h
    qla2xxx: Fix printks in ql_log message
    lib: correct link to the original source for div64_u64
    si2168, tda10071, m88ds3103: Fix firmware wording
    usb: storage: Fix printk in isd200_log_config()
    qla2xxx: Fix printk in qla25xx_setup_mode
    init/main: fix reset_device comment
    ipwireless: missing assignment
    goldfish: remove unreachable line of code
    coredump: Fix do_coredump() comment
    stacktrace.h: remove duplicate declaration task_struct
    smpboot.h: Remove unused function prototype
    treewide: Fix typo in printk messages
    treewide: Fix typo in printk messages
    mod_devicetable: fix comment for match_flags

    Linus Torvalds
     

07 Mar, 2015

1 commit


04 Mar, 2015

1 commit

  • Pull networking fixes from David Miller:

    1) If an IPVS tunnel is created with a mixed-family destination
    address, it cannot be removed. Fix from Alexey Andriyanov.

    2) Fix module refcount underflow in netfilter's nft_compat, from Pablo
    Neira Ayuso.

    3) Generic statistics infrastructure can reference variables sitting on
    a released function stack, therefore use dynamic allocation always.
    Fix from Ignacy Gawędzki.

    4) skb_copy_bits() return value test is inverted in ip_check_defrag().

    5) Fix network namespace exit in openvswitch, we have to release all of
    the per-net vports. From Pravin B Shelar.

    6) Fix signedness bug in CAIF's cfpkt_iterate(), from Dan Carpenter.

    7) Fix rhashtable grow/shrink behavior, only expand during inserts and
    shrink during deletes. From Daniel Borkmann.

    8) Netdevice names with semicolons should never be allowed, because
    they serve as a separator. From Matthew Thode.

    9) Use {,__}set_current_state() where appropriate, from Fabian
    Frederick.

    10) Revert byte queue limits support in r8169 driver, it's causing
    regressions we can't figure out.

    11) tcp_should_expand_sndbuf() erroneously uses tp->packets_out to
    measure packets in flight, properly use tcp_packets_in_flight()
    instead. From Neal Cardwell.

    12) Fix accidental removal of support for bluetooth in CSR based Intel
    wireless cards. From Marcel Holtmann.

    13) We accidently added a behavioral change between native and compat
    tasks, wrt testing the MSG_CMSG_COMPAT bit. Just ignore it if the
    user happened to set it in a native binary as that was always the
    behavior we had. From Catalin Marinas.

    14) Check genlmsg_unicast() return valud in hwsim netlink tx frame
    handling, from Bob Copeland.

    15) Fix stale ->radar_required setting in mac80211 that can prevent
    starting new scans, from Eliad Peller.

    16) Fix memory leak in nl80211 monitor, from Johannes Berg.

    17) Fix race in TX index handling in xen-netback, from David Vrabel.

    18) Don't enable interrupts in amx-xgbe driver until all software et al.
    state is ready for the interrupt handler to run. From Thomas
    Lendacky.

    19) Add missing netlink_ns_capable() checks to rtnl_newlink(), from Eric
    W Biederman.

    20) The amount of header space needed in macvtap was not calculated
    properly, fix it otherwise we splat past the beginning of the
    packet. From Eric Dumazet.

    21) Fix bcmgenet TCP TX perf regression, from Jaedon Shin.

    22) Don't raw initialize or mod timers, use setup_timer() and
    mod_timer() instead. From Vaishali Thakkar.

    23) Fix software maintained statistics in bcmgenet and systemport
    drivers, from Florian Fainelli.

    24) DMA descriptor updates in sh_eth need proper memory barriers, from
    Ben Hutchings.

    25) Don't do UDP Fragmentation Offload on RAW sockets, from Michal
    Kubecek.

    26) Openvswitch's non-masked set actions aren't constructed properly
    into netlink messages, fix from Joe Stringer.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (116 commits)
    openvswitch: Fix serialization of non-masked set actions.
    gianfar: Reduce logging noise seen due to phy polling if link is down
    ibmveth: Add function to enable live MAC address changes
    net: bridge: add compile-time assert for cb struct size
    udp: only allow UFO for packets from SOCK_DGRAM sockets
    sh_eth: Really fix padding of short frames on TX
    Revert "sh_eth: Enable Rx descriptor word 0 shift for r8a7790"
    sh_eth: Fix RX recovery on R-Car in case of RX ring underrun
    sh_eth: Ensure proper ordering of descriptor active bit write/read
    net/mlx4_en: Disbale GRO for incoming loopback/selftest packets
    net/mlx4_core: Fix wrong mask and error flow for the update-qp command
    net: systemport: fix software maintained statistics
    net: bcmgenet: fix software maintained statistics
    rxrpc: don't multiply with HZ twice
    rxrpc: terminate retrans loop when sending of skb fails
    net/hsr: Fix NULL pointer dereference and refcnt bugs when deleting a HSR interface.
    net: pasemi: Use setup_timer and mod_timer
    net: stmmac: Use setup_timer and mod_timer
    net: 8390: axnet_cs: Use setup_timer and mod_timer
    net: 8390: pcnet_cs: Use setup_timer and mod_timer
    ...

    Linus Torvalds
     

23 Feb, 2015

1 commit


20 Feb, 2015

1 commit

  • Pull kconfig updates from Michal Marek:
    "Yann E Morin was supposed to take over kconfig maintainership, but
    this hasn't happened. So I'm sending a few kconfig patches that I
    collected:

    - Fix for missing va_end in kconfig
    - merge_config.sh displays used if given too few arguments
    - s/boolean/bool/ in Kconfig files for consistency, with the plan to
    only support bool in the future"

    * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    kconfig: use va_end to match corresponding va_start
    merge_config.sh: Display usage if given too few arguments
    kconfig: use bool instead of boolean for type definition attributes

    Linus Torvalds
     

06 Feb, 2015

1 commit

  • Conflicts:
    drivers/net/vxlan.c
    drivers/vhost/net.c
    include/linux/if_vlan.h
    net/core/dev.c

    The net/core/dev.c conflict was the overlap of one commit marking an
    existing function static whilst another was adding a new function.

    In the include/linux/if_vlan.h case, the type used for a local
    variable was changed in 'net', whereas the function got rewritten
    to fix a stacked vlan bug in 'net-next'.

    In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next'
    overlapped with an endainness fix for VHOST 1.0 in 'net'.

    In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter
    in 'net-next' whereas in 'net' there was a bug fix to pass in the
    correct network namespace pointer in calls to this function.

    Signed-off-by: David S. Miller

    David S. Miller
     

03 Feb, 2015

1 commit

  • The bug here is that we use "Reject" as the index into the cau_t[] array
    in the else path. Since the cau_t[] has 9 elements if Reject == 9 then
    we are reading beyond the end of the array.

    My understanding of the code is that it's saying that if Reject is 1 or
    too high then that's invalid and we should hang up.

    Signed-off-by: Dan Carpenter
    Signed-off-by: David S. Miller

    Dan Carpenter
     

15 Jan, 2015

1 commit


14 Jan, 2015

1 commit

  • Not all architectures are able to call __builtin_return_address().
    On ARM, the mISDN code produces this warning:

    hardware/mISDN/w6692.c: In function 'w6692_dctrl':
    hardware/mISDN/w6692.c:1181:75: warning: unsupported argument to '__builtin_return_address'
    pr_debug("%s: %s dev(%d) open from %p\n", card->name, __func__,
    ^
    hardware/mISDN/mISDNipac.c: In function 'open_dchannel':
    hardware/mISDN/mISDNipac.c:759:75: warning: unsupported argument to '__builtin_return_address'
    pr_debug("%s: %s dev(%d) open from %p\n", isac->name, __func__,
    ^

    In a lot of cases, this is relatively easy to work around by
    passing the value of __builtin_return_address(0) from the
    callers into the functions that want it. One exception is
    the indirect 'open' function call in struct isac_hw. While it
    would be possible to fix this as well, this patch only addresses
    the other callers properly and lets this one return the direct
    parent function, which should be good enough.

    Signed-off-by: Arnd Bergmann
    Signed-off-by: David S. Miller

    Arnd Bergmann
     

13 Jan, 2015

1 commit


07 Jan, 2015

1 commit


23 Aug, 2014

1 commit


18 Oct, 2013

1 commit


03 Oct, 2013

1 commit


16 Sep, 2013

1 commit


20 Jul, 2013

1 commit


02 May, 2013

1 commit

  • Pull VFS updates from Al Viro,

    Misc cleanups all over the place, mainly wrt /proc interfaces (switch
    create_proc_entry to proc_create(), get rid of the deprecated
    create_proc_read_entry() in favor of using proc_create_data() and
    seq_file etc).

    7kloc removed.

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (204 commits)
    don't bother with deferred freeing of fdtables
    proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
    proc: Make the PROC_I() and PDE() macros internal to procfs
    proc: Supply a function to remove a proc entry by PDE
    take cgroup_open() and cpuset_open() to fs/proc/base.c
    ppc: Clean up scanlog
    ppc: Clean up rtas_flash driver somewhat
    hostap: proc: Use remove_proc_subtree()
    drm: proc: Use remove_proc_subtree()
    drm: proc: Use minor->index to label things, not PDE->name
    drm: Constify drm_proc_list[]
    zoran: Don't print proc_dir_entry data in debug
    reiserfs: Don't access the proc_dir_entry in r_open(), r_start() r_show()
    proc: Supply an accessor for getting the data from a PDE's parent
    airo: Use remove_proc_subtree()
    rtl8192u: Don't need to save device proc dir PDE
    rtl8187se: Use a dir under /proc/net/r8180/
    proc: Add proc_mkdir_data()
    proc: Move some bits from linux/proc_fs.h to linux/{of.h,signal.h,tty.h}
    proc: Move PDE_NET() to fs/proc/proc_net.c
    ...

    Linus Torvalds
     

10 Apr, 2013

1 commit

  • The only part of proc_dir_entry the code outside of fs/proc
    really cares about is PDE(inode)->data. Provide a helper
    for that; static inline for now, eventually will be moved
    to fs/proc, along with the knowledge of struct proc_dir_entry
    layout.

    Signed-off-by: Al Viro

    Al Viro
     

16 Mar, 2013

1 commit


27 Feb, 2013

1 commit

  • Pull vfs pile (part one) from Al Viro:
    "Assorted stuff - cleaning namei.c up a bit, fixing ->d_name/->d_parent
    locking violations, etc.

    The most visible changes here are death of FS_REVAL_DOT (replaced with
    "has ->d_weak_revalidate()") and a new helper getting from struct file
    to inode. Some bits of preparation to xattr method interface changes.

    Misc patches by various people sent this cycle *and* ocfs2 fixes from
    several cycles ago that should've been upstream right then.

    PS: the next vfs pile will be xattr stuff."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (46 commits)
    saner proc_get_inode() calling conventions
    proc: avoid extra pde_put() in proc_fill_super()
    fs: change return values from -EACCES to -EPERM
    fs/exec.c: make bprm_mm_init() static
    ocfs2/dlm: use GFP_ATOMIC inside a spin_lock
    ocfs2: fix possible use-after-free with AIO
    ocfs2: Fix oops in ocfs2_fast_symlink_readpage() code path
    get_empty_filp()/alloc_file() leave both ->f_pos and ->f_version zero
    target: writev() on single-element vector is pointless
    export kernel_write(), convert open-coded instances
    fs: encode_fh: return FILEID_INVALID if invalid fid_type
    kill f_vfsmnt
    vfs: kill FS_REVAL_DOT by adding a d_weak_revalidate dentry op
    nfsd: handle vfs_getattr errors in acl protocol
    switch vfs_getattr() to struct path
    default SET_PERSONALITY() in linux/elf.h
    ceph: prepopulate inodes only when request is aborted
    d_hash_and_lookup(): export, switch open-coded instances
    9p: switch v9fs_set_create_acl() to inode+fid, do it before d_instantiate()
    9p: split dropping the acls from v9fs_set_create_acl()
    ...

    Linus Torvalds
     

23 Feb, 2013

1 commit


22 Feb, 2013

1 commit

  • Pull trivial tree from Jiri Kosina:
    "Assorted tiny fixes queued in trivial tree"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits)
    DocBook: update EXPORT_SYMBOL entry to point at export.h
    Documentation: update top level 00-INDEX file with new additions
    ARM: at91/ide: remove unsused at91-ide Kconfig entry
    percpu_counter.h: comment code for better readability
    x86, efi: fix comment typo in head_32.S
    IB: cxgb3: delay freeing mem untill entirely done with it
    net: mvneta: remove unneeded version.h include
    time: x86: report_lost_ticks doesn't exist any more
    pcmcia: avoid static analysis complaint about use-after-free
    fs/jfs: Fix typo in comment : 'how may' -> 'how many'
    of: add missing documentation for of_platform_populate()
    btrfs: remove unnecessary cur_trans set before goto loop in join_transaction
    sound: soc: Fix typo in sound/codecs
    treewide: Fix typo in various drivers
    btrfs: fix comment typos
    Update ibmvscsi module name in Kconfig.
    powerpc: fix typo (utilties -> utilities)
    of: fix spelling mistake in comment
    h8300: Fix home page URL in h8300/README
    xtensa: Fix home page URL in Kconfig
    ...

    Linus Torvalds
     

29 Jan, 2013

1 commit


19 Jan, 2013

1 commit

  • The option allows you to remove TTY and compile without errors. This
    saves space on systems that won't support TTY interfaces anyway.
    bloat-o-meter output is below.

    The bulk of this patch consists of Kconfig changes adding "depends on
    TTY" to various serial devices and similar drivers that require the TTY
    layer. Ideally, these dependencies would occur on a common intermediate
    symbol such as SERIO, but most drivers "select SERIO" rather than
    "depends on SERIO", and "select" does not respect dependencies.

    bloat-o-meter output comparing our previous minimal to new minimal by
    removing TTY. The list is filtered to not show removed entries with awk
    '$3 != "-"' as the list was very long.

    add/remove: 0/226 grow/shrink: 2/14 up/down: 6/-35356 (-35350)
    function old new delta
    chr_dev_init 166 170 +4
    allow_signal 80 82 +2
    static.__warned 143 142 -1
    disallow_signal 63 62 -1
    __set_special_pids 95 94 -1
    unregister_console 126 121 -5
    start_kernel 546 541 -5
    register_console 593 588 -5
    copy_from_user 45 40 -5
    sys_setsid 128 120 -8
    sys_vhangup 32 19 -13
    do_exit 1543 1526 -17
    bitmap_zero 60 40 -20
    arch_local_irq_save 137 117 -20
    release_task 674 652 -22
    static.spin_unlock_irqrestore 308 260 -48

    Signed-off-by: Joe Millenbach
    Reviewed-by: Jamey Sharp
    Reviewed-by: Josh Triplett
    Signed-off-by: Greg Kroah-Hartman

    Joe Millenbach
     

04 Jan, 2013

1 commit

  • CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
    markings need to be removed.

    This change removes the use of __devinit, __devexit_p, __devinitdata,
    and __devexit from these drivers.

    Based on patches originally written by Bill Pemberton, but redone by me
    in order to handle some of the coding style issues better, by hand.

    Cc: Bill Pemberton
    Cc: Karsten Keil
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

03 Jan, 2013

1 commit


19 Nov, 2012

1 commit


10 Nov, 2012

1 commit


26 Oct, 2012

1 commit


14 Sep, 2012

1 commit

  • It is a bad idea to hold a spinlock and call flush_work_sync.
    Move the workqueue cleanup outside the spinlock and use cancel_work_sync,
    on closing the channel this seems to be the more correct function.
    Remove the never used and constant return value of mISDN_freebchannel.

    Signed-off-by: Karsten Keil
    Cc:
    Signed-off-by: David S. Miller

    Karsten Keil
     

04 Sep, 2012

1 commit


30 Jul, 2012

1 commit


19 Jul, 2012

1 commit


25 May, 2012

1 commit

  • Pull more networking updates from David Miller:
    "Ok, everything from here on out will be bug fixes."

    1) One final sync of wireless and bluetooth stuff from John Linville.
    These changes have all been in his tree for more than a week, and
    therefore have had the necessary -next exposure. John was just away
    on a trip and didn't have a change to send the pull request until a
    day or two ago.

    2) Put back some defines in user exposed header file areas that were
    removed during the tokenring purge. From Stephen Hemminger and Paul
    Gortmaker.

    3) A bug fix for UDP hash table allocation got lost in the pile due to
    one of those "you got it.. no I've got it.." situations. :-)

    From Tim Bird.

    4) SKB coalescing in TCP needs to have stricter checks, otherwise we'll
    try to coalesce overlapping frags and crash. Fix from Eric Dumazet.

    5) RCU routing table lookups can race with free_fib_info(), causing
    crashes when we deref the device pointers in the route. Fix by
    releasing the net device in the RCU callback. From Yanmin Zhang.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (293 commits)
    tcp: take care of overlaps in tcp_try_coalesce()
    ipv4: fix the rcu race between free_fib_info and ip_route_output_slow
    mm: add a low limit to alloc_large_system_hash
    ipx: restore token ring define to include/linux/ipx.h
    if: restore token ring ARP type to header
    xen: do not disable netfront in dom0
    phy/micrel: Fix ID of KSZ9021
    mISDN: Add X-Tensions USB ISDN TA XC-525
    gianfar:don't add FCB length to hard_header_len
    Bluetooth: Report proper error number in disconnection
    Bluetooth: Create flags for bt_sk()
    Bluetooth: report the right security level in getsockopt
    Bluetooth: Lock the L2CAP channel when sending
    Bluetooth: Restore locking semantics when looking up L2CAP channels
    Bluetooth: Fix a redundant and problematic incoming MTU check
    Bluetooth: Add support for Foxconn/Hon Hai AR5BBU22 0489:E03C
    Bluetooth: Fix EIR data generation for mgmt_device_found
    Bluetooth: Fix Inquiry with RSSI event mask
    Bluetooth: improve readability of l2cap_seq_list code
    Bluetooth: Fix skb length calculation
    ...

    Linus Torvalds
     

23 May, 2012

2 commits

  • Pull USB 3.5-rc1 changes from Greg Kroah-Hartman:
    "Here is the big USB 3.5-rc1 pull request for the 3.5-rc1 merge window.

    It's touches a lot of different parts of the kernel, all USB drivers,
    due to some API cleanups (getting rid of the ancient err() macro) and
    some changes that are needed for USB 3.0 power management updates.

    There are also lots of new drivers, pimarily gadget, but others as
    well. We deleted a staging driver, which was nice, and finally
    dropped the obsolete usbfs code, which will make Al happy to never
    have to touch that again.

    There were some build errors in the tree that linux-next found a few
    days ago, but those were fixed by the most recent changes (all were
    due to us not building with CONFIG_PM disabled.)

    Signed-off-by: Greg Kroah-Hartman "

    * tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (477 commits)
    xhci: Fix DIV_ROUND_UP compile error.
    xhci: Fix compile with CONFIG_USB_SUSPEND=n
    USB: Fix core compile with CONFIG_USB_SUSPEND=n
    brcm80211: Fix compile error for .disable_hub_initiated_lpm.
    Revert "USB: EHCI: work around bug in the Philips ISP1562 controller"
    MAINTAINERS: Add myself as maintainer to the USB PHY Layer
    USB: EHCI: fix command register configuration lost problem
    USB: Remove races in devio.c
    USB: ehci-platform: remove update_device
    USB: Disable hub-initiated LPM for comms devices.
    xhci: Add Intel U1/U2 timeout policy.
    xhci: Add infrastructure for host-specific LPM policies.
    USB: Add macros for interrupt endpoint types.
    xhci: Reserve one command for USB3 LPM disable.
    xhci: Some Evaluate Context commands must succeed.
    USB: Disable USB 3.0 LPM in critical sections.
    USB: Add support to enable/disable USB3 link states.
    USB: Allow drivers to disable hub-initiated LPM.
    USB: Calculate USB 3.0 exit latencies for LPM.
    USB: Refactor code to set LPM support flag.
    ...

    Conflicts:
    arch/arm/mach-exynos/mach-nuri.c
    arch/arm/mach-exynos/mach-universal_c210.c
    drivers/net/wireless/ath/ath6kl/usb.c

    Linus Torvalds
     
  • According to http://www.ip-phone-forum.de/showthread.php?t=225313 this
    HW works. Thanks to Lars Immisch for pointing to this thread.

    Signed-off-by: Karsten Keil
    Signed-off-by: David S. Miller

    Karsten Keil
     

19 May, 2012

1 commit

  • Hub-initiated LPM is not good for USB communications devices. Comms
    devices should be able to tell when their link can go into a lower power
    state, because they know when an incoming transmission is finished.
    Ideally, these devices would slam their links into a lower power state,
    using the device-initiated LPM, after finishing the last packet of their
    data transfer.

    If we enable the idle timeouts for the parent hubs to enable
    hub-initiated LPM, we will get a lot of useless LPM packets on the bus
    as the devices reject LPM transitions when they're in the middle of
    receiving data. Worse, some devices might blindly accept the
    hub-initiated LPM and power down their radios while they're in the
    middle of receiving a transmission.

    The Intel Windows folks are disabling hub-initiated LPM for all USB
    communications devices under a xHCI USB 3.0 host. In order to keep
    the Linux behavior as close as possible to Windows, we need to do the
    same in Linux.

    Set the disable_hub_initiated_lpm flag for for all USB communications
    drivers. I know there aren't currently any USB 3.0 devices that
    implement these class specifications, but we should be ready if they do.

    Signed-off-by: Sarah Sharp
    Cc: Marcel Holtmann
    Cc: Gustavo Padovan
    Cc: Johan Hedberg
    Cc: Hansjoerg Lipp
    Cc: Tilman Schmidt
    Cc: Karsten Keil
    Cc: Peter Korsgaard
    Cc: Jan Dumon
    Cc: Petko Manolov
    Cc: Steve Glendinning
    Cc: "John W. Linville"
    Cc: Kalle Valo
    Cc: "Luis R. Rodriguez"
    Cc: Jouni Malinen
    Cc: Vasanthakumar Thiagarajan
    Cc: Senthil Balasubramanian
    Cc: Christian Lamparter
    Cc: Brett Rudley
    Cc: Roland Vossen
    Cc: Arend van Spriel
    Cc: "Franky (Zhenhui) Lin"
    Cc: Kan Yan
    Cc: Dan Williams
    Cc: Jussi Kivilinna
    Cc: Ivo van Doorn
    Cc: Gertjan van Wingerde
    Cc: Helmut Schaa
    Cc: Herton Ronaldo Krzesinski
    Cc: Hin-Tak Leung
    Cc: Larry Finger
    Cc: Chaoming Li
    Cc: Daniel Drake
    Cc: Ulrich Kunitz
    Signed-off-by: Sarah Sharp

    Sarah Sharp
     

17 May, 2012

3 commits