Doug / smarc-fsl-linux-kernel

02 May, 2013

1 commit

  • 73287a43c   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ... Browse Code »

    Pull networking updates from David Miller:
    "Highlights (1721 non-merge commits, this has to be a record of some
    sort):

    1) Add 'random' mode to team driver, from Jiri Pirko and Eric
    Dumazet.

    2) Make it so that any driver that supports configuration of multiple
    MAC addresses can provide the forwarding database add and del
    calls by providing a default implementation and hooking that up if
    the driver doesn't have an explicit set of handlers. From Vlad
    Yasevich.

    3) Support GSO segmentation over tunnels and other encapsulating
    devices such as VXLAN, from Pravin B Shelar.

    4) Support L2 GRE tunnels in the flow dissector, from Michael Dalton.

    5) Implement Tail Loss Probe (TLP) detection in TCP, from Nandita
    Dukkipati.

    6) In the PHY layer, allow supporting wake-on-lan in situations where
    the PHY registers have to be written for it to be configured.

    Use it to support wake-on-lan in mv643xx_eth.

    From Michael Stapelberg.

    7) Significantly improve firewire IPV6 support, from YOSHIFUJI
    Hideaki.

    8) Allow multiple packets to be sent in a single transmission using
    network coding in batman-adv, from Martin Hundebøll.

    9) Add support for T5 cxgb4 chips, from Santosh Rastapur.

    10) Generalize the VXLAN forwarding tables so that there is more
    flexibility in configurating various aspects of the endpoints.
    From David Stevens.

    11) Support RSS and TSO in hardware over GRE tunnels in bxn2x driver,
    from Dmitry Kravkov.

    12) Zero copy support in nfnelink_queue, from Eric Dumazet and Pablo
    Neira Ayuso.

    13) Start adding networking selftests.

    14) In situations of overload on the same AF_PACKET fanout socket, or
    per-cpu packet receive queue, minimize drop by distributing the
    load to other cpus/fanouts. From Willem de Bruijn and Eric
    Dumazet.

    15) Add support for new payload offset BPF instruction, from Daniel
    Borkmann.

    16) Convert several drivers over to mdoule_platform_driver(), from
    Sachin Kamat.

    17) Provide a minimal BPF JIT image disassembler userspace tool, from
    Daniel Borkmann.

    18) Rewrite F-RTO implementation in TCP to match the final
    specification of it in RFC4138 and RFC5682. From Yuchung Cheng.

    19) Provide netlink socket diag of netlink sockets ("Yo dawg, I hear
    you like netlink, so I implemented netlink dumping of netlink
    sockets.") From Andrey Vagin.

    20) Remove ugly passing of rtnetlink attributes into rtnl_doit
    functions, from Thomas Graf.

    21) Allow userspace to be able to see if a configuration change occurs
    in the middle of an address or device list dump, from Nicolas
    Dichtel.

    22) Support RFC3168 ECN protection for ipv6 fragments, from Hannes
    Frederic Sowa.

    23) Increase accuracy of packet length used by packet scheduler, from
    Jason Wang.

    24) Beginning set of changes to make ipv4/ipv6 fragment handling more
    scalable and less susceptible to overload and locking contention,
    from Jesper Dangaard Brouer.

    25) Get rid of using non-type-safe NLMSG_* macros and use nlmsg_*()
    instead. From Hong Zhiguo.

    26) Optimize route usage in IPVS by avoiding reference counting where
    possible, from Julian Anastasov.

    27) Convert IPVS schedulers to RCU, also from Julian Anastasov.

    28) Support cpu fanouts in xt_NFQUEUE netfilter target, from Holger
    Eitzenberger.

    29) Network namespace support for nf_log, ebt_log, xt_LOG, ipt_ULOG,
    nfnetlink_log, and nfnetlink_queue. From Gao feng.

    30) Implement RFC3168 ECN protection, from Hannes Frederic Sowa.

    31) Support several new r8169 chips, from Hayes Wang.

    32) Support tokenized interface identifiers in ipv6, from Daniel
    Borkmann.

    33) Use usbnet_link_change() helper in USB net driver, from Ming Lei.

    34) Add 802.1ad vlan offload support, from Patrick McHardy.

    35) Support mmap() based netlink communication, also from Patrick
    McHardy.

    36) Support HW timestamping in mlx4 driver, from Amir Vadai.

    37) Rationalize AF_PACKET packet timestamping when transmitting, from
    Willem de Bruijn and Daniel Borkmann.

    38) Bring parity to what's provided by /proc/net/packet socket dumping
    and the info provided by netlink socket dumping of AF_PACKET
    sockets. From Nicolas Dichtel.

    39) Fix peeking beyond zero sized SKBs in AF_UNIX, from Benjamin
    Poirier"

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1722 commits)
    filter: fix va_list build error
    af_unix: fix a fatal race with bit fields
    bnx2x: Prevent memory leak when cnic is absent
    bnx2x: correct reading of speed capabilities
    net: sctp: attribute printl with __printf for gcc fmt checks
    netlink: kconfig: move mmap i/o into netlink kconfig
    netpoll: convert mutex into a semaphore
    netlink: Fix skb ref counting.
    net_sched: act_ipt forward compat with xtables
    mlx4_en: fix a build error on 32bit arches
    Revert "bnx2x: allow nvram test to run when device is down"
    bridge: avoid OOPS if root port not found
    drivers: net: cpsw: fix kernel warn on cpsw irq enable
    sh_eth: use random MAC address if no valid one supplied
    3c509.c: call SET_NETDEV_DEV for all device types (ISA/ISAPnP/EISA)
    tg3: fix to append hardware time stamping flags
    unix/stream: fix peeking with an offset larger than data in queue
    unix/dgram: fix peeking with an offset larger than data in queue
    unix/dgram: peek beyond 0-sized skbs
    openvswitch: Remove unneeded ovs_netdev_get_ifindex()
    ...

    Linus Torvalds
     

