10 Apr, 2015

3 commits


09 Apr, 2015

2 commits

  • Samuel Ortiz says:

    ====================
    NFC: 4.1 pull request

    This is the NFC pull request for 4.1.

    This is a shorter one than usual, as the Intel Field Peak NFC
    driver could not make it in time.

    We have:

    - A new driver for NXP NCI based chipsets, like e.g. the NPC100 or
    the PN7150. It currently only supports an i2c physical layer, but
    could easily be extended to work on top of e.g. SPI.
    This driver also includes support for user space triggered firmware
    updates.

    - A few minor st21nfc[ab] fixes, cleanups, and comments improvements.

    - A pn533 error return fix.

    - A few NFC related logs formatting cleanups.
    ====================

    Signed-off-by: David S. Miller

    David S. Miller
     
  • The DWMAC block on certain SoCs (such as IMG Pistachio) have a second
    clock which must be enabled in order to access the peripheral's
    register interface, so add support for requesting and enabling an
    optional "pclk".

    Signed-off-by: Andrew Bresticker
    Cc: James Hartley
    Cc: Arnd Bergmann
    Signed-off-by: David S. Miller

    Andrew Bresticker
     

07 Apr, 2015

4 commits

  • Conflicts:
    drivers/net/ethernet/mellanox/mlx4/cmd.c
    net/core/fib_rules.c
    net/ipv4/fib_frontend.c

    The fib_rules.c and fib_frontend.c conflicts were locking adjustments
    in 'net' overlapping addition and removal of code in 'net-next'.

    The mlx4 conflict was a bug fix in 'net' happening in the same
    place a constant was being replaced with a more suitable macro.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Pull networking fixes from David Miller:

    1) In TCP, don't register an FRTO for cumulatively ACK'd data that was
    previously SACK'd, from Neal Cardwell.

    2) Need to hold RNL mutex in ipv4 multicast code namespace cleanup,
    from Cong WANG.

    3) Similarly we have to hold RNL mutex for fib_rules_unregister(), also
    from Cong WANG.

    4) Revert and rework netns nsid allocation fix, from Nicolas Dichtel.

    5) When we encapsulate for a tunnel device, skb->sk still points to the
    user socket. So this leads to cases where we retraverse the
    ipv4/ipv6 output path with skb->sk being of some other address
    family (f.e. AF_PACKET). This can cause things to crash since the
    ipv4 output path is dereferencing an AF_PACKET socket as if it were
    an ipv4 one.

    The short term fix for 'net' and -stable is to elide these socket
    checks once we've entered an encapsulation sequence by testing
    xmit_recursion.

    Longer term we have a better solution wherein we pass the tunnel's
    socket down through the output paths, but that is way too invasive
    for 'net' and -stable.

    From Hannes Frederic Sowa.

    6) l2tp_init() failure path forgets to unregister per-net ops, from
    Cong WANG.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
    net/mlx4_core: Fix error message deprecation for ConnectX-2 cards
    net: dsa: fix filling routing table from OF description
    l2tp: unregister l2tp_net_ops on failure path
    mvneta: dont call mvneta_adjust_link() manually
    ipv6: protect skb->sk accesses from recursive dereference inside the stack
    netns: don't allocate an id for dead netns
    Revert "netns: don't clear nsid too early on removal"
    ip6mr: call del_timer_sync() in ip6mr_free_table()
    net: move fib_rules_unregister() under rtnl lock
    ipv4: take rtnl_lock and mark mrt table as freed on namespace cleanup
    tcp: fix FRTO undo on cumulative ACK of SACKed range
    xen-netfront: transmit fully GSO-sized packets

    Linus Torvalds
     
  • According to description in 'include/net/dsa.h', in cascade switches
    configurations where there are more than one interconnected devices,
    'rtable' array in 'dsa_chip_data' structure is used to indicate which
    port on this switch should be used to send packets to that are destined
    for corresponding switch.

    However, dsa_of_setup_routing_table() fills 'rtable' with port numbers
    of the _target_ switch, but not current one.

    This commit removes redundant devicetree parsing and adds needed port
    number as a function argument. So dsa_of_setup_routing_table() now just
    looks for target switch number by parsing parent of 'link' device node.

    To remove possible misunderstandings with the way of determining target
    switch number, a corresponding comment was added to the source code and
    to the DSA device tree bindings documentation file.

    This was tested on a custom board with two Marvell 88E6095 switches with
    following corresponding routing tables: { -1, 10 } and { 8, -1 }.

    Signed-off-by: Pavel Nakonechny
    Reviewed-by: Andrew Lunn
    Reviewed-by: Florian Fainelli
    Signed-off-by: David S. Miller

    Pavel Nakonechny
     
  • Pull input fixes from Dmitry Torokhov:
    "Updates for the input subsystem - two more tweaks for ALPS driver to
    work out kinks after splitting the touchpad, trackstick, and potential
    external PS/2 mouse into separate input devices.

    Changes to support ALPS SS4 devices (protocol V8) will be coming in
    4.1..."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: alps - document stick behavior for protocol V2
    Input: alps - report V2 Dualpoint Stick events via the right evdev node
    Input: alps - report interleaved bare PS/2 packets via dev3

    Linus Torvalds
     

