From: David Howells <dhowells@redhat.com>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: dhowells@redhat.com, torvalds@linux-foundation.org,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
Subject: Re: [PATCH 00/11] Fix up more asm/system.h fallout
Date: Mon, 02 Apr 2012 06:30:30 +0100 [thread overview]
Message-ID: <29666.1333344630@redhat.com> (raw)
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
> Like others, I was surprised it didn't get a soak in linux-next
> before being merged
I don't think that would've helped - unless Linus took all of linux-next into
his tree. The problem is that there were a substantial number of differences
between Linus-vanilla and linux-next (obviously), even mid-window.
To be fair, Linus had to fix up my patch set to apply to his vanilla tree, but
I did ask him to to pull the patches later in the merge window and hopefully
give me a chance to fix them up again before he did so. But I suppose arch
tree breakage was to be expected anyway in some arches.
However, I think the better way to have done this would've been to have the
arch-specific patches go through the arch trees first (and, indeed, Blackfin
did this and I was able to drop their patch from my set) - and then have the
generic patches go at the end.
Even better might've been to add a #warning into each asm/system.h in this
merge window and defer the final deletion to the next merge window.
David
next prev parent reply other threads:[~2012-04-02 5:30 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-01 20:38 [PATCH 00/11] Fix up more asm/system.h fallout Paul Gortmaker
2012-04-01 20:38 ` [PATCH 01/11] irq_work: fix compile failure on MIPS from system.h split Paul Gortmaker
2012-04-01 20:38 ` [PATCH 02/11] ARM: mach-msm: fix compile fail from system.h fallout Paul Gortmaker
2012-04-02 21:16 ` David Brown
2012-04-01 20:38 ` [PATCH 03/11] avr32: fix nop compile fails from system.h split up Paul Gortmaker
2012-04-01 20:38 ` [PATCH 04/11] avr32: fix build failures from mis-naming of atmel_nand.h Paul Gortmaker
2012-04-01 20:38 ` [PATCH 05/11] blackfin: fix cmpxchg build fails from system.h fallout Paul Gortmaker
2012-04-01 20:38 ` [PATCH 06/11] parisc: fix missing cmpxchg file error from system.h split Paul Gortmaker
2012-04-01 20:38 ` [PATCH 07/11] sh: fix several build failures from system.h fallout Paul Gortmaker
2012-04-02 1:00 ` Paul Mundt
2012-04-02 18:15 ` Paul Gortmaker
2012-04-02 23:57 ` Stephen Rothwell
2012-04-05 2:46 ` Paul Gortmaker
2012-04-05 2:49 ` Paul Gortmaker
2012-04-05 15:15 ` Paul Mundt
2012-04-06 6:40 ` linux-next: sh tree (Was:Re: [PATCH 07/11] sh: fix several build failures from system.h fallout) Stephen Rothwell
2012-04-01 20:38 ` [PATCH 08/11] frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL Paul Gortmaker
2012-04-01 20:38 ` [PATCH 09/11] firewire: restore the device.h include in linux/firewire.h Paul Gortmaker
2012-04-01 20:38 ` [PATCH 10/11] tile: fix multiple build failures from system.h dismantle Paul Gortmaker
2012-04-01 20:38 ` [PATCH 11/11] asm-generic: add linux/types.h to cmpxchg.h Paul Gortmaker
2012-04-06 6:28 ` Jonas Bonn
2012-04-02 0:03 ` [PATCH 00/11] Fix up more asm/system.h fallout Stephen Rothwell
2012-04-02 5:30 ` David Howells [this message]
2012-04-02 5:43 ` [PATCH 08/11] frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL David Howells
2012-04-02 5:44 ` [PATCH 02/11] ARM: mach-msm: fix compile fail from system.h fallout David Howells
2012-04-02 5:45 ` [PATCH 01/11] irq_work: fix compile failure on MIPS from system.h split David Howells
2012-04-02 5:47 ` [PATCH 03/11] avr32: fix nop compile fails from system.h split up David Howells
2012-04-02 19:11 ` Paul Gortmaker
2012-04-02 5:49 ` [PATCH 05/11] blackfin: fix cmpxchg build fails from system.h fallout David Howells
2012-04-02 5:50 ` [PATCH 06/11] parisc: fix missing cmpxchg file error from system.h split David Howells
2012-04-02 5:52 ` [PATCH 10/11] tile: fix multiple build failures from system.h dismantle David Howells
2012-04-02 15:59 ` Chris Metcalf
2012-04-02 18:05 ` Paul Gortmaker
2012-04-02 5:53 ` [PATCH 11/11] asm-generic: add linux/types.h to cmpxchg.h David Howells
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=29666.1333344630@redhat.com \
--to=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=torvalds@linux-foundation.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).