01 May, 2013

1 commit

  • 08d767608   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal ... Browse Code »

    Pull compat cleanup from Al Viro:
    "Mostly about syscall wrappers this time; there will be another pile
    with patches in the same general area from various people, but I'd
    rather push those after both that and vfs.git pile are in."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
    syscalls.h: slightly reduce the jungles of macros
    get rid of union semop in sys_semctl(2) arguments
    make do_mremap() static
    sparc: no need to sign-extend in sync_file_range() wrapper
    ppc compat wrappers for add_key(2) and request_key(2) are pointless
    x86: trim sys_ia32.h
    x86: sys32_kill and sys32_mprotect are pointless
    get rid of compat_sys_semctl() and friends in case of ARCH_WANT_OLD_COMPAT_IPC
    merge compat sys_ipc instances
    consolidate compat lookup_dcookie()
    convert vmsplice to COMPAT_SYSCALL_DEFINE
    switch getrusage() to COMPAT_SYSCALL_DEFINE
    switch epoll_pwait to COMPAT_SYSCALL_DEFINE
    convert sendfile{,64} to COMPAT_SYSCALL_DEFINE
    switch signalfd{,4}() to COMPAT_SYSCALL_DEFINE
    make SYSCALL_DEFINE-generated wrappers do asmlinkage_protect
    make HAVE_SYSCALL_WRAPPERS unconditional
    consolidate cond_syscall and SYSCALL_ALIAS declarations
    teach SYSCALL_DEFINE how to deal with long long/unsigned long long
    get rid of duplicate logics in __SC_....[1-6] definitions

    Linus Torvalds
     

30 Apr, 2013