06 Apr, 2015

1 commit


04 Apr, 2015

1 commit

  • Pull input subsystem fixes from Dmitry Torokhov:
    "A fix for ALPS driver for issue introduced in the latest update and a
    tweak for yet another Lenovo box in Synaptics.

    There will be more ALPS tweaks coming.."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: define INPUT_PROP_ACCELEROMETER behavior
    Input: synaptics - fix min-max quirk value for E440
    Input: synaptics - add quirk for Thinkpad E440
    Input: ALPS - fix max coordinates for v5 and v7 protocols
    Input: add MT_TOOL_PALM

    Linus Torvalds
     

01 Apr, 2015

2 commits

  • The CAN_RAW socket can set multiple CAN identifier specific filters that lead
    to multiple filters in the af_can.c filter processing. These filters are
    indenpendent from each other which leads to logical OR'ed filters when applied.

    This socket option joines the given CAN filters in the way that only CAN frames
    are passed to user space that matched *all* given CAN filters. The semantic for
    the applied filters is therefore changed to a logical AND.

    This is useful especially when the filterset is a combination of filters where
    the CAN_INV_FILTER flag is set in order to notch single CAN IDs or CAN ID
    ranges from the incoming traffic.

    As the raw_rcv() function is executed from NET_RX softirq the introduced
    variables are implemented as per-CPU variables to avoid extensive locking at
    CAN frame reception time.

    Signed-off-by: Oliver Hartkopp
    Signed-off-by: Marc Kleine-Budde

    Oliver Hartkopp
     
  • Spell out what this property means to userspace. If the property is set, all
    directional axes must be accelerometer axes, any other axes are left as-is.
    This allows an accelerometer device to e.g. have an ABS_WHEEL.

    It is not permitted to mix normal directional axes and accelerometer axes on
    the same device node.

    Signed-off-by: Peter Hutterer
    Acked-by: Jiri Kosina
    Reviewed-by: Bastien Nocera
    Signed-off-by: Dmitry Torokhov

    Peter Hutterer
     

28 Mar, 2015

1 commit


26 Mar, 2015

1 commit


25 Mar, 2015

1 commit

  • If vlan offloading takes place then vlan header is removed from frame
    and its contents, both vlan_tci and vlan_proto, is available to user
    space via TPACKET interface. However, only vlan_tci can be used in BPF
    filters.

    This commit introduces a new BPF extension. It makes possible to load
    the value of vlan_proto (vlan TPID) to register A. Support for classic
    BPF and eBPF is being added, analogous to skb->protocol.

    Cc: Daniel Borkmann
    Cc: Alexei Starovoitov
    Cc: Jiri Pirko

    Signed-off-by: Michal Sekletar
    Acked-by: Daniel Borkmann
    Acked-by: Alexei Starovoitov
    Reviewed-by: Jiri Pirko
    Signed-off-by: David S. Miller

    Michal Sekletar
     

24 Mar, 2015

2 commits


21 Mar, 2015

