linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the arc-current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <96a18d65-8c50-e4c2-10bf-c762ad4a74ac@synopsys.com>
Date:   Fri, 23 Apr 2021 14:04:18 +0000
From:   Vineet Gupta <Vineet.Gupta1@...opsys.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Vineet Gupta <Vineet.Gupta1@...opsys.com>
CC:     Jesper Dangaard Brouer <brouer@...hat.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        "Matthew Wilcox (Oracle)" <willy@...radead.org>,
        Mel Gorman <mgorman@...hsingularity.net>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 arc-current tree

On 4/23/21 12:23 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
>    net/core/page_pool.c
>
> between commit:
>
>    004f078a57d3 ("mm: Fix struct page layout on 32-bit systems")
>
> from the arc-current tree and commit:
>
>    8fdd71a69f19 ("net: page_pool: refactor dma_map into own function page_pool_dma_map")
>
> from the akpm-current tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Sorry this was a snafu at my end - I pushed wrong local branch (to test 
Matthew's changes)
Its fixed now.

Thx,
-Vineet