3 commits

  • 73154383f   Merge branch 'akpm' (incoming from Andrew) ... Browse Code »

    Merge first batch of fixes from Andrew Morton:

    - A couple of kthread changes

    - A few minor audit patches

    - A number of fbdev patches. Florian remains AWOL so I'm picking up
    some of these.

    - A few kbuild things

    - ocfs2 updates

    - Almost all of the MM queue

    (And in the meantime, I already have the second big batch from Andrew
    pending in my mailbox ;^)

    * emailed patches from Andrew Morton : (149 commits)
    memcg: take reference before releasing rcu_read_lock
    mem hotunplug: fix kfree() of bootmem memory
    mmKconfig: add an option to disable bounce
    mm, nobootmem: do memset() after memblock_reserve()
    mm, nobootmem: clean-up of free_low_memory_core_early()
    fs/buffer.c: remove unnecessary init operation after allocating buffer_head.
    numa, cpu hotplug: change links of CPU and node when changing node number by onlining CPU
    mm: fix memory_hotplug.c printk format warning
    mm: swap: mark swap pages writeback before queueing for direct IO
    swap: redirty page if page write fails on swap file
    mm, memcg: give exiting processes access to memory reserves
    thp: fix huge zero page logic for page with pfn == 0
    memcg: avoid accessing memcg after releasing reference
    fs: fix fsync() error reporting
    memblock: fix missing comment of memblock_insert_region()
    mm: Remove unused parameter of pages_correctly_reserved()
    firmware, memmap: fix firmware_map_entry leak
    mm/vmstat: add note on safety of drain_zonestat
    mm: thp: add split tail pages to shrink page list in page reclaim
    mm: allow for outstanding swap writeback accounting
    ...

    Linus Torvalds
     
  • 61f3d0a98   Merge tag 'spi-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi ... Browse Code »

    Pull spi updates from Mark Brown:
    "A fairly quiet release for SPI, mainly driver work. A few highlights:

    - Supports bits per word compatibility checking in the core.
    - Allow use of the IP used in Freescale SPI controllers outside
    Freescale SoCs.
    - DMA support for the Atmel SPI driver.
    - New drivers for the BCM2835 and Tegra114"

    * tag 'spi-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (68 commits)
    spi-topcliff-pch: fix to use list_for_each_entry_safe() when delete list items
    spi-topcliff-pch: missing platform_driver_unregister() on error in pch_spi_init()
    ARM: dts: add pinctrl property for spi node for atmel SoC
    ARM: dts: add spi nodes for the atmel boards
    ARM: dts: add spi nodes for atmel SoC
    ARM: at91: add clocks for spi dt entries
    spi/spi-atmel: add dmaengine support
    spi/spi-atmel: add flag to controller data for lock operations
    spi/spi-atmel: add physical base address
    spi/sirf: fix MODULE_DEVICE_TABLE
    MAINTAINERS: Add git repository and update my address
    spi/s3c64xx: Check for errors in dmaengine prepare_transfer()
    spi/s3c64xx: Fix non-dmaengine usage
    spi: omap2-mcspi: fix error return code in omap2_mcspi_probe()
    spi/s3c64xx: let device core setup the default pin configuration
    MAINTAINERS: Update Grant's email address and maintainership
    spi: omap2-mcspi: Fix transfers if DMADEVICES is not set
    spi: s3c64xx: move to generic dmaengine API
    spi-gpio: init CS before spi_bitbang_setup()
    spi: spi-mpc512x-psc: let transmiter/receiver enabled when in xfer loop
    ...

    Linus Torvalds
     
  • 106c992a5   mm/hugetlb: add more arch-defined huge_pte functions ... Browse Code »

    Commit abf09bed3cce ("s390/mm: implement software dirty bits")
    introduced another difference in the pte layout vs. the pmd layout on
    s390, thoroughly breaking the s390 support for hugetlbfs. This requires
    replacing some more pte_xxx functions in mm/hugetlbfs.c with a
    huge_pte_xxx version.

    This patch introduces those huge_pte_xxx functions and their generic
    implementation in asm-generic/hugetlb.h, which will now be included on
    all architectures supporting hugetlbfs apart from s390. This change
    will be a no-op for those architectures.

    [akpm@linux-foundation.org: fix warning]
    Signed-off-by: Gerald Schaefer
    Cc: Mel Gorman
    Cc: Hugh Dickins
    Cc: Hillf Danton
    Acked-by: Michal Hocko [for !s390 parts]
    Cc: Tony Luck
    Cc: Fenghua Yu
    Cc: Ralf Baechle
    Cc: Benjamin Herrenschmidt
    Cc: Paul Mackerras
    Cc: Paul Mundt
    Cc: "David S. Miller"
    Cc: Chris Metcalf
    Cc: Thomas Gleixner
    Cc: Ingo Molnar
    Cc: "H. Peter Anvin"
    Cc: Martin Schwidefsky
    Cc: Heiko Carstens
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Gerald Schaefer
     