5 commits

  • NetCP 1.5 available on newer K2 SoCs such as K2E and K2L introduced 3
    variants of the ethss subsystem, 9 port, 5 port and 2 port. These have
    one host port towards the CPU and N external slave ports.

    To customize the driver for these new ethss sub systems, multiple
    compatibility strings are introduced. Currently some of parameters that
    are different on different variants such as number of ALE ports, stats
    modules and number of ports are defined through constants. These are now
    changed to variables in gbe_priv data that get set based on the
    compatibility string. This is required as there are no hardware
    identification registers available to distinguish among the variants
    of NetCP 1.5 ethss. However there is identification register available
    to differentiate between NetCP 1.4 vs NetCP 1.5 and the same is made use
    of in the code to differentiate them.

    For more reading on the details of this peripheral, please refer to the
    User Guide available at http://www.ti.com/lit/pdf/spruhz3

    Signed-off-by: Murali Karicheri
    Signed-off-by: WingMan Kwok
    CC: "David S. Miller"
    CC: Mugunthan V N
    CC: "Lad, Prabhakar"
    CC: Grygorii Strashko
    CC: Christoph Jaeger
    CC: Lokesh Vutla
    CC: Markus Pargmann
    CC: Kumar Gala
    CC: Ian Campbell
    CC: Mark Rutland
    CC: Pawel Moll
    CC: Rob Herring
    Signed-off-by: David S. Miller

    WingMan Kwok
     
  • Ethss has multiple modules within the sub system
    - switch sub system
    - sgmii
    - mdio
    - switch module

    NetCP driver re-uses existing davinci mdio driver. It requires to
    have its own register region to map the reg space. So restructure
    the code to use separate reg region for the individual modules it
    manages. Use range property to define register space of NetCP and
    use reg property to define individual reg spaces. So MDIO will have
    its own reg space to map. This is a pre-requisite to enable MDIO
    driver for NetCP.

    Signed-off-by: Murali Karicheri
    Signed-off-by: WingMan Kwok
    CC: "David S. Miller"
    CC: Mugunthan V N
    CC: "Lad, Prabhakar"
    CC: Grygorii Strashko
    CC: Christoph Jaeger
    CC: Lokesh Vutla
    CC: Markus Pargmann
    CC: Kumar Gala
    CC: Ian Campbell
    CC: Mark Rutland
    CC: Pawel Moll
    CC: Rob Herring
    Signed-off-by: David S. Miller

    Karicheri, Muralidharan
     
  • Signed-off-by: YOSHIFUJI Hideaki
    Signed-off-by: David S. Miller

    YOSHIFUJI Hideaki/吉藤英明
     
  • Conflicts:
    drivers/net/ethernet/emulex/benet/be_main.c
    net/core/sysctl_net_core.c
    net/ipv4/inet_diag.c

    The be_main.c conflict resolution was really tricky. The conflict
    hunks generated by GIT were very unhelpful, to say the least. It
    split functions in half and moved them around, when the real actual
    conflict only existed solely inside of one function, that being
    be_map_pci_bars().

    So instead, to resolve this, I checked out be_main.c from the top
    of net-next, then I applied the be_main.c changes from 'net' since
    the last time I merged. And this worked beautifully.

    The inet_diag.c and sysctl_net_core.c conflicts were simple
    overlapping changes, and were easily to resolve.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Currently there are only two "tools" that can be specified by a multi-touch
    driver: MT_TOOL_FINGER and MT_TOOL_PEN. In working with Elan (The touch
    vendor) and discussing their next-gen devices it seems that it will be
    useful to have more tools so that their devices can give the upper layers
    of the stack hints as to what is touching the sensor.

    In particular they have new experimental firmware that can better
    differentiate between palms vs fingertips and would like to plumb a patch
    so that we can use their hints in higher-level gesture soft- ware. The
    firmware on the device can reasonably do a better job of palm detection
    because it has access to all of the raw sensor readings as opposed to just
    the width/pressure/etc that are exposed by the driver. As such, the
    firmware can characterize what a palm looks like in much finer-grained
    detail and this change would allow such a device to share its findings with
    the kernel.

    Signed-off-by: Charlie Mooney
    Acked-by: Peter Hutterer
    Signed-off-by: Dmitry Torokhov

    Charlie Mooney
     

20 Mar, 2015

1 commit

  • …etooth/bluetooth-next

    Johan Hedberg says:

    ====================
    pull request: bluetooth-next 2015-03-19

    This wont the last 4.1 bluetooth-next pull request, but we've piled up
    enough patches in less than a week that I wanted to save you from a
    single huge "last-minute" pull somewhere closer to the merge window.

    The main changes are:

    - Simultaneous LE & BR/EDR discovery support for HW that can do it
    - Complete LE OOB pairing support
    - More fine-grained mgmt-command access control (normal user can now do
    harmless read-only operations).
    - Added RF power amplifier support in cc2520 ieee802154 driver
    - Some cleanups/fixes in ieee802154 code

    Please let me know if there are any issues pulling. Thanks.
    ====================

    Signed-off-by: David S. Miller <davem@davemloft.net>

    David S. Miller
     

19 Mar, 2015

