From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
James Bottomley <James.Bottomley@HansenPartnership•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix•de>,
Matthew Wilcox <willy@infradead•org>,
"Martin K. Petersen" <martin.petersen@oracle•com>
Subject: linux-next: manual merge of the akpm-current tree with the scsi tree
Date: Wed, 20 Jun 2018 13:54:58 +1000 [thread overview]
Message-ID: <20180620135458.7cc22318@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 808 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/percpu_ida.c
between commit:
acf3ff616ee2 ("scsi: Remove percpu_ida")
from the scsi tree and commit:
0c4d6e08c775 ("lib/percpu_ida.c: don't do alloc from per-CPU list if there is none")
from the akpm-current tree.
I fixed it up (I just removed the file, but clearly the akpm-current
tree commit could be removed) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-06-20 3:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-20 3:54 Stephen Rothwell [this message]
2018-06-29 5:16 ` linux-next: manual merge of the akpm-current tree with the scsi tree Stephen Rothwell
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=20180620135458.7cc22318@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=bigeasy@linutronix$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(echo .)com \
--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