23 Apr, 2013

1 commit

  • 3b5e50eda   Revert "MIPS: page.h: Provide more readable definition for PAGE_MASK." ... Browse Code »

    This reverts commit c17a6554782ad531f4713b33fd6339ba67ef6391.

    Manuel Lauss writes:

    lmo commit c17a6554 (MIPS: page.h: Provide more readable definition for
    PAGE_MASK) apparently breaks ioremap of 36-bit addresses on my Alchemy
    systems (PCI and PCMCIA) The reason is that in arch/mips/mm/ioremap.c
    line 157 (phys_addr &= PAGE_MASK) bits 32-35 are cut off. Seems the
    new PAGE_MASK is explicitly 32bit, or one could make it signed instead
    of unsigned long.

    Ralf Baechle
     

08 Apr, 2013

2 commits

06 Apr, 2013

1 commit

  • 6cfa92382   Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ... Browse Code »

    Pull MIPS fixes from Ralf Baechle:
    "Fixes for a number of small glitches in various corners of the MIPS
    tree. No particular areas is standing out.

    With this applied all MIPS defconfigs are building fine. No merge
    conflicts are expected."

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
    MIPS: Delete definition of SA_RESTORER.
    MIPS: Fix ISA level which causes secondary cache init bypassing and more
    MIPS: Fix build error cavium-octeon without CONFIG_SMP
    MIPS: Kconfig: Rename SNIPROM too
    MIPS: Alchemy: Fix typo "CONFIG_DEBUG_PCI"
    MIPS: Unbreak function tracer for 64-bit kernel.

    Linus Torvalds
     

05 Apr, 2013

1 commit

  • 80fa8181a   MIPS: Delete definition of SA_RESTORER. ... Browse Code »

    SA_RESTORER used to be defined as 0x04000000 but only the O32 ABI ever
    supported its use and no libc was using it, so the entire sa-restorer
    functionality was removed with lmo commit 39bffc12c3580ab [Zap sa_restorer.]
    for 2.5.48 retaining only the SA_RESTORER definition as a reminder to avoid
    accidental reuse of the mask bit.

    Upstream cdef9602fbf1871a43f0f1b5cea10dd0f275167d [signal: always clear
    sa_restorer on execve] adds code that assumes sa_sigaction has an
    sa_restorer field, if SA_RESTORER is defined which would break MIPS.
    So remove the SA_RESTORER definition before the v3.8.4 merge.

    Signed-off-by: Ralf Baechle
    (cherry picked from commit 17da8d63add23830892ac4dc2cbb3b5d4ffb79a8)

    Ralf Baechle
     

03 Apr, 2013

1 commit

01 Apr, 2013

1 commit

  • 7d4c04fc1   net: add option to enable error queue packets waking select ... Browse Code »

    Currently, when a socket receives something on the error queue it only wakes up
    the socket on select if it is in the "read" list, that is the socket has
    something to read. It is useful also to wake the socket if it is in the error
    list, which would enable software to wait on error queue packets without waking
    up for regular data on the socket. The main use case is for receiving
    timestamped transmit packets which return the timestamp to the socket via the
    error queue. This enables an application to select on the socket for the error
    queue only instead of for the regular traffic.

    -v2-
    * Added the SO_SELECT_ERR_QUEUE socket option to every architechture specific file
    * Modified every socket poll function that checks error queue

    Signed-off-by: Jacob Keller
    Cc: Jeffrey Kirsher
    Cc: Richard Cochran
    Cc: Matthew Vick
    Signed-off-by: David S. Miller

    Keller, Jacob E
     

20 Mar, 2013