4 commits

  • Similar to port id allow netdevices to specify port names and export
    the name via sysfs. Drivers can implement the netdevice operation to
    assist udev in having sane default names for the devices using the
    rule:

    $ cat /etc/udev/rules.d/80-net-setup-link.rules
    SUBSYSTEM=="net", ACTION=="add", ATTR{phys_port_name}!="",
    NAME="$attr{phys_port_name}"

    Use of phys_name versus phys_id was suggested-by Jiri Pirko.

    Signed-off-by: David Ahern
    Acked-by: Jiri Pirko
    Acked-by: Scott Feldman
    Signed-off-by: David S. Miller

    David Ahern
     
  • This adds a tx_maxrate attribute to the tx queue sysfs entry allowing
    for max-rate limiting. Along with DCB-ETS and BQL this provides another
    knob to tune queue performance. The limit units are Mbps.

    By default it is disabled. To disable the rate limitation after it
    has been set for a queue, it should be set to zero.

    Signed-off-by: John Fastabend
    Signed-off-by: Or Gerlitz
    Signed-off-by: David S. Miller

    John Fastabend
     
  • The TI CC2521 is an RF power amplifier that is designed to interface
    with the CC2520. Conveniently, it directly interfaces with the CC2520
    and does not require any pins to be connected to a
    microcontroller/processor. Adding a CC2591 increases the CC2520's range,
    which is useful for border router and other wall-powered applications.

    Using the CC2591 with the CC2520 requires configuring the CC2520 GPIOs
    that are connected to the CC2591 to correctly set the CC2591 into TX and
    RX modes. Further, TI recommends that the CC2520_TXPOWER and
    CC2520_AGCCTRL1 registers are set differently to maximize the CC2591's
    performance. These settings are covered in TI Application Note AN065.

    This patch adds an optional `amplified` field to the cc2520 entry in the
    device tree. If present, the CC2520 will be configured to operate with a
    CC2591.

    The expected pin mapping is:
    CC2520 GPIO0 --> CC2591 EN
    CC2520 GPIO5 --> CC2591 PAEN

    Signed-off-by: Brad Campbell
    Acked-by: Varka Bhadram
    Signed-off-by: Marcel Holtmann

    Brad Campbell
     
  • Signed-off-by: Keyur Chudgar
    Signed-off-by: Iyappan Subramanian
    Signed-off-by: David S. Miller

    Keyur Chudgar
     

16 Mar, 2015

1 commit

  • Pull ARM SoC fixes from Arnd Bergmann:
    "This is a rather unpleasantly large set of bug fixes for arm-soc, Most
    of them because of cross-tree dependencies for Exynos where we should
    have figured out the right path to merge things before the merge
    window, and then the maintainer being unable to sort things out in
    time during a business trip.

    The other changes contained here are the usual collection:

    MAINTAINERS file updates
    - Gregory Clement is now a co-maintainer for the legacy Marvell EBU
    platforms
    - A MAINTAINERS entry for the Freescale Vybrid platform that was
    added last year
    - Matt Porter no longer works as a maintainer on Broadcom SoCs

    Build-time issues
    - A compile-time error for at91
    - Several minor DT fixes on at91, imx, exynos, socfpga, and omap
    - The new digicolor platform was not correctly enabled at all

    Configuration issues
    - Two defconfig fix for regressions using USB on versatile express
    and on OMAP3
    - Enabling all 8 CPUs on Allwinner/SUNxi
    - Enabling the new STiH410 platform to be usable

    Bug fixes in platform code
    - A missing barrier for socfpga
    - Fixing LPDDR1 self-refresh mode on at91
    - Fixing RTC interrupt numbers on Exynos3250
    - Fixing a cache-coherency issues in CPU power-down on Exynos5
    - Multiple small OMAP power management fixes"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (69 commits)
    MAINTAINERS: Add myself as co-maintainer to the legacy support of the mvebu SoCs
    ARM: at91: pm_slowclock: fix the compilation error
    ARM: at91/dt: fix USB high-speed clock to select UTMI
    ARM: at91/dt: fix at91 udc compatible strings
    ARM: at91/dt: declare matrix node as a syscon device
    ARM: vexpress: update CONFIG_USB_ISP1760 option
    ARM: digicolor: add the machine directory to Makefile
    ARM: STi: Add STiH410 SoC support
    MAINTAINERS: add Freescale Vybrid SoC
    MAINTAINERS: Remove self as ARM mach-bcm co-maintainer
    ARM: imx6sl-evk: set swbst_reg as vbus's parent reg
    ARM: imx6qdl-sabresd: set swbst_reg as vbus's parent reg
    ARM: at91/dt: at91sam9261: fix clocks and clock-names in udc definition
    ARM: OMAP2+: Fix wl12xx on dm3730-evm with mainline u-boot
    ARM: OMAP: enable TWL4030_USB in omap2plus_defconfig
    ARM: dts: dra7x-evm: avoid possible contention while muxing on CAN lines
    ARM: dts: dra7x-evm: Don't use dcan1_rx.gpio1_15 in DCAN pinctrl
    ARM: dts: am43xx: fix SLEWCTRL_FAST pinctrl binding
    ARM: dts: am33xx: fix SLEWCTRL_FAST pinctrl binding
    ARM: dts: OMAP5: fix polling intervals for thermal zones
    ...

    Linus Torvalds
     

