On Wed, Jul 25, 2012 at 7:10 PM, Jeff Garzik wrote:
>
> Thanks, so noted. I guess if the merge gets more complex than something
> easily described in an email, that implies that maintainers should do more
> cross-coordination and maybe a merge tree.
It's fairly rare. It happens mostly with the a
On Thu, 26 Jul 2012, Aaron Lu wrote:
> On 07/26/2012 01:05 PM, James Bottomley wrote:
> > On Thu, 2012-07-26 at 12:47 +0800, Aaron Lu wrote:
> >> On 07/26/2012 05:38 AM, Jeff Garzik wrote:
> >>> On 07/25/2012 04:35 PM, Jeff Garzik wrote:
> * Updating libata to directly bind with ACPI / runtim
* Linus Torvalds wrote:
> I couldn't find an example of that in a quick look, it's
> fairly uncommon to have non-conflicting merges that had
> semantic - but not contextual - conflicts. [...]
This:
git log --grep='Semantic merge\|Semantic conflict'
gives over a dozen examples of such sema
On 07/26/2012 01:05 PM, James Bottomley wrote:
On Thu, 2012-07-26 at 12:47 +0800, Aaron Lu wrote:
On 07/26/2012 05:38 AM, Jeff Garzik wrote:
On 07/25/2012 04:35 PM, Jeff Garzik wrote:
* Updating libata to directly bind with ACPI / runtime power mgmt.
This is a pre-req for SATA ZPODD (CD-ROM po
On Thu, 2012-07-26 at 12:47 +0800, Aaron Lu wrote:
> On 07/26/2012 05:38 AM, Jeff Garzik wrote:
> > On 07/25/2012 04:35 PM, Jeff Garzik wrote:
> >> * Updating libata to directly bind with ACPI / runtime power mgmt.
> >> This is a pre-req for SATA ZPODD (CD-ROM power management).
> >>
> >> Touches A
On 07/26/2012 05:38 AM, Jeff Garzik wrote:
On 07/25/2012 04:35 PM, Jeff Garzik wrote:
* Updating libata to directly bind with ACPI / runtime power mgmt.
This is a pre-req for SATA ZPODD (CD-ROM power management).
Touches ACPI (exports++) and SCSI in minor ways. Has been in linux-next
for weeks.
On 07/25/2012 07:30 PM, Linus Torvalds wrote:
On Wed, Jul 25, 2012 at 3:58 PM, Jeff Garzik wrote:
What is the right course in when a post-merge change is needed?
Just describe the issue and the required change. Than I can just do it
as part of the merge, and now the whole series is bisectabl
On Wed, Jul 25, 2012 at 3:58 PM, Jeff Garzik wrote:
>
> What is the right course in when a post-merge change is needed?
Just describe the issue and the required change. Than I can just do it
as part of the merge, and now the whole series is bisectable,
including the merge itself.
Here's a (fairl
On 07/25/2012 06:31 PM, Linus Torvalds wrote:
On Wed, Jul 25, 2012 at 3:26 PM, Jeff Garzik wrote:
Even so, separately, it still needed that post-merge compile fix.
And that's yet another example of how *NOT* to do things.
If the merge has errors like that, then they should be fixed up in th
On Wed, Jul 25, 2012 at 3:26 PM, Jeff Garzik wrote:
>
> Even so, separately, it still needed that post-merge compile fix.
And that's yet another example of how *NOT* to do things.
If the merge has errors like that, then they should be fixed up in the merge.
Please. Don't do this. Let me merge s
On 07/25/2012 06:06 PM, Linus Torvalds wrote:
On Wed, Jul 25, 2012 at 1:43 PM, Jeff Garzik wrote:
On Wed, Jul 25, 2012 at 04:35:51PM -0400, Jeff Garzik wrote:
Please pull 641589bff714f39b33ef1d7f02eaa009f2993b64 from
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
tags/up
On Wed, Jul 25, 2012 at 1:43 PM, Jeff Garzik wrote:
> On Wed, Jul 25, 2012 at 04:35:51PM -0400, Jeff Garzik wrote:
>> Please pull 641589bff714f39b33ef1d7f02eaa009f2993b64 from
>> git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
>> tags/upstream
>>
>
> Oh, I forgot to point out
On 07/25/2012 04:35 PM, Jeff Garzik wrote:
Please pull 641589bff714f39b33ef1d7f02eaa009f2993b64 from
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
tags/upstream
(text copied from the upstream-linus tag)
Notable changes:
* Updating libata to directly bind with ACPI / run
On Wed, Jul 25, 2012 at 04:35:51PM -0400, Jeff Garzik wrote:
> Please pull 641589bff714f39b33ef1d7f02eaa009f2993b64 from
> git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
> tags/upstream
>
Oh, I forgot to point out the merge commit, making my HEAD more recent
than might be e
14 matches
Mail list logo