3 commits

  • 2a1486981   Fix breakage in MIPS siginfo handling ... Browse Code »

    MIPS's siginfo handling has been broken since this commit:

    commit 574c4866e33d648520a8bd5bf6f573ea6e554e88
    Author: Al Viro
    Date: Sun Nov 25 22:24:19 2012 -0500
    consolidate kernel-side struct sigaction declarations

    for 64-bit BE MIPS CPUs.

    The UAPI variant looks like this:

    struct sigaction {
    unsigned int sa_flags;
    __sighandler_t sa_handler;
    sigset_t sa_mask;
    };

    but the core kernel's variant looks like this:

    struct sigaction {
    #ifndef __ARCH_HAS_ODD_SIGACTION
    __sighandler_t sa_handler;
    unsigned long sa_flags;
    #else
    unsigned long sa_flags;
    __sighandler_t sa_handler;
    #endif
    #ifdef __ARCH_HAS_SA_RESTORER
    __sigrestore_t sa_restorer;
    #endif
    sigset_t sa_mask;
    };

    The problem is that sa_flags has been changed from an unsigned int to an
    unsigned long.

    Fix this by making sa_flags unsigned int if __ARCH_HAS_ODD_SIGACTION is
    defined.

    Whilst we're at it, rename __ARCH_HAS_ODD_SIGACTION to
    __ARCH_HAS_IRIX_SIGACTION.

    Signed-off-by: David Howells
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Cc: stable@vger.kernel.org
    Acked-by: Al Viro
    Signed-off-by: Ralf Baechle

    David Howells
     
  • 97367519d   MIPS: BCM63XX: Make nvram checksum failure non fatal ... Browse Code »

    Some vendors modify the nvram layout moving the checksum to a different
    place or dropping entirely, so reduce the checksum failure to a warning.

    Reported-by: Álvaro Fernández Rojas
    Signed-off-by: Jonas Gorski
    Cc: linux-mips@linux-mips.org
    Cc: John Crispin
    Cc: Maxime Bizon
    Cc: Florian Fainelli
    Cc: Kevin Cernekee
    Signed-off-by: Ralf Baechle

    Jonas Gorski
     
  • 63c2b6812   MIPS: Fix code generation for non-DSP capable CPUs ... Browse Code »

    Commit 32a7ede (MIPS: dsp: Add assembler support for DSP ASEs) has
    enabled the use of DSP ASE specific instructions such as rddsp and wrdsp
    under the idea that all code path that will make use of these two
    instructions are properly checking for cpu_has_dsp to ensure that the
    particular CPU we are running on *actually* supports DSP ASE.

    This commit actually causes the following oops on QEMU Malta emulating a
    MIPS 24Kc without the DSP ASE implemented:

    [ 7.960000] Reserved instruction in kernel
    [ 7.960000] Cpu 0
    [ 7.960000] $ 0 : 00000000 00000000 00000014 00000005
    [ 7.960000] $ 4 : 8fc2de48 00000001 00000000 8f59ddb0
    [ 7.960000] $ 8 : 8f5ceec4 00000018 00000c00 00800000
    [ 7.960000] $12 : 00000100 00000200 00000000 00457b84
    [ 7.960000] $16 : 00000000 8fc2ba78 8f4ec980 00000001
    [ 7.960000] $20 : 80418f90 00000000 00000000 000002dd
    [ 7.960000] $24 : 0000009c 7730d7b8
    [ 7.960000] $28 : 8f59c000 8f59dd38 00000001 80104248
    [ 7.960000] Hi : 0000001d
    [ 7.960000] Lo : 0000000b
    [ 7.960000] epc : 801041ec thread_saved_pc+0x2c/0x38
    [ 7.960000] Not tainted
    [ 7.960000] ra : 80104248 get_wchan+0x48/0xac
    [ 7.960000] Status: 1000b703 KERNEL EXL IE
    [ 7.960000] Cause : 10800028
    [ 7.960000] PrId : 00019300 (MIPS 24Kc)
    [ 7.960000] Modules linked in:
    [ 7.960000] Process killall (pid: 1574, threadinfo=8f59c000,
    task=8fd14558, tls=773aa440)
    [ 7.960000] Stack : 8fc2ba78 8012b008 0000000c 0000001d 00000000
    00000000 8f58a380
    8f58a380 8fc2ba78 80202668 8f59de78 8f468600 8f59de28
    801b2a3c 8f59df00 8f98ba20 74696e69
    8f468600 8f59de28 801b7308 0081c007 00000000 00000000
    00000000 00000000 00000000 00000000
    00000000 8fc2bbb4 00000001 0000001d 0000000b 77f038cc
    7fe80648 ffffffff ffffffff 00000000
    00000001 0016e000 00000000 ...
    [ 7.960000] Call Trace:
    [ 7.960000] [] thread_saved_pc+0x2c/0x38
    [ 7.960000] [] get_wchan+0x48/0xac

    The disassembly of thread_saved_pc points to the following:
    000006d0 :
    6d0: 8c820208 lw v0,520(a0)
    6d4: 3c030000 lui v1,0x0
    6d8: 24630000 addiu v1,v1,0
    6dc: 10430008 beq v0,v1,700
    6e0: 00000000 nop
    6e4: 3c020000 lui v0,0x0
    6e8: 8c43000c lw v1,12(v0)
    6ec: 04620004 bltzl v1,700
    6f0: 00001021 move v0,zero
    6f4: 8c840200 lw a0,512(a0)
    6f8: 00031080 sll v0,v1,0x2
    6fc: 7c44100a lwx v0,a0(v0) :
    708: 8c820208 lw v0,520(a0)
    70c: 3c030000 lui v1,0x0
    710: 24630000 addiu v1,v1,0
    714: 10430009 beq v0,v1,73c
    718: 00000000 nop
    71c: 3c020000 lui v0,0x0
    720: 8c42000c lw v0,12(v0)
    724: 04420005 bltzl v0,73c
    728: 00001021 move v0,zero
    72c: 8c830200 lw v1,512(a0)
    730: 00021080 sll v0,v0,0x2
    734: 00431021 addu v0,v0,v1
    738: 8c420000 lw v0,0(v0)
    73c: 03e00008 jr ra
    740: 00000000 nop

    The specific line that leads a different assembly being produced is:

    unsigned long thread_saved_pc(struct task_struct *tsk)
    ...
    return ((unsigned long *)t->reg29)[schedule_mfi.pc_offset];
    Acked-by: Steven J. Hill
    Cc: linux-mips@linux-mips.org
    Cc: blogic@openwrt.org
    Signed-off-by: Ralf Baechle

    Florian Fainelli
     