14 Mar, 2015

1 commit

  • Pull DeviceTree fixes from Rob Herring:

    - fix for stdout-path option parsing with added unittest

    - fix for stdout-path interaction with earlycon

    - several DT unittest fixes

    - fix Sparc allmodconfig build error on of_platform_register_reconfig_notifier

    - several DT overlay kconfig and build warning fixes

    - several DT binding documentation updates

    * tag 'devicetree-fixes-for-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
    of/platform: Fix sparc:allmodconfig build
    of: unittest: Add options string testcase variants
    of: fix handling of '/' in options for of_find_node_by_path()
    of/unittest: Fix the wrong expected value in of_selftest_property_string
    of/unittest: remove the duplicate of_changeset_init
    dt: submitting-patches: clarify that DT maintainers are to be cced on bindings
    of: unittest: fix I2C dependency
    of/overlay: Remove unused variable
    Documentation: DT: Renamed of-serial.txt to 8250.txt
    of: Fix premature bootconsole disable with 'stdout-path'
    serial: add device tree binding documentation for ETRAX FS UART
    of/overlay: Directly include idr.h
    of: Drop superfluous dependance for OF_OVERLAY
    of: Add vendor prefix for Arasan
    of: Add prompt for OF_OVERLAY config

    Linus Torvalds
     

11 Mar, 2015

1 commit

  • This patch adds support to STiH410 SoC.

    Please note "st,stih410" is already present in device tree.
    The problem is that it is missing the entry in the match table,
    and so the L2 cache and other cpus than 0 don't get initialized.

    Signed-off-by: Fabrice Gasnier
    Tested-by: Maxime Coquelin
    Acked-by: Peter Griffin
    Acked-by: Lee Jones
    Signed-off-by: Maxime Coquelin
    Signed-off-by: Arnd Bergmann

    Fabrice GASNIER
     

10 Mar, 2015

