From: Vineet Gupta <Vineet.Gupta1@synopsys•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Andrew Morton <akpm@linux-foundation•org>,
Vineet Gupta <Vineet.Gupta1@synopsys•com>
Cc: Jesper Dangaard Brouer <brouer@redhat•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Matthew Wilcox (Oracle)" <willy@infradead•org>,
Mel Gorman <mgorman@techsingularity•net>
Subject: Re: linux-next: manual merge of the akpm-current tree with the arc-current tree
Date: Fri, 23 Apr 2021 14:04:18 +0000 [thread overview]
Message-ID: <96a18d65-8c50-e4c2-10bf-c762ad4a74ac@synopsys.com> (raw)
In-Reply-To: <20210423172351.4e3d194b@canb.auug.org.au>
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
prev parent reply other threads:[~2021-04-23 14:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-23 7:23 linux-next: manual merge of the akpm-current tree with the arc-current tree Stephen Rothwell
2021-04-23 14:04 ` Vineet Gupta [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=96a18d65-8c50-e4c2-10bf-c762ad4a74ac@synopsys.com \
--to=vineet.gupta1@synopsys$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=brouer@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mgorman@techsingularity$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=willy@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox