From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the scsi tree
Date: Thu, 15 Dec 2011 10:53:52 +0400 [thread overview]
Message-ID: <1323932032.3210.7.camel@dabdike> (raw)
In-Reply-To: <20111215125818.f9ffb338c0085f2ba9908a42@canb.auug.org.au>
On Thu, 2011-12-15 at 12:58 +1100, Stephen Rothwell wrote:
> Hi James,
>
> After merging the scsi tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/scsi/qla4xxx/ql4_os.c:2135:6: error: redefinition of 'qla4xxx_check_relogin_flash_ddb'
> drivers/scsi/qla4xxx/ql4_os.c:2081:6: note: previous definition of 'qla4xxx_check_relogin_flash_ddb' was here
>
> Caused by a bad automatic merge when I merged the scsi tree today. The
> patch "[SCSI] qla4xxx: fix flash/ddb support" appears in both the scsi
> and scsi-rc-fixes tree (as separate commits) and git has messed up the
> merge. I fixed it up by using the version of this file from the scsi
> tree.
Erk sorry ... I blame tglx ... I had to rebase the rc-fixes tree to get
a cc stable on to one of his patches, but I need to rebase scsi-misc as
well since it's built on top of rc-fixes. Should be fixed for the next
go around (which is where the duplicate came from).
James
next prev parent reply other threads:[~2011-12-15 6:53 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-15 1:58 linux-next: build failure after merge of the scsi tree Stephen Rothwell
2011-12-15 6:53 ` James Bottomley [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-03-20 0:48 Stephen Rothwell
2017-08-28 8:02 Stephen Rothwell
2017-02-06 5:04 Stephen Rothwell
2017-02-13 0:32 ` Stephen Rothwell
2017-02-13 16:18 ` Jens Axboe
2016-12-23 0:45 Stephen Rothwell
2016-12-23 0:56 ` James Bottomley
[not found] ` <20161224123853.08284e8a@canb.auug.org.au>
2016-12-24 10:15 ` Ingo Molnar
2016-12-24 10:44 ` Stephen Rothwell
2016-12-24 11:46 ` Thomas Gleixner
2016-12-24 16:48 ` James Bottomley
2015-11-13 1:35 Stephen Rothwell
2015-11-13 8:32 ` Sreekanth Reddy
2015-06-02 8:06 Stephen Rothwell
2015-06-02 15:02 ` James Bottomley
2015-02-04 6:29 Stephen Rothwell
2015-02-04 6:47 ` Joe Perches
2015-02-04 15:26 ` James Bottomley
2014-11-10 6:15 Stephen Rothwell
2014-11-10 6:27 ` Anish Bhatt
2014-11-10 13:46 ` Christoph Hellwig
2014-11-10 15:21 ` James Bottomley
2014-11-10 15:48 ` Christoph Hellwig
2014-11-10 15:50 ` James Bottomley
2014-11-10 16:01 ` Christoph Hellwig
2014-11-04 4:43 Stephen Rothwell
2014-11-04 7:07 ` Hannes Reinecke
2014-11-05 4:48 ` Stephen Rothwell
2014-11-03 2:52 Stephen Rothwell
2014-11-03 7:51 ` Hannes Reinecke
2014-11-03 18:31 ` Christoph Hellwig
2014-09-26 8:34 Stephen Rothwell
2014-09-26 8:36 ` Christoph Hellwig
2014-09-26 9:57 ` James Bottomley
2014-09-26 12:43 ` Brian King
2013-01-12 2:23 wenxiong
2013-01-11 1:03 Stephen Rothwell
2013-01-11 7:34 ` James Bottomley
2013-01-11 15:27 ` Brian King
2013-01-11 15:37 ` James Bottomley
2013-01-11 16:05 ` Greg KH
2013-01-11 17:35 ` Brian King
2013-01-11 18:04 ` James Bottomley
2012-07-20 0:41 Stephen Rothwell
2012-07-20 8:50 ` James Bottomley
2012-03-26 1:17 Stephen Rothwell
2012-03-26 7:57 ` James Bottomley
2012-03-26 14:07 ` Greg KH
2012-03-27 7:29 ` James Bottomley
2012-03-27 22:17 ` Alexey Dobriyan
2012-03-27 22:22 ` Greg KH
2012-03-27 22:35 ` Alexey Dobriyan
2012-03-27 22:39 ` Alexey Dobriyan
2012-03-28 23:54 ` Greg KH
2012-03-29 19:38 ` Greg KH
2012-03-28 23:52 ` Greg KH
2012-03-29 7:32 ` Gerard Snitselaar
2012-03-29 8:25 ` Stephen Rothwell
2012-03-29 8:35 ` James Bottomley
2012-03-29 9:03 ` Gerard Snitselaar
2012-03-29 16:15 ` Greg KH
2012-03-23 2:00 Stephen Rothwell
2012-03-23 4:50 ` Benjamin Herrenschmidt
2012-03-23 8:14 ` James Bottomley
2012-03-23 8:53 ` Benjamin Herrenschmidt
2012-03-23 9:01 ` James Bottomley
2012-03-23 15:22 ` Jeff Garzik
2012-03-23 10:26 ` Alexey Dobriyan
2012-03-23 15:30 ` Jeff Garzik
2012-03-23 8:20 ` James Bottomley
2012-03-23 9:24 ` Stephen Rothwell
2011-08-29 2:09 Stephen Rothwell
2011-08-29 7:17 ` James Bottomley
2011-08-29 8:07 ` Giridhar Malavali
2011-05-27 3:25 Stephen Rothwell
2011-05-27 13:47 ` James Bottomley
2010-10-26 0:19 Stephen Rothwell
2010-10-26 15:50 ` James Bottomley
2010-02-10 1:33 Stephen Rothwell
2010-02-10 22:16 ` James Bottomley
2010-02-10 23:11 ` Stephen Rothwell
2010-02-16 0:38 ` 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=1323932032.3210.7.camel@dabdike \
--to=james.bottomley@hansenpartnership.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.