5 commits

  • The exact steps provided for submitting binding patches can be read
    as requiring the bindings to be sent only to the devicetree@vger.kernel.org
    list. Since the DT maintainers would like to be Cced on any binding
    submissions, make this requirement explicit in step 2.

    Signed-off-by: Matt Porter
    Signed-off-by: Rob Herring

    Matt Porter
     
  • The file of-serial.txt was only for 8250 compatible UART implementations,
    so renamed it to 8250.txt to avoid confusing other persons.
    This is suggested by Arnd, see:
    http://lists.infradead.org/pipermail/linux-arm-kernel/2014-September/291455.html

    Signed-off-by: Chunyan Zhang
    Acked-by: Mark Rutland
    Signed-off-by: Rob Herring

    Chunyan Zhang
     
  • Linux 4.0-rc3

    Merging in v4.0-rc3 because commit 30a22c215a00 (console: Fix
    console name size mismatch) is a dependency.

    Rob Herring
     
  • Conflicts:
    drivers/net/ethernet/cadence/macb.c

    Overlapping changes in macb driver, mostly fixes and cleanups
    in 'net' overlapping with the integration of at91_ether into
    macb in 'net-next'.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Pull networking fixes from David Miller:

    1) nft_compat accidently truncates ethernet protocol to 8-bits, from
    Arturo Borrero.

    2) Memory leak in ip_vs_proc_conn(), from Julian Anastasov.

    3) Don't allow the space required for nftables rules to exceed the
    maximum value representable in the dlen field. From Patrick
    McHardy.

    4) bcm63xx_enet can accidently leave interrupts permanently disabled
    due to errors in the NAPI polling exit logic. Fix from Nicolas
    Schichan.

    5) Fix OOPSes triggerable by the ping protocol module, due to missing
    address family validations etc. From Lorenzo Colitti.

    6) Don't use RCU locking in sleepable context in team driver, from Jiri
    Pirko.

    7) xen-netback miscalculates statistic offset pointers when reporting
    the stats to userspace. From David Vrabel.

    8) Fix a leak of up to 256 pages per VIF destroy in xen-netaback, also
    from David Vrabel.

    9) ip_check_defrag() cannot assume that skb_network_offset(),
    particularly when it is used by the AF_PACKET fanout defrag code.
    From Alexander Drozdov.

    10) gianfar driver doesn't query OF node names properly when trying to
    determine the number of hw queues available. Fix it to explicitly
    check for OF nodes named queue-group. From Tobias Waldekranz.

    11) MID field in macb driver should be 12 bits, not 16. From Punnaiah
    Choudary Kalluri.

    12) Fix unintentional regression in traceroute due to timestamp socket
    option changes. Empty ICMP payloads should be allowed in
    non-timestamp cases. From Willem de Bruijn.

    13) When devices are unregistered, we have to get rid of AF_PACKET
    multicast list entries that point to it via ifindex. Fix from
    Francesco Ruggeri.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (38 commits)
    tipc: fix bug in link failover handling
    net: delete stale packet_mclist entries
    net: macb: constify macb configuration data
    MAINTAINERS: add Marc Kleine-Budde as co maintainer for CAN networking layer
    MAINTAINERS: linux-can moved to github
    can: kvaser_usb: Read all messages in a bulk-in URB buffer
    can: kvaser_usb: Avoid double free on URB submission failures
    can: peak_usb: fix missing ctrlmode_ init for every dev
    can: add missing initialisations in CAN related skbuffs
    ip: fix error queue empty skb handling
    bgmac: Clean warning messages
    tcp: align tcp_xmit_size_goal() on tcp_tso_autosize()
    net: fec: fix unbalanced clk disable on driver unbind
    net: macb: Correct the MID field length value
    net: gianfar: correctly determine the number of queue groups
    ipv4: ip_check_defrag should not assume that skb_network_offset is zero
    net: bcmgenet: properly disable password matching
    net: eth: xgene: fix booting with devicetree
    bnx2x: Force fundamental reset for EEH recovery
    xen-netback: refactor xenvif_handle_frag_list()
    ...

    Linus Torvalds
     

09 Mar, 2015

4 commits

  • Add missing "cdns,at91sam9260-macb", "atmel,sama5d3-gem" and
    "atmel,sama5d4-gem" compatible strings.

    Signed-off-by: Boris Brezillon
    Reviewed-by: Alexandre Belloni
    Acked-by: Nicolas Ferre
    Signed-off-by: David S. Miller

    Boris BREZILLON
     
  • Remove reference to obsolete ifconfig command.
    MTU can be changed with ip command instead.

    Signed-off-by: Stephen Hemminger
    Signed-off-by: David S. Miller

    stephen hemminger
     
  • Pull tty/serial fixes from Greg KH:
    "Here are some tty and serial driver fixes for 4.0-rc3.

    Along with the atime fix that you know about, here are some other
    serial driver bugfixes as well. Most notable is a wait_until_sent
    bugfix that was traced back to being around since before 2.6.12 that
    Johan has fixed up.

    All have been in linux-next successfully"

    * tag 'tty-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
    TTY: fix tty_wait_until_sent maximum timeout
    TTY: fix tty_wait_until_sent on 64-bit machines
    USB: serial: fix infinite wait_until_sent timeout
    TTY: bfin_jtag_comm: remove incorrect wait_until_sent operation
    net: irda: fix wait_until_sent poll timeout
    serial: uapi: Declare all userspace-visible io types
    serial: core: Fix iotype userspace breakage
    serial: sprd: Fix missing spin_unlock in sprd_handle_irq()
    console: Fix console name size mismatch
    tty: fix up atime/mtime mess, take four
    serial: 8250_dw: Fix get_mctrl behaviour
    serial:8250:8250_pci: delete unneeded quirk entries
    serial:8250:8250_pci: fix redundant entry report for WCH_CH352_2S
    Change email address for 8250_pci
    serial: 8250: Revert "tty: serial: 8250_core: read only RX if there is something in the FIFO"
    Revert "tty/serial: of_serial: add DT alias ID handling"

    Linus Torvalds
     
  • Pull "code of conflict" from Greg KH:
    "This file tries to set the rational basis for our code reviews, gives
    some advice on how to conduct them, and provides an excalation channel
    for any kernel developers if they so desire it"

    [ Let's see how this works ]

    * tag 'cc-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
    Code of Conflict

    Linus Torvalds