13 Mar, 2013

2 commits

  • f4cdb6a00   MIPS: SEAD3: Enable LL/SC. ... Browse Code »

    All synthesizable CPU cores that could be loaded into a SEAD3's FPGA are
    MIPS32 or MIPS64 CPUs that have ll/sc.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • 631b0af98   MIPS: Get rid of CONFIG_CPU_HAS_LLSC again ... Browse Code »

    Commit f7ade3c168e4f437c11f57be012992bbb0e3075c ("MIPS: Get rid of
    CONFIG_CPU_HAS_LLSC") did what it promised to do. But since then that
    macro and its Kconfig symbol popped up again. Get rid of those again.

    Signed-off-by: Paul Bolle
    Cc: Jonas Gorski
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/4978/
    Signed-off-by: Ralf Baechle

    Paul Bolle
     

04 Mar, 2013

1 commit

02 Mar, 2013

1 commit

  • aebb2afd5   Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ... Browse Code »

    Pull MIPS updates from Ralf Baechle:

    o Add basic support for the Mediatek/Ralink Wireless SoC family.

    o The Qualcomm Atheros platform is extended by support for the new
    QCA955X SoC series as well as a bunch of patches that get the code
    ready for OF support.

    o Lantiq and BCM47XX platform have a few improvements and bug fixes.

    o MIPS has sent a few patches that get the kernel ready for the
    upcoming microMIPS support.

    o The rest of the series is made up of small bug fixes and cleanups
    that relate to various parts of the MIPS code. The biggy in there is
    a whitespace cleanup. After I was sent another set of whitespace
    cleanup patches I decided it was the time to clean the whitespace
    "issues" for once and and that touches many files below arch/mips/.

    Fix up silly conflicts, mostly due to whitespace cleanups.

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (105 commits)
    MIPS: Quit exporting kernel internel break codes to uapi/asm/break.h
    MIPS: remove broken conditional inside vpe loader code
    MIPS: SMTC: fix implicit declaration of set_vi_handler
    MIPS: early_printk: drop __init annotations
    MIPS: Probe for and report hardware virtualization support.
    MIPS: ath79: add support for the Qualcomm Atheros AP136-010 board
    MIPS: ath79: add USB controller registration code for the QCA955X SoCs
    MIPS: ath79: add PCI controller registration code for the QCA955X SoCs
    MIPS: ath79: add WMAC registration code for the QCA955X SoCs
    MIPS: ath79: register UART for the QCA955X SoCs
    MIPS: ath79: add QCA955X specific glue to ath79_device_reset_{set, clear}
    MIPS: ath79: add GPIO setup code for the QCA955X SoCs
    MIPS: ath79: add IRQ handling code for the QCA955X SoCs
    MIPS: ath79: add clock setup code for the QCA955X SoCs
    MIPS: ath79: add SoC detection code for the QCA955X SoCs
    MIPS: ath79: add early printk support for the QCA955X SoCs
    MIPS: ath79: fix WMAC IRQ resource assignment
    mips: reserve elfcorehdr
    mips: Make sure kernel memory is in iomem
    MIPS: ath79: use dynamically allocated USB platform devices
    ...

    Linus Torvalds
     

24 Feb, 2013

1 commit

  • 9e2d59ad5   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal ... Browse Code »

    Pull signal handling cleanups from Al Viro:
    "This is the first pile; another one will come a bit later and will
    contain SYSCALL_DEFINE-related patches.

    - a bunch of signal-related syscalls (both native and compat)
    unified.

    - a bunch of compat syscalls switched to COMPAT_SYSCALL_DEFINE
    (fixing several potential problems with missing argument
    validation, while we are at it)

    - a lot of now-pointless wrappers killed

    - a couple of architectures (cris and hexagon) forgot to save
    altstack settings into sigframe, even though they used the
    (uninitialized) values in sigreturn; fixed.

    - microblaze fixes for delivery of multiple signals arriving at once

    - saner set of helpers for signal delivery introduced, several
    architectures switched to using those."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (143 commits)
    x86: convert to ksignal
    sparc: convert to ksignal
    arm: switch to struct ksignal * passing
    alpha: pass k_sigaction and siginfo_t using ksignal pointer
    burying unused conditionals
    make do_sigaltstack() static
    arm64: switch to generic old sigaction() (compat-only)
    arm64: switch to generic compat rt_sigaction()
    arm64: switch compat to generic old sigsuspend
    arm64: switch to generic compat rt_sigqueueinfo()
    arm64: switch to generic compat rt_sigpending()
    arm64: switch to generic compat rt_sigprocmask()
    arm64: switch to generic sigaltstack
    sparc: switch to generic old sigsuspend
    sparc: COMPAT_SYSCALL_DEFINE does all sign-extension as well as SYSCALL_DEFINE
    sparc: kill sign-extending wrappers for native syscalls
    kill sparc32_open()
    sparc: switch to use of generic old sigaction
    sparc: switch sys_compat_rt_sigaction() to COMPAT_SYSCALL_DEFINE
    mips: switch to generic sys_fork() and sys_clone()
    ...

    Linus Torvalds
     

22 Feb, 2013

2 commits

  • edb15d83a   Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/… ... Browse Code »

    …linux into mips-for-linux-next

    Conflicts:
    include/linux/ssb/ssb_driver_gige.h

    Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
    bgmac.c due to change of an API.

    Ralf Baechle
     
  • 9afa3195b   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    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
     

21 Feb, 2013

2 commits

19 Feb, 2013

10 commits

17 Feb, 2013

6 commits