On Tue, Apr 30, 2013 at 3:26 PM, Jeff Garzik wrote:
>
> Summary:
return -EMISSINGDIFFSTAT;
I've pulled, but *please* make sure to fix your broken script. I
really do want to see the diffstat, partly because I want to know what
to expect even before pulling, partly just to verify that what I
pull
Summary:
1) More ACPI fixes, cleanups
2) Minor cleanups for sata_highbank, pata_at32, pata_octeon_cf,
sata_rcar
3) pata_legacy: small bug found in opti chipset code (untested fix,
due to ancient h/w)
4) sata_fsl: RX water mark config knob, some h/w needs it
5) pata_imx: cleanups, Device
Please pull 72d5f2da2c3717f1be484d97e35d67dde0efb4c0 from
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
tags/upstream-linus
to receive the following updates:
drivers/ata/ahci_platform.c| 46 ++---
drivers/ata/ata_piix.c | 444 ---
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
(additional explanation for the revert is in the full changeset
description)
Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
upstream-linus
to receive the following updates:
drivers/ata/libata-core.c |5 -
drivers/ata/liba
Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
upstream-linus
to receive the following updates:
arch/arm/mach-rpc/riscpc.c|2 +-
arch/blackfin/mach-bf527/boards/ezkit.c |2 +-
arch/blackfi
The PCI change was ack'd by Greg...
Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
upstream-linus
to receive the following updates:
drivers/ata/Kconfig |2 +-
drivers/ata/ahci.c |2 +
drivers/ata/ata_piix.
A couple small cleanups, the rest fixes.
Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
upstream-linus
to receive the following updates:
drivers/ata/ahci.c| 144 +
drivers/ata/
The sata_nv update has been in -mm for a while, but couldn't make the
last drop due to last minute bugs.
Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
upstream-linus
to receive the following updates:
drivers/ata/Kconfig |
Jesse Barnes wrote:
On Sunday, April 29, 2007 9:15 am Jeff Garzik wrote:
Noteworthy changes:
* remove combined mode PCI quirk. IDE driver selection (libata or
old-IDE) is now determined purely by module load order.
* new driver API, that is far more like other kernel APIs:
alloc...register.
Chuck Ebbert wrote:
Stephen Clark wrote:
I'm running fc6 but with kernel 2.6.21 from kernel.org - compiled with
the .config file from fc6.
My system is a asus laptop with an ich7 chipset which has both sata and
pata controllers. My
laptop only brings out the pata controller interface and bo
On Tuesday, May 1, 2007 3:45 pm Stephen Clark wrote:
> I'm running fc6 but with kernel 2.6.21 from kernel.org - compiled
> with the .config file from fc6.
>
> My system is a asus laptop with an ich7 chipset which has both sata
> and pata controllers. My
> laptop only brings out the pata controller
Stephen Clark wrote:
>>
> I'm running fc6 but with kernel 2.6.21 from kernel.org - compiled with
> the .config file from fc6.
>
> My system is a asus laptop with an ich7 chipset which has both sata and
> pata controllers. My
> laptop only brings out the pata controller interface and both my hd and
Jesse Barnes wrote:
On Monday, April 30, 2007 1:22 pm Stephen Clark wrote:
Please don't do this!
Yeah the kernel will boot but the hd performance is sh*t on my
laptop. I am running FC6 with
kernel 2.6.21 and without the combined_mode setting my disk
performance goes down to a
whopping 1.25m
On Monday, April 30, 2007 1:22 pm Stephen Clark wrote:
> Please don't do this!
>
> Yeah the kernel will boot but the hd performance is sh*t on my
> laptop. I am running FC6 with
> kernel 2.6.21 and without the combined_mode setting my disk
> performance goes down to a
> whopping 1.25mb/sec from 44m
On Sunday, April 29, 2007 9:15 am Jeff Garzik wrote:
> Noteworthy changes:
> * remove combined mode PCI quirk. IDE driver selection (libata or
> old-IDE) is now determined purely by module load order.
> * new driver API, that is far more like other kernel APIs:
> alloc...register...unregister.
Jeff Garzik wrote:
Stephen Clark wrote:
Yeah the kernel will boot but the hd performance is sh*t on my laptop. I
am running FC6 with
kernel 2.6.21 and without the combined_mode setting my disk performance
goes down to a
whopping 1.25mb/sec from 44mb/sec when I boot with combined_mode=libata
Chuck Ebbert wrote:
Jeff Garzik wrote:
Chuck Ebbert wrote:
Jeff Garzik wrote:
Jeff Garzik (8):
libata/IDE: remove combined mode quirk
You can't just remove the "combined_mode=" kernel parameter or
every Linux user who uses that will get an unbootable kernel
with no good way of diagnosin
Jeff Garzik wrote:
> Chuck Ebbert wrote:
>> Jeff Garzik wrote:
>>> Jeff Garzik (8):
>>> libata/IDE: remove combined mode quirk
>>
>> You can't just remove the "combined_mode=" kernel parameter or
>> every Linux user who uses that will get an unbootable kernel
>> with no good way of diagnosing
On Mon, 30 Apr 2007, Alan Cox wrote:
Yeah the kernel will boot but the hd performance is sh*t on my laptop. I
am running FC6 with
kernel 2.6.21 and without the combined_mode setting my disk performance
goes down to a
whopping 1.25mb/sec from 44mb/sec when I boot with combined_mode=libata.
Then
Stephen Clark wrote:
Yeah the kernel will boot but the hd performance is sh*t on my laptop. I
am running FC6 with
kernel 2.6.21 and without the combined_mode setting my disk performance
goes down to a
whopping 1.25mb/sec from 44mb/sec when I boot with combined_mode=libata.
It make my
system un
> Yeah the kernel will boot but the hd performance is sh*t on my laptop. I
> am running FC6 with
> kernel 2.6.21 and without the combined_mode setting my disk performance
> goes down to a
> whopping 1.25mb/sec from 44mb/sec when I boot with combined_mode=libata.
Then something is very wrong wit
Jeff Garzik wrote:
Chuck Ebbert wrote:
Jeff Garzik wrote:
Jeff Garzik (8):
libata/IDE: remove combined mode quirk
You can't just remove the "combined_mode=" kernel parameter or
every Linux user who uses that will get an unbootable kernel
with no good way of diagnosing the
Chuck Ebbert wrote:
Jeff Garzik wrote:
Jeff Garzik (8):
libata/IDE: remove combined mode quirk
You can't just remove the "combined_mode=" kernel parameter or
every Linux user who uses that will get an unbootable kernel
with no good way of diagnosing the problem. It should still
be accept
Jeff Garzik wrote:
>
> Jeff Garzik (8):
> libata/IDE: remove combined mode quirk
You can't just remove the "combined_mode=" kernel parameter or
every Linux user who uses that will get an unbootable kernel
with no good way of diagnosing the problem. It should still
be accepted and just print
(just sent this upstream to Linus and Andrew)
Noteworthy changes:
* remove combined mode PCI quirk. IDE driver selection (libata or
old-IDE) is now determined purely by module load order.
* new driver API, that is far more like other kernel APIs:
alloc...register...unregister...free.
* Mor
On Thu, Feb 15, 2007 at 03:48:04PM -0800, Linus Torvalds wrote:
>
>
> On Thu, 15 Feb 2007, Jeff Garzik wrote:
> >
> > diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
> > index db185f3..d51f0f1 100644
> > --- a/arch/ia64/Kconfig
> > +++ b/arch/ia64/Kconfig
> > @@ -22,6 +22,7 @@ config IA64
> >
Linus Torvalds wrote:
On Thu, 15 Feb 2007, Jeff Garzik wrote:
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index db185f3..d51f0f1 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -22,6 +22,7 @@ config IA64
config 64BIT
bool
+ select ATA_NONSTANDARD if ATA
On Thu, 15 Feb 2007, Linus Torvalds wrote:
>
> Ok, this is just _strange_.
Btw, I did pull, but I still think we shouldn't do those kinds of strange
Kconfig file games.
Linus
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
On Thu, 15 Feb 2007, Jeff Garzik wrote:
>
> diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
> index db185f3..d51f0f1 100644
> --- a/arch/ia64/Kconfig
> +++ b/arch/ia64/Kconfig
> @@ -22,6 +22,7 @@ config IA64
>
> config 64BIT
> bool
> + select ATA_NONSTANDARD if ATA
> defaul
Jeff Garzik wrote:
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -352,7 +352,7 @@ static inline int ata_drive_40wire(const u16 *dev_id)
{
if (ata_id_major_version(dev_id) >= 5 && ata_id_is_sata(dev_id))
return 0; /* SATA */
- if (dev_id[93] & 0x4000)
The pile that was waiting for post-conference, largely bug fixes.
As mentioned in the last push, were two other push points planned for
2.6.21:
1) merge libata support for ACPI
2) Remove ugly combined mode hacks in libata-sff and pci/quirks, now
that old-IDE and libata have the necessary impro
On Sun, Feb 11, 2007 at 05:08:17PM -0500, Tejun Heo wrote:
> Markus Trippelsdorf wrote:
> >This update breaks sata_via on my VIA K8T800Pro machine:
> >
> > sata_via :00:0f.0 : failed to iomap PCI BAR 0
> > sata_via :00:0f.0 : out of memory
> > sata_via probe of :00:0f.0 failed with err
Markus Trippelsdorf wrote:
This update breaks sata_via on my VIA K8T800Pro machine:
sata_via :00:0f.0 : failed to iomap PCI BAR 0
sata_via :00:0f.0 : out of memory
sata_via probe of :00:0f.0 failed with error -12
Please post full dmesg and the result of 'lspci -nnvvvxxx'.
--
On Sat, 2007-02-10 at 06:46 +0100, Markus Trippelsdorf wrote:
> sata_via :00:0f.0 : failed to iomap PCI BAR 0
Zero probably isn't allowed any more. We have to use PCI BAR 1 and
upwards only or the poor driver authors will get confused :)
--
dwmw2
-
To unsubscribe from this list: send the l
This update breaks sata_via on my VIA K8T800Pro machine:
sata_via :00:0f.0 : failed to iomap PCI BAR 0
sata_via :00:0f.0 : out of memory
sata_via probe of :00:0f.0 failed with error -12
--
Markus
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body
(just sent this upstream to Andrew and Linus)
This is libata push 1 of 3. This is largely the "accumulated driver
updates" push: lots of minor changes. A few new drivers.
The most notable thing is "devres", an optional subsystem for drivers
that greatly simplifies the task of driver housekeepi
>
> +config PATA_IT8213
> + tristate "IT8213 PATA support (Experimental)"
> + depends on PCI && EXPERIMENTAL
> + help
> + This option enables support for the ITE 821 PATA
Typo (IT8213) - probably my fault but only just noticed it
-
To unsubscribe from this list: send the line
Includes some pre-window-closing stuff (new drivers), but I was waiting
on some bug fixes before pushing.
Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
upstream-linus
to receive the following updates:
drivers/ata/Kconfig
Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
upstream-linus
to receive the following updates:
drivers/ata/libata-core.c |3 +
drivers/ata/sata_promise.c | 120
2 files changed,
Please pull from 'upstream' branch of
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
to obtain the fixes, and new driver, described below:
drivers/scsi/Kconfig|9
drivers/scsi/Makefile |1
drivers/scsi/ahci.c |2
drivers/scsi/sata_mv.c | 84
54 matches
Mail list logo
