2.6.12-rc3-mm3

2.6.12-rc3-mm3

[Andrew Morton]

ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/

- device mapper updates

- more UML updates

- -mm seems unusually stable at present.



Changes since 2.6.12-rc3-mm2:


-ultrastor-build-fix.patch
-bk-driver-core-sn2-build-fix.patch
-jfs-reduce-number-of-synchronous-transactions.patch
-jfs-simplify-creation-of-new-iag.patch
-jfs-changes-for-larger-page-size.patch
-jfs-support-page-sizes-greater-than-4k.patch
-jfs-write-journal-sync-points-more-often.patch
-jfs-dont-allocate-extents-that-overlap-existing-extents.patch
-acpi-bridge-hotadd-acpi-based-root-bridge-hot-add.patch
-acpi-bridge-hotadd-fix-pci_enable_device-for-p2p-bridges.patch
-acpi-bridge-hotadd-make-pcibios_fixup_bus-hot-plug-safe.patch
-acpi-bridge-hotadd-prevent-duplicate-bus-numbers-when-scanning-pci-bridge.patch
-acpi-bridge-hotadd-take-the-pci-lock-when-modifying-pci-bus-or-device-lists.patch
-acpi-bridge-hotadd-link-newly-created-pci-child-bus-to-its-parent-on-creation.patch
-acpi-bridge-hotadd-make-the-pci-remove-routines-safe-for-failed-hot-plug.patch
-acpi-bridge-hotadd-remove-hot-plugged-devices-that-could-not-be-allocated-resources.patch
-acpi-bridge-hotadd-read-bridge-resources-when-fixing-up-the-bus.patch
-acpi-bridge-hotadd-allow-acpi-add-and-start-operations-to-be-done-independently.patch
-acpi-bridge-hotadd-export-the-interface-to-get-pci-id-for-an-acpi-handle.patch
-acpi-based-i-o-apic-hot-plug-add-interfaces.patch
-acpi-based-i-o-apic-hot-plug-ia64-support.patch
-acpi-based-i-o-apic-hot-plug-acpiphp-support.patch
-mptfusion-fix-panic-loading-driver-statically-com.patch
-generic_file_buffered_write-fixes.patch
-rlimit_as-checking-fix.patch
-mm-add-proc-zoneinfo-tidy.patch
-mm-rmapc-cleanup.patch
-mm-pcp-use-non-powers-of-2-for-batch-size.patch
-mempool-nomemalloc-and-noretry.patch
-mempool-simplify-alloc.patch
-mempool-simplify-alloc-fix.patch
-mm-use-__gfp_nomemalloc.patch
-doc-locking-update.patch
-count-bounce-buffer-pages-in-vmstat.patch
-rlimit_memlock-checking-fix.patch
-sync_page-smp_mb-comment.patch
-add-kmalloc_node-inline-cleanup.patch
-mpage_writepages-page-locking-fix.patch
-drop-buffers-oops-fix.patch
-selinux-cleanup-ipc_has_perm.patch
-selinux-add-finer-grained-permissions-to-netlink-audit.patch
-ppc32-fix-errata-for-some-g3-cpus.patch
-ppc32-refactor-fpu-exception-handling-2.patch
-ppc32-fix-for-misreported-sdram-size-on-radstone-ppc7d-platform.patch
-ppc32-add-rtc-hooks-in-ppc7d-platform-file.patch
-ppc32-fix-ide-related-crash-on-wakeup.patch
-macintosh-adbhidc-adb-buttons-support-for.patch
-ppc32-fix-a-sleep-issues-on-some-laptops.patch
-ppc32-fix-address-checking-on-lmw-stmw-align-exception.patch
-ppc32-workaround-for-spurious-irqs-on-pq2.patch
-ppc64-improve-g5-sound-headphone-mute.patch
-ppc32-add-sound-support-for-mac-mini.patch
-pmac-save-master-volume-on-sleep.patch
-ppc64-add-pt_note-section-to-vdso.patch
-ppc64-remove-unused-argument-to-create_slbe.patch
-ppc64-fix-irq-parsing-on-powermac.patch
-ppc64-nvram-cleanups.patch
-ppc64-update-to-use-the-new-4l-headers.patch
-ppc64-tell-firmware-about-kernel-capabilities.patch
-ppc64-remove-hot-busy-wait-loop-in-__hash_page.patch
-ppc64-noexec-fixes.patch
-ppc64-remove-unnecessary-include.patch
-ppc64-firmware-workaround.patch
-ppc64-enforce-medium-thread-priority-in-hypervisor-calls.patch
-ppc64-use-smp_mb-and-smp_wmb.patch
-use-smp_mb-wmb-rmb-where-possible.patch
-ppc64-reverse-prediction-on-spinlock-busy-loop-code.patch
-fix-i386-memcpy.patch
-i386-x86_64-segment-register-access-update.patch
-rfc-check-nmi-watchdog-is-broken.patch
-rfc-check-nmi-watchdog-is-broken-fix.patch
-x86-reboot-add-reboot-fixup-for-gx1-cs5530a.patch
-x86-entrys-trap-return-fixes.patch
-enable-write-combining-for-server-works-le-rev-6.patch
-cpuid-bug-and-inconsistency-fix.patch
-i386-fix-hpet-for-systems-that-dont-support.patch
-irq-and-pci_ids-for-intel-ich7dh-ich7-m-dh.patch
-hda_intel-intel-esb2-support.patch
-cpuid-x87-bit-on-amd-falsely-marked-as-pni.patch
-x86_64-interrupt-handling-fix.patch
-increase-number-of-e820-entries-hard-limit-from-32-to-128.patch
-broadcast-ipi-race-condition-on-cpu-hotplug.patch
-linux-26x-vm86-interrupt-emulation-fixes.patch
-x86-64-handle-empty-e820-regions-correctly.patch
-x86-cacheline-alignment-for-cpu-maps.patch
-x86_64-saved_command_line-overflow-fix.patch
-hp100-fix-card-names.patch
-uml-fix-oops-related-to-exception-table.patch
-uml-add-nfsd-syscall-when-nfsd-is-modular.patch
-uml-fix-handling-of-no-fpx_regs.patch
-uml-workaround-old-problematic-sed-behaviour.patch
-uml-support-aes-i586-crypto-driver.patch
-uml-inline-empty-proc.patch
-uml-move-va_copy-conditional-def.patch
-uml-fix-syscall-table-by-including-subarchs-one-for-i386.patch
-uml-quick-fix-syscall-table-for-x86_64.patch
-uml-fix-syscall-table-by-including-subarchs-one-for-x86-64.patch
-uml-redo-console-locking.patch
-uml-hostfs-avoid-buffers.patch
-uml-commentary-about-forking-flag.patch
-uml-ubd-handle-readonly-status.patch
-s390-regenerate-defconfig.patch
-s390-idle-timer-setup.patch
-s390-fix-memory-holes-and-cleanup-setup_arch.patch
-s390-default-storage-key.patch
-s390-cmm-guest-sender-id.patch
-s390-allow-longer-debug-feature-names.patch
-s390-dasd-readonly-attribute.patch
-s390-enable-write-barriers-in-the-dasd-driver.patch
-s390-dont-pad-cdl-blocks-for-write-requests.patch
-s390-remove-ioctl32-from-dasdcmb.patch
-s390-remove-ioctl32-from-crypto-driver.patch
-s390-cio-documentation.patch
-nice-and-rt-prio-rlimits.patch
-remove-all-kernel-bugs.patch
-exterminate-page_bug.patch
-clean-up-kernel-messages.patch
-move-sa_xxx-defines-to-linux-signalh.patch
-procfs-fix-hardlink-counts.patch
-procfs-fix-hardlink-counts-for-proc-pid-task.patch
-kernel-rcupdatec-make-the-exports-export_symbol_gpl.patch
-add-deprecated_for_modules.patch
-add-deprecated_for_modules-fix.patch
-deprecate-synchronize_kernel-gpl-replacement.patch
-deprecate-synchronize_kernel-gpl-replacement-fix.patch
-change-synchronize_kernel-to-_rcu-and-_sched.patch
-update-rcu-documentation.patch
-reiserfs-make-resize-option-auto-get-new-device-size.patch
-lifeview-flytv-platinum-fm-remote-control-support.patch
-lifeview-flytv-platinum-fm-remote-control-support-fix.patch
-kallsyms-c_symbol_prefix-support.patch
-noop-iosched-kill-on-merge-scan.patch
-add-eownerdead-and-enotrecoverable-version-2.patch
-nbd-dont-create-all-max_nbd-devices-by-default-all-the-time.patch
-nbd-dont-create-all-max_nbd-devices-by-default-all-the-time-fix.patch
-fix-rewriting-on-a-full-reiserfs-filesystem.patch
-vgacon-set-vc_hi_font_mask-correctly.patch
-hangcheck-timer-update-to-090.patch
-w1_therm-support-for-ds18b20-ds1822-thermal-sensors.patch
-consolidate-sigev_pad_size.patch
-misc-verify_area-cleanups.patch
-__attribute__-placement-fixes.patch
-leadtek-winfast-remote-controls.patch
-fix-race-in-block_write_full_page.patch
-reiserfs-journal_init-fix.patch
-dontdiff-file-sorted-in-alphabet-order.patch
-ipmi-fix-for-handling-bad-dmi-data.patch
-ipmi-fix-for-handling-bad-acpi-data.patch
-ipmi-fix-watchdog-so-the-device-can-be-reopened-on-an-unexpected-close.patch
-ipmi-enable-interrupts-on-the-bt-driver.patch
-ipmi-fix-a-deadlock.patch
-sn_console-make-sal_console_uart-static-again.patch
-consolidate-sys_shmat.patch
-fix-tpm-driver-maintainers-entry.patch
-new-valid_signal-function.patch
-convert-code-that-currently-tests-_nsig-directly-to-use-valid_signal.patch
-fix-include-order-in-mthca_memfreec.patch
-serial_cs-reduce-stack-usage-in-serial_event.patch
-makefile-fix-for-compatibility-with-emacs-ctags.patch
-aio-remove-superfluous.patch
-aio-ring-tail.patch
-aio-remove-debug.patch
-aio-run-iocb.patch
-hfs-hfsplus-dont-leak-s_fs_info-and-fix-an-oops.patch
-autofs4-wait-order-fix.patch
-autofs4-tree-race-fix.patch
-autofs4-tree-race-fix-fix.patch
-autofs4-tree-race-fix-fix-fix.patch
-autofs4-bump-version-number.patch
-reiserfs-endianness-clone-struct-reiserfs_key.patch
-reiserfs-endianness-annotate-little-endian-objects.patch
-reiserfs-endianness-fix-endianness-bugs.patch
-reiserfs-endianness-comp_short_keys-cleanup.patch
-reiserfs-endianness-sanitize-reiserfs_key-union.patch
-cx88-dvb-oops-fix.patch
-dvb-cx22702-frontend-driver-update.patch
-v4l-msp3400-update.patch
-ext3-remove-unnecessary-race-then-retry-in-ext3_get_block.patch
-ext3-remove-unnecessary-race-then-retry-in-ext3_get_block-leak-fix.patch
-saa7134-add-oem-version-of-already-supported-card.patch
-altix-ioc4-serial-set-hfc-from-ioctl.patch
-altix-ioc4-serial-set-a-better-timeout-threshold.patch
-altix-ioc4-serial-small-uart-setup-mods.patch
-altix-ioc4-serial-arm-the-read-timeout-timer-before-the-first-read.patch
-fbdev-batch-cmap-changes-at-driver-level.patch
-nvidiafb-ioremap-and-i2c-fixes.patch
-nvidiafb-ioremap-and-i2c-fixes-fix.patch
-fbdev-edidh-cleanups.patch
-fbcon-fix-check-after-use.patch
-intelfb-remove-intelfbdrvh.patch
-i810fb-fix-default-monitor-sync-timings.patch
-imxfb-add-freescale-imx-framebuffer-driver.patch
-better-pll-frequency-matching-for-tdfxfb-driver.patch
-clean-up-and-bug-fix-for-tdfxfb-framebuffer-size-detection.patch
-docbook-changes-and-extensions-to-the-kernel-documentation.patch
-docbook-fix-void-xml-tag.patch
-docbook-fix-some-descriptions.patch
-docbook-use-informalexample-for-examples.patch
-docbook-remove-obsolete-templates.patch
-docbook-use-xmlto-to-process-the-docbook-files.patch
-docbook-use-custom-stylesheet.patch
-docbook-fix-html-link.patch
-docbook-tell-users-to-install-xmlto-not-stylesheets.patch
-documentation-remove-super-nr-max-to-reflect-fs-superc.patch
-drivers-isdn-divert-isdn_divertc-make-5-functions-static.patch
-drivers-isdn-capi-make-some-code-static.patch
-drivers-scsi-pas16c-make-code-static.patch
-i386-x86_64-early_printkc-make-early_serial_base-static.patch
-kernel-exitc-make-exit_mm-static.patch
-drivers-serial-jsm-make-2-functions-static.patch
-arch-i386-kernel-cpu-mtrr-genericc-make-generic_get_mtrr-static.patch
-drivers-serial-8250c-make-a-variable-static.patch
-drivers-media-video-bttv-driverc-make-2-functions-static.patch
-drivers-media-video-cx88-possible-cleanups.patch
-drivers-media-video-saa7134-saa7134-dvbc-make-a-struct-static.patch
-drivers-char-agp-make-code-static.patch
-drivers-char-rio-rio_linuxc-make-a-variable-static.patch
-drivers-char-stallionc-make-a-function-static.patch
-drivers-pnp-pnpbios-rsparserc-fix-an-array-overflow.patch
-drivers-video-radeonfbc-fix-an-array-overflow.patch
-drivers-pnp-pnpacpi-rsparserc-fix-an-array-overflow.patch
-drivers-input-joystick-spaceorbc-fix-an-array-overflow.patch
-sound-oss-sonicvibesc-fix-an-array-overflow.patch

 Merged upstream

+avoid-enomem-due-reclaimable-slab-caches.patch

 VFS slab reclaim accounting fix

-gregkh-01-driver-gregkh-driver-001_driver-name-const-01.patch
-gregkh-01-driver-gregkh-driver-002_driver-name-const-02.patch
-gregkh-01-driver-gregkh-driver-003_driver-name-const-03.patch
-gregkh-01-driver-gregkh-driver-004_driver-name-const-04.patch
-gregkh-01-driver-gregkh-driver-005_driver-name-const-05.patch
-gregkh-01-driver-gregkh-driver-006_class-01-core.patch
-gregkh-01-driver-gregkh-driver-007_class-02-tty.patch
-gregkh-01-driver-gregkh-driver-008_class-03-input.patch
-gregkh-01-driver-gregkh-driver-009_class-04-usb.patch
-gregkh-01-driver-gregkh-driver-010_class-05-sound.patch
-gregkh-01-driver-gregkh-driver-011_class-06-block.patch
-gregkh-01-driver-gregkh-driver-012_class-07-char.patch
-gregkh-01-driver-gregkh-driver-013_class-08-ieee1394.patch
-gregkh-01-driver-gregkh-driver-014_class-09-scsi.patch
-gregkh-01-driver-gregkh-driver-015_class-10-arch.patch
-gregkh-01-driver-gregkh-driver-016_class-11-drivers.patch
-gregkh-01-driver-gregkh-driver-017_class-12-the_rest.patch
-gregkh-01-driver-gregkh-driver-018_class-13-kerneldoc.patch
-gregkh-01-driver-gregkh-driver-019_class-14-no_more_class_simple.patch
-gregkh-01-driver-gregkh-driver-020_class-15-typo-01.patch
-gregkh-01-driver-gregkh-driver-021_class-16-typo-02.patch
-gregkh-01-driver-gregkh-driver-022_class-17-attribute.patch
-gregkh-01-driver-gregkh-driver-023_klist-01.patch
-gregkh-01-driver-gregkh-driver-024_klist-02.patch
-gregkh-01-driver-gregkh-driver-025_klist-03.patch
-gregkh-01-driver-gregkh-driver-026_klist-04.patch
-gregkh-01-driver-gregkh-driver-027_klist-05.patch
-gregkh-01-driver-gregkh-driver-028_klist-06.patch
-gregkh-01-driver-gregkh-driver-029_klist-07.patch
-gregkh-01-driver-gregkh-driver-030_klist-08.patch
-gregkh-01-driver-gregkh-driver-031_klist-09.patch
-gregkh-01-driver-gregkh-driver-032_klist-10.patch
-gregkh-01-driver-gregkh-driver-033_klist-11.patch
-gregkh-01-driver-gregkh-driver-034_klist-12.patch
-gregkh-01-driver-gregkh-driver-035_klist-13.patch
-gregkh-01-driver-gregkh-driver-036_klist-14.patch
-gregkh-01-driver-gregkh-driver-037_klist-15.patch
-gregkh-01-driver-gregkh-driver-038_klist-16.patch
-gregkh-01-driver-gregkh-driver-039_klist-17.patch
-gregkh-01-driver-gregkh-driver-040_klist-18.patch
-gregkh-01-driver-gregkh-driver-041_klist-scsi-01.patch
-gregkh-01-driver-gregkh-driver-042_klist-scsi-02.patch
-gregkh-01-driver-gregkh-driver-043_klist-20.patch
-gregkh-01-driver-gregkh-driver-044_klist-21.patch
-gregkh-01-driver-gregkh-driver-045_klist-22.patch
-gregkh-01-driver-gregkh-driver-046_klist-23.patch
-gregkh-01-driver-gregkh-driver-047_klist-ieee1394.patch
-gregkh-01-driver-gregkh-driver-048_klist-pcie.patch
-gregkh-01-driver-gregkh-driver-049_klist-24.patch
-gregkh-01-driver-gregkh-driver-050_klist-25.patch
-gregkh-01-driver-gregkh-driver-051_klist-26.patch
-gregkh-01-driver-gregkh-driver-052_klist-usb_node_attached_fix.patch
+gregkh-01-driver-gregkh-driver-001_driver-hotplug_check.patch
+gregkh-01-driver-gregkh-driver-002_debugfs_simple_newline.patch
+gregkh-01-driver-gregkh-driver-009_driver-name-const-01.patch
+gregkh-01-driver-gregkh-driver-010_driver-name-const-02.patch
+gregkh-01-driver-gregkh-driver-011_driver-name-const-03.patch
+gregkh-01-driver-gregkh-driver-012_driver-name-const-04.patch
+gregkh-01-driver-gregkh-driver-013_driver-name-const-05.patch
+gregkh-01-driver-gregkh-driver-014_driver-name-const-06.patch
+gregkh-01-driver-gregkh-driver-015_sysfs-show_store_eio-01.patch
+gregkh-01-driver-gregkh-driver-016_sysfs-show_store_eio-02.patch
+gregkh-01-driver-gregkh-driver-017_sysfs-show_store_eio-03.patch
+gregkh-01-driver-gregkh-driver-018_sysfs-show_store_eio-04.patch
+gregkh-01-driver-gregkh-driver-019_sysfs-show_store_eio-05.patch
+gregkh-01-driver-gregkh-driver-020_class-01-core.patch
+gregkh-01-driver-gregkh-driver-021_class-02-tty.patch
+gregkh-01-driver-gregkh-driver-022_class-03-input.patch
+gregkh-01-driver-gregkh-driver-023_class-04-usb.patch
+gregkh-01-driver-gregkh-driver-024_class-05-sound.patch
+gregkh-01-driver-gregkh-driver-025_class-06-block.patch
+gregkh-01-driver-gregkh-driver-026_class-07-char.patch
+gregkh-01-driver-gregkh-driver-027_class-08-ieee1394.patch
+gregkh-01-driver-gregkh-driver-028_class-09-scsi.patch
+gregkh-01-driver-gregkh-driver-029_class-10-arch.patch
+gregkh-01-driver-gregkh-driver-030_class-11-drivers.patch
+gregkh-01-driver-gregkh-driver-031_class-11-drivers-usb-fix.patch
+gregkh-01-driver-gregkh-driver-032_class-12-the_rest.patch
+gregkh-01-driver-gregkh-driver-033_class-13-kerneldoc.patch
+gregkh-01-driver-gregkh-driver-034_class-14-no_more_class_simple.patch
+gregkh-01-driver-gregkh-driver-035_class-15-typo-01.patch
+gregkh-01-driver-gregkh-driver-036_class-16-typo-02.patch
+gregkh-01-driver-gregkh-driver-037_class-17-attribute.patch
+gregkh-01-driver-gregkh-driver-038_klist-01.patch
+gregkh-01-driver-gregkh-driver-039_klist-02.patch
+gregkh-01-driver-gregkh-driver-040_klist-03.patch
+gregkh-01-driver-gregkh-driver-041_klist-04.patch
+gregkh-01-driver-gregkh-driver-042_klist-05.patch
+gregkh-01-driver-gregkh-driver-043_klist-06.patch
+gregkh-01-driver-gregkh-driver-044_klist-07.patch
+gregkh-01-driver-gregkh-driver-045_klist-08.patch
+gregkh-01-driver-gregkh-driver-046_klist-09.patch
+gregkh-01-driver-gregkh-driver-047_klist-10.patch
+gregkh-01-driver-gregkh-driver-048_klist-11.patch
+gregkh-01-driver-gregkh-driver-049_klist-12.patch
+gregkh-01-driver-gregkh-driver-050_klist-13.patch
+gregkh-01-driver-gregkh-driver-051_klist-14.patch
+gregkh-01-driver-gregkh-driver-052_klist-15.patch
+gregkh-01-driver-gregkh-driver-053_klist-16.patch
+gregkh-01-driver-gregkh-driver-054_klist-17.patch
+gregkh-01-driver-gregkh-driver-055_klist-18.patch
+gregkh-01-driver-gregkh-driver-056_klist-scsi-01.patch
+gregkh-01-driver-gregkh-driver-057_klist-scsi-02.patch
+gregkh-01-driver-gregkh-driver-058_klist-20.patch
+gregkh-01-driver-gregkh-driver-059_klist-21.patch
+gregkh-01-driver-gregkh-driver-060_klist-22.patch
+gregkh-01-driver-gregkh-driver-061_klist-23.patch
+gregkh-01-driver-gregkh-driver-062_klist-ieee1394.patch
+gregkh-01-driver-gregkh-driver-063_klist-pcie.patch
+gregkh-01-driver-gregkh-driver-064_klist-24.patch
+gregkh-01-driver-gregkh-driver-065_klist-25.patch
+gregkh-01-driver-gregkh-driver-066_klist-26.patch
+gregkh-01-driver-gregkh-driver-067_klist-usb_node_attached_fix.patch
+gregkh-01-driver-gregkh-driver-068_klist-sn_fix.patch

 Some of this was merged and some of it was randomly renamed.

+fix-make-mandocs-after-class_simplec-removal.patch

 kerneldoc fix

+gregkh-02-i2c-gregkh-i2c-003_w1-ds18xx_sensors.patch
+gregkh-02-i2c-gregkh-i2c-004_w1-new_rom_family.patch
+gregkh-02-i2c-gregkh-i2c-005_i2c-rtc8564_duplicate_include.patch
+gregkh-02-i2c-gregkh-i2c-006_i2c-vid_h.patch
+gregkh-02-i2c-gregkh-i2c-007_i2c-atxp1.patch
+gregkh-02-i2c-gregkh-i2c-008_i2c-atxp1-cleanup.patch
+gregkh-02-i2c-gregkh-i2c-009_i2c-ds1337-01.patch
+gregkh-02-i2c-gregkh-i2c-010_i2c-ds1337-02.patch
+gregkh-02-i2c-gregkh-i2c-011_i2c-ds1337-03.patch
+gregkh-02-i2c-gregkh-i2c-012_i2c-config_cleanup-01.patch
+gregkh-02-i2c-gregkh-i2c-013_i2c-config_cleanup-02.patch
+gregkh-02-i2c-gregkh-i2c-014_i2c-ali1563.patch
+gregkh-02-i2c-gregkh-i2c-015_i2c-adm9240.patch
+gregkh-02-i2c-gregkh-i2c-016_i2c-w83627ehf.patch
+gregkh-02-i2c-gregkh-i2c-017_i2c-w83627ehf-cleanup.patch
+gregkh-02-i2c-gregkh-i2c-018_i2c-smsc47m1.patch
+gregkh-02-i2c-gregkh-i2c-019_i2c-spelling_fixes.patch
+gregkh-02-i2c-gregkh-i2c-020_i2c-mpc-share_interrupt.patch

 i2c updates

-bk-kbuild.patch
-bk-kbuild-cvs-fixes.patch

 Dropped

-gregkh-03-pci-gregkh-pci-001_pci-is_enabled_fix.patch
-gregkh-03-pci-gregkh-pci-002_pci-pci_get_slot-docs.patch
-gregkh-03-pci-gregkh-pci-003_pci-stale_pm_docs.patch
-gregkh-03-pci-gregkh-pci-004_pci-sparse_cleanup.patch
-gregkh-03-pci-gregkh-pci-005_pci-sysfs-pciconfig-readwrite.patch
-gregkh-03-pci-gregkh-pci-006_pci_shutdown.patch
-gregkh-03-pci-gregkh-pci-007_pci-ibmphp-bugfix.patch
-gregkh-03-pci-gregkh-pci-008_pci-hance_quirk.patch
-gregkh-03-pci-gregkh-pci-009_pci-pci-transparent-bridge-handling-improvements-pci-core.patch
-gregkh-03-pci-gregkh-pci-010_pci-pirq_table_addr-out-of-range.patch
-gregkh-03-pci-gregkh-pci-011_pci-get_device-01.patch
-gregkh-03-pci-gregkh-pci-012_pci-get_device-02.patch
-gregkh-03-pci-gregkh-pci-013_pci-acpiphp-01.patch
-gregkh-03-pci-gregkh-pci-014_pci-acpiphp-02.patch
-gregkh-03-pci-gregkh-pci-015_pci-acpiphp-03.patch
-gregkh-03-pci-gregkh-pci-016_pci-acpiphp-04.patch
-gregkh-03-pci-gregkh-pci-017_pci-acpiphp-05.patch
+gregkh-03-pci-gregkh-pci-012_pci-pci-transparent-bridge-handling-improvements-pci-core.patch
+gregkh-03-pci-gregkh-pci-013_pci-pirq_table_addr-out-of-range.patch
+gregkh-03-pci-gregkh-pci-014_pci-get_device-01.patch
+gregkh-03-pci-gregkh-pci-015_pci-get_device-02.patch
+gregkh-03-pci-gregkh-pci-016_pci-acpiphp-02.patch
+gregkh-03-pci-gregkh-pci-017_pci-acpiphp-03.patch
+gregkh-03-pci-gregkh-pci-018_pci-acpiphp-04.patch
+gregkh-03-pci-gregkh-pci-019_pci-acpiphp-05.patch
+gregkh-03-pci-gregkh-pci-020_pci-acpiphp-06.patch
+gregkh-03-pci-gregkh-pci-021_pci-acpiphp-07.patch
+gregkh-03-pci-gregkh-pci-022_pci-acpiphp-08.patch
+gregkh-03-pci-gregkh-pci-023_pci-acpiphp-09.patch
+gregkh-03-pci-gregkh-pci-024_pci-acpiphp-10.patch
+gregkh-03-pci-gregkh-pci-025_pci-acpiphp-11.patch
+gregkh-03-pci-gregkh-pci-026_pci-acpiphp-12.patch
+gregkh-03-pci-gregkh-pci-027_pci-acpiphp-13.patch
+gregkh-03-pci-gregkh-pci-028_pci-acpiphp-14.patch
+gregkh-03-pci-gregkh-pci-029_pci-acpiphp-15.patch
+gregkh-03-pci-gregkh-pci-030_pci-acpiphp-16.patch
+gregkh-03-pci-gregkh-pci-031_pci-acpiphp-17.patch
+gregkh-03-pci-gregkh-pci-032_pci-acpiphp-18.patch
+gregkh-03-pci-gregkh-pci-033_pci-acpiphp-19.patch
+gregkh-03-pci-gregkh-pci-034_pci-acpiphp-20.patch

 Some mergings, some renamings, some new stuff.

-gregkh-04-USB-gregkh-usb-015_usb-storage_build_fix.patch
-gregkh-04-USB-gregkh-usb-018_usb-airprime.patch
-gregkh-04-USB-gregkh-usb-019_usb-airprime-num_devices.patch
-gregkh-04-USB-gregkh-usb-020_usb-g_file_storage_min.patch
-gregkh-04-USB-gregkh-usb-021_usb-g_file_storage_stall.patch
-gregkh-04-USB-gregkh-usb-022_usb-ehci_power_fixes.patch
-gregkh-04-USB-gregkh-usb-023_usb-omap_udc_update.patch
-gregkh-04-USB-gregkh-usb-024_usb-isp116x-hcd-add.patch
-gregkh-04-USB-gregkh-usb-025_usb-isp116x-hcd-fix.patch
-gregkh-04-USB-gregkh-usb-026_usb-turn-a-user-mode-driver-error-into-a-hard-error.patch
-gregkh-04-USB-gregkh-usb-027_usb-uhci-01.patch
-gregkh-04-USB-gregkh-usb-028_usb-uhci-02.patch
-gregkh-04-USB-gregkh-usb-029_usb-uhci-03.patch
-gregkh-04-USB-gregkh-usb-030_usb-uhci-04.patch
-gregkh-04-USB-gregkh-usb-031_usb-uhci-05.patch
-gregkh-04-USB-gregkh-usb-032_usb-uhci-06.patch
-gregkh-04-USB-gregkh-usb-033_usb-uhci-07.patch
-gregkh-04-USB-gregkh-usb-034_usb-root_hub_irq.patch
-gregkh-04-USB-gregkh-usb-035_usb-cdc_acm.patch
-gregkh-04-USB-gregkh-usb-036_usb-usbtest.patch
-gregkh-04-USB-gregkh-usb-037_usb-ohci_reboot_notifier.patch
-gregkh-04-USB-gregkh-usb-038_usb_serial_status.patch
-gregkh-04-USB-gregkh-usb-039_usb-zd1201_pm.patch
-gregkh-04-USB-gregkh-usb-040_usb-remove_hub_set_power_budget.patch
-gregkh-04-USB-gregkh-usb-041_usb-device_pointer.patch
-gregkh-04-USB-gregkh-usb-042_usb-hcd_fix_for_remove_hub_set_power_budget.patch
-gregkh-04-USB-gregkh-usb-043_usb-usbcore_usb_add_hcd.patch
-gregkh-04-USB-gregkh-usb-044_usb-hcds_no_more_register_root_hub.patch
+gregkh-04-USB-gregkh-usb-011_usb-g_file_storage_min.patch
+gregkh-04-USB-gregkh-usb-012_usb-g_file_storage_stall.patch
+gregkh-04-USB-gregkh-usb-013_usb-omap_udc_update.patch
+gregkh-04-USB-gregkh-usb-014_usb-isp116x-hcd-add.patch
+gregkh-04-USB-gregkh-usb-015_usb-isp116x-hcd-fix.patch
+gregkh-04-USB-gregkh-usb-016_usb-turn-a-user-mode-driver-error-into-a-hard-error.patch
+gregkh-04-USB-gregkh-usb-017_usb-uhci-01.patch
+gregkh-04-USB-gregkh-usb-018_usb-uhci-02.patch
+gregkh-04-USB-gregkh-usb-019_usb-uhci-03.patch
+gregkh-04-USB-gregkh-usb-020_usb-uhci-04.patch
+gregkh-04-USB-gregkh-usb-021_usb-uhci-05.patch
+gregkh-04-USB-gregkh-usb-022_usb-uhci-06.patch
+gregkh-04-USB-gregkh-usb-023_usb-uhci-07.patch
+gregkh-04-USB-gregkh-usb-024_usb-uhci-08.patch
+gregkh-04-USB-gregkh-usb-025_usb-root_hub_irq.patch
+gregkh-04-USB-gregkh-usb-026_usb-cdc_acm.patch
+gregkh-04-USB-gregkh-usb-027_usb-usbtest.patch
+gregkh-04-USB-gregkh-usb-028_usb-ohci_reboot_notifier.patch
+gregkh-04-USB-gregkh-usb-029_usb_serial_status.patch
+gregkh-04-USB-gregkh-usb-030_usb-zd1201_pm.patch
+gregkh-04-USB-gregkh-usb-031_usb-zd1201_pm-02.patch
+gregkh-04-USB-gregkh-usb-032_usb-remove_hub_set_power_budget.patch
+gregkh-04-USB-gregkh-usb-033_usb-device_pointer.patch
+gregkh-04-USB-gregkh-usb-034_usb-hcd_fix_for_remove_hub_set_power_budget.patch
+gregkh-04-USB-gregkh-usb-035_usb-usbcore_usb_add_hcd.patch
+gregkh-04-USB-gregkh-usb-036_usb-hcds_no_more_register_root_hub.patch
+gregkh-04-USB-gregkh-usb-037_usb-ub_multi_lun.patch
+gregkh-04-USB-gregkh-usb-038_usb-rndis_cleanups.patch
+gregkh-04-USB-gregkh-usb-039_usb-ethernet_gadget_cleanups.patch
+gregkh-04-USB-gregkh-usb-040_usb-omap_udc_cleanups.patch
+gregkh-04-USB-gregkh-usb-041_usb-dummy_hcd-otg.patch
+gregkh-04-USB-gregkh-usb-042_usb-dummy_hcd-FEAT.patch
+gregkh-04-USB-gregkh-usb-043_usb-dummy_hcd-pdevs.patch
+gregkh-04-USB-gregkh-usb-044_usb-dummy_hcd-centralize-link.patch
+gregkh-04-USB-gregkh-usb-045_usb-dummy_hcd-root-hub_no-polling.patch

 Mergings, renamings, additions.

+hub-use-kthread.patch

 Use kthread API for khubd.

+proc-pid-smaps-fix-fix.patch

 Fix /proc/pid/smaps even more

+hugepage-consolidation.patch
+hugepage-consolidation-fix.patch
+hugepage-consolidation-fix-fix.patch
+hugepage-consolidation-ia64-fix.patch

 Hugepage code consolidation.  Needs testing on various architectures.

+node-local-per-cpu-pages.patch
+node-local-per-cpu-pages-tidy.patch
+node-local-per-cpu-pages-tidy-2.patch

 More the per-cpu-pages data structures into node-local storage on NUMA.

+remove-drivers-net-skfp-lnkstatc.patch

 Ded code

+fix-promisc-bridging-in-tlan-driver.patch

 tlan driver fix

+ppc32-platform-specific-functions-missing-from-kallsyms.patch
+ppc32-simplified-ppc-core-revision-report.patch
+ppc64-remove-hidden-fno-omit-frame-pointer-for-schedulec.patch
+ppc64-add-missing-kconfig-help-text.patch
+ppc64-pgtableh-and-other-header-cleanups.patch

 ppc32/ppc64 updates

+added-no_ioapic_check-in-io_apic_get_unique_id-for-acpi-boot.patch

 Allow xAPIC systems that don't have serial bus for interrupt delivery to
 by-pass the check on uniquness of IO-APIC IDs.

+x86-stack-initialisation-fix.patch

 x86 thread startup fix

+x86-x86_64-pcibus_to_node.patch

 Add pcibus_to_node().

+numa-aware-block-device-control-structure-allocation.patch
+numa-aware-block-device-control-structure-allocation-tidy.patch

 Use pcibus_to_node() in block drivers so that driver data structures are
 allocated from the memory of the node which owns the hardware.

+optimise-storage-of-read-mostly-variables.patch

 Create a new section for read-mostly storage, use it.

+x86-x86_64-deferred-handling-of-writes-to-proc-irq-xx-smp_affinitypatch-added-to-mm-tree-fix-4.patch
+x86-x86_64-deferred-handling-of-writes-to-proc-irq-xx-smp_affinitypatch-added-to-mm-tree-fix-5.patch

 Fix x86-x86_64-deferred-handling-of-writes-to-proc-irq-xx-smp_affinitypatch-added-to-mm-tree.patch

+uml-obvious-compile-fixes-for-x86-64-subarch-and-x86-regression-fixes.patch
+uml-kludgy-compilation-fixes-for-x86-64-subarch-modules-support.patch
+x86_64-make-string-func-definition-work-as-intended.patch
+x86_64-make-string-func-definition-work-as-intended-fix.patch
+uml-include-the-linker-script-rather-than-symlink-it.patch
+uml-use-variables-rather-than-symlinks-in-dependencies.patch
+uml-start-cross-build-support-mk_user_constants.patch
+uml-cross-build-support-mk_ptregs.patch
+uml-cross-build-support-mk_sc.patch
+uml-cross-build-support-kernel_offsets.patch
+uml-cross-build-support-mk_thread.patch
+uml-cross-build-support-mk_task-and-mk_constants.patch
+uml-fix-missing-subdir-in-x86_64.patch
+uml-finish-cross-build-support.patch
+uml-fix-a-ptrace-call.patch
+uml-s390-preparation-abstract-host-page-fault-data.patch
+uml-fix-sigwinch-relaying.patch
+uml-tidy-makefilerules.patch
+uml-inclusion-cleanup.patch
+uml-hostfs-failed-mount-handling.patch
+uml-s390-preparation-elfh.patch
+uml-s390-preparation-linkageh-inherited-from-host.patch
+uml-s390-preparation-checksumming-done-in-arch-code.patch
+uml-s390-preparation-delay-moved-to-arch.patch
+uml-s390-preparation-sighandler-interface-abstraction.patch
+uml-remove-a-dangling-symlink.patch
+uml-header-and-code-cleanup.patch

 UML updates

+blk-no-memory-barrier.patch
+blk-branch-hints.patch
+blk-unplug-later.patch
+blk-__make_request-efficiency.patch
+blk-reduce-locking.patch
+blk-reduce-locking-fixes.patch
+blk-light-iocontext-ops.patch
+blk-fastpath-get_request.patch

 BLock layer code tweaks

+timers-fix-__mod_timer-vs-__run_timers-deadlock.patch
+timers-fix-__mod_timer-vs-__run_timers-deadlock-tidy.patch
+timers-comments-update.patch

 Hopefully fixe the new timer code

+kprobes-allow-multiple-kprobes-at-the-same-address.patch

 kprobes feature/fix

+__block_write_full_page-race-fix.patch
+__block_write_full_page-speedup.patch
+__block_write_full_page-simplification.patch

 VFS fixes

+remove-bk-documentation.patch

 Remove BK documentation

+rpc-kick-off-socket-connect-operations-faster.patch

 NFS fix

+remove-register_ioctl32_conversion-and-unregister_ioctl32_conversion.patch

 Remove [un]register_ioctl32_conversion()

+update-dontdiff.patch

 dontdiff update

+page_uptodate_lock-hashing.patch

 Reduce VFS lock contention

+saa6752hs-resolutions-handling.patch

 v4l fix

+pcmcia-enable-32-bit-memory-windows-on-pd6729.patch
+pcmcia-yenta-ti-align-irq-of-func1-to-func0-if-intrtie-is-set.patch

 pcmcia fixes

+dac960-add-support-for-mylex-acceleraid-4-5-600.patch

 Additional dac960 device support

+remove-outdated-comments-from-filemapc.patch

 Comment fix

+remove-do_sync-parameter-from-__invalidate_device.patch
+remove-do_sync-parameter-from-__invalidate_device-fix.patch

 Code simplification

+bttv-fix-dst-i2c-read-write-timeout-failure.patch

 bttv fix

+orinoco-maintainers-update.patch

 MAINTAINERS update

+connector.patch

 Connector thingy - wrapper on top of netlink.

+inotify-44-update.patch

 inotify fixes

+revert-ext3-writepages-support-for-writeback-mode.patch

 Revert recent ext3 feature: it's deadlocky.

+pcmcia-mark-parent-bridge-windows-as-resources-available-for-pcmcia-devices-fix.patch

 Fix pcmcia-mark-parent-bridge-windows-as-resources-available-for-pcmcia-devices.patch

+pcmcia-documentation-fix.patch

 PCMCIA documentation

+make-page-becoming-writable-notification-a-vma-op-only-kafs-fix-fix.patch

 Fix make-page-becoming-writable-notification-a-vma-op-only-kafs-fix.patch

+device-mapper-store-bdev-while-frozen.patch
+device-mapper-__unlock_fs-void.patch
+device-mapper-let-freeze_bdev-return-error.patch
+device-mapper-handle-__lock_fs-error.patch
+device-mapper-tidy-dm_suspend.patch
+device-mapper-multipath-use-private-workqueue.patch
+device-mapper-dm-emc-fix-a-memset.patch
+device-mapper-some-missing-statics.patch

 devicemapper updates

+fs-jffs2-make-some-functions-static.patch
+fs-nls-nls_basec-make-a-variable-static.patch
+fs-make-some-code-static.patch
+drivers-char-keyboardc-make-a-function-static.patch
+drivers-video-fbmemc-make-a-function-static.patch
+drivers-video-fbsysfsc-make-a-struct-static.patch
+drivers-video-sis-make-some-functions-static.patch
+drivers-md-make-some-code-static.patch
+drivers-net-appletalk-make-2-firmware-images-static-const.patch
+drivers-net-arcnet-capmodec-make-a-struct-static.patch
+drivers-cdrom-cdu31ac-make-some-code-static.patch
+floppy-driver-make-fd_routine-static.patch
+drivers-cdrom-mcdxc-make-code-static.patch
+drivers-block-rdc-make-a-variable-static.patch
+drivers-cdrom-sbpcdc-make-a-function-static.patch
+fs-nfs-make-some-functions-static.patch

 Make more things static

+fs-jffs-cleanups.patch
+fs-ncpfs-remove-unused-ifdef-use_old_slow_directory_listing-code.patch
+drivers-net-seeq8005c-cleanups.patch
+drivers-net-hamradio-cleanups.patch
+drivers-net-irda-irportc-cleanups.patch
+drivers-net-tokenring-cleanups.patch
+drivers-net-sk98lin-possible-cleanups.patch
+drivers-net-skfp-fix-little_endian.patch
+drivers-net-ewrk3c-remove-dead-code.patch
+drivers-net-arcnet-possible-cleanups.patch
+drivers-block-sx8c-remove-unused-code.patch
+drivers-video-matrox-matroxfb_miscc-remove-dead-code.patch
+drivers-char-mwave-tp3780ic-remove-dead-code.patch
+drivers-scsi-sym53c416c-fix-a-wrong-check.patch
+drivers-block-ll_rw_blkc-cleanups.patch
+change-the-sound_prime-handling.patch
+i386-cleanup-boot_cpu_logical_apicid-variables.patch

 Little fixes

+__deprecated_for_modules-insert_resource.patch
+__deprecated_for_modules-panic_timeout.patch

Deprecate modular usage of a couple of symbols.


number of patches in -mm: 925
number of changesets in external trees: 429
number of patches in -mm only: 915
total patches: 1344


All 925 patches: ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/patch-list

Re: 2.6.12-rc3-mm3

[Richard A Nelson]

On Wed, 4 May 2005, Andrew Morton wrote:

> - -mm seems unusually stable at present.

I have, on the home box, an issue with alsa
	2.6.12-rc3 works fine
	2.6.12-rc3-rc3, and rc2-xx(forgot) fail

There are unresolved symbols loading snd_via82xx

The box at work is hung at the moment, so I'll check it in the morning,
but it was having problems with
	* bad skb fields on lo
	* ingress filtering was issuing errors

I'll append more in the morning when I can reboot the box
-- 
Rick Nelson
How do I type "for i in *.dvi do xdvi i done" in a GUI?
(Discussion in comp.os.linux.misc on the intuitiveness of interfaces.)

Re: 2.6.12-rc3-mm3

[Francois Romieu]

Andrew Morton <akpm@osdl.org> :
[...]
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/

r8169-new-pci-id.patch was announced in 2.6.12-rc3-mm1. It disappeared in
2.6.12-rc3-mm{2/3} without notification.

The change included in this patch is currently not in 2.6.12-rc3-mm3 as a
whole, nor in -linus as of b2d84f078a8be40f5ae3b4d2ac001e2a7f45fe4f

Is there a reason for the removal ?

On a related note, is it suggested to wait for a renewed -netdev tree or
to feed the pending r8169 stuff to -mm ?

--
Ueimor

Re: 2.6.12-rc3-mm3

[Rafael J. Wysocki]

On Thursday, 5 of May 2005 07:10, Andrew Morton wrote:
> 
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/
> 

A small compile fix follows.

Greets,
Rafael


Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

--- orig/net/decnet/dn_dev.c	2005-05-05 13:30:35.000000000 +0200
+++ linux-2.6.12-rc3-mm3/net/decnet/dn_dev.c	2005-05-05 14:16:08.000000000 +0200
@@ -1426,7 +1426,7 @@ static struct rtnetlink_link dnet_rtnetl
 	[RTM_GETRULE  - RTM_BASE] = { .dumpit	= dn_fib_dump_rules,	},
 #else
 	[RTM_GETROUTE - RTM_BASE] = { .doit	= dn_cache_getroute,
-				      .dumpit	= dn_cache_dump,	
+				      .dumpit	= dn_cache_dump,	},
 #endif
 
 };

-- 
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
		-- Lewis Carroll "Alice's Adventures in Wonderland"

Re: 2.6.12-rc3-mm3

[Rafael J. Wysocki]

On Thursday, 5 of May 2005 07:10, Andrew Morton wrote:
> 
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/
> 
> - device mapper updates
> 
> - more UML updates
> 
> - -mm seems unusually stable at present.

Well, it does not boot on my box (Athlon64 + NForce3, 64-bit).  Apparently, it
loops forever in the early stage (ie before displaying the pengiun).  I'll try
to get more information when I find something to attach to the serial port ...

Greets,
Rafael


-- 
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
		-- Lewis Carroll "Alice's Adventures in Wonderland"

Re: 2.6.12-rc3-mm3

[Valdis.Kletnieks]

[-- Attachment #1: Type: text/plain, Size: 991 bytes --]

On Wed, 04 May 2005 22:10:57 PDT, Andrew Morton said:
> 
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/
> 
> - device mapper updates
> 
> - more UML updates
> 
> - -mm seems unusually stable at present.

Indeed.  Line counts for the announcement e-mails for the 2.6.12-rc*-mm*:

2.6.12-rc1-mm1 2345
2.6.12-rc1-mm2 3048
2.6.12-rc1-mm3 2861
2.6.12-rc1-mm4 2612
2.6.12-rc2-mm1 2460
2.6.12-rc2-mm2 2610
2.6.12-rc2-mm3 2763
2.6.12-rc3-mm1 1236
2.6.12-rc3-mm2  105
2.6.12-rc3-mm3  796

(Presuming that the linecounts are at least roughly proportional to the
churn in patches added/merged/dropped).  The surprising thing for me this
time around was the 223 "merged upstream" patches - seemed a bit high for
this point in -rc3.  I admit *not* having looked at the list in detail and
they might all be minor bugfixes, or compared it to similar stages of
previous -rc3's.

And yes, it compiles and boots cleanly on my Dell laptop, for what that's worth. ;)

[-- Attachment #2: Type: application/pgp-signature, Size: 226 bytes --]

Re: 2.6.12-rc3-mm3

[Borislav Petkov]

build.log:

<snip>
fs/namei.c: In function `vfs_rename':
fs/namei.c:2177: warning: passing arg 1 of `fsnotify_oldname_init' from 
incompatible pointer type
</snip>

trivial fix for when !CONFIG_INOTIFY

Signed-off-by: Borislav Petkov <petkov@uni-muenster.de>

--- include/linux/fsnotify.h.orig	2005-05-05 15:56:41.000000000 +0200
+++ include/linux/fsnotify.h	2005-05-05 16:53:11.000000000 +0200
@@ -241,7 +241,7 @@ static inline void fsnotify_oldname_free
 
 #else	/* CONFIG_INOTIFY */
 
-static inline char *fsnotify_oldname_init(struct dentry *old_dentry)
+static inline char *fsnotify_oldname_init(const char *name)
 {
 	return NULL;
 }

Re: 2.6.12-rc3-mm3

[Adrian Bunk]

On Thu, May 05, 2005 at 10:57:10AM -0400, Valdis.Kletnieks@vt.edu wrote:
> On Wed, 04 May 2005 22:10:57 PDT, Andrew Morton said:
> > 
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/
> > 
> > - device mapper updates
> > 
> > - more UML updates
> > 
> > - -mm seems unusually stable at present.
> 
> Indeed.  Line counts for the announcement e-mails for the 2.6.12-rc*-mm*:
> 
> 2.6.12-rc1-mm1 2345
> 2.6.12-rc1-mm2 3048
> 2.6.12-rc1-mm3 2861
> 2.6.12-rc1-mm4 2612
> 2.6.12-rc2-mm1 2460
> 2.6.12-rc2-mm2 2610
> 2.6.12-rc2-mm3 2763
> 2.6.12-rc3-mm1 1236
> 2.6.12-rc3-mm2  105
> 2.6.12-rc3-mm3  796
> 
> (Presuming that the linecounts are at least roughly proportional to the
> churn in patches added/merged/dropped).
>...

Your presumption is only correct starting with 2.6.12-rc3-mm1, because 
since 2.6.12-rc3-mm1 the announcements do no longer contain the big 
detailed listing of all patches in -mm.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: 2.6.12-rc3-mm3

[Valdis.Kletnieks]

[-- Attachment #1: Type: text/plain, Size: 698 bytes --]

On Thu, 05 May 2005 17:22:47 +0200, Adrian Bunk said:

> Your presumption is only correct starting with 2.6.12-rc3-mm1, because 
> since 2.6.12-rc3-mm1 the announcements do no longer contain the big 
> detailed listing of all patches in -mm.

Note to self:  Ingest caffeine, *THEN* do statistics. :) I *thought* the
last few -mm announces looked different, couldn't put my finger on what though ;)

OK.. Adding the number of 'All NNN patches' to the -rc3-mm*:

2.6.12-rc1-mm1 2345
2.6.12-rc1-mm2 3048
2.6.12-rc1-mm3 2861
2.6.12-rc1-mm4 2612
2.6.12-rc2-mm1 2460
2.6.12-rc2-mm2 2610
2.6.12-rc2-mm3 2763
2.6.12-rc3-mm1 2199
2.6.12-rc3-mm2 1083
2.6.12-rc3-mm3 1721

It's still looking slimmed down. ;)

[-- Attachment #2: Type: application/pgp-signature, Size: 226 bytes --]

Re: 2.6.12-rc3-mm3

[Adrian Bunk]

On Thu, May 05, 2005 at 11:49:11AM -0400, Valdis.Kletnieks@vt.edu wrote:
> On Thu, 05 May 2005 17:22:47 +0200, Adrian Bunk said:
> 
> > Your presumption is only correct starting with 2.6.12-rc3-mm1, because 
> > since 2.6.12-rc3-mm1 the announcements do no longer contain the big 
> > detailed listing of all patches in -mm.
> 
> Note to self:  Ingest caffeine, *THEN* do statistics. :) I *thought* the
> last few -mm announces looked different, couldn't put my finger on what though ;)
> 
> OK.. Adding the number of 'All NNN patches' to the -rc3-mm*:
>...

Actually you'd have to add 3 x NNN to get a roughly correct number.

But then there's the question what you want to measure. Now you are 
measuring the amount of patches (that is already printed in the 
announcements). If you want to measure the amount of changes, you should 
better substract this from the older ones instead of adding it to the 
newer ones.

The next problem is that e.g. in BK times, Greg's trees were only a few 
lines of the announcement, while now every single patch in his trees is 
listed...

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: 2.6.12-rc3-mm3

[Andrew Morton]

Francois Romieu <romieu@fr.zoreil.com> wrote:
>
> Andrew Morton <akpm@osdl.org> :
> [...]
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/
> 
> r8169-new-pci-id.patch was announced in 2.6.12-rc3-mm1. It disappeared in
> 2.6.12-rc3-mm{2/3} without notification.

Nope, it's in -rc3-mm3.

> ...
> 
> On a related note, is it suggested to wait for a renewed -netdev tree or
> to feed the pending r8169 stuff to -mm ?
> 

You may as well send them out - I'll scoop them up.  Normally I'll autospam
Jeff and Dave with net stuff until one of them takes it ;) 

Re: 2.6.12-rc3-mm3: Kernel BUG at "mm/slab.c":1219

[Rafael J. Wysocki]

Hi,

On Thursday, 5 of May 2005 14:58, Rafael J. Wysocki wrote:
> On Thursday, 5 of May 2005 07:10, Andrew Morton wrote:
> > 
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/
> > 
> > - device mapper updates
> > 
> > - more UML updates
> > 
> > - -mm seems unusually stable at present.
> 
> Well, it does not boot on my box (Athlon64 + NForce3, 64-bit).  Apparently, it
> loops forever in the early stage (ie before displaying the pengiun).  I'll try
> to get more information when I find something to attach to the serial port ...

It took some time, but finally I've got the following:

]--snip--[
Using local APIC timer interrupts.
Detected 12.467 MHz APIC timer.
softlockup thread 0 started up.
NET: Registered protocol family 16
ACPI: bus type pci registered
PCI: Using configuration type 1
mtrr: v2.0 (20020519)
kmem_cache_create: Early error in slab <NULL>
----------- [cut here ] --------- [please bite here ] ---------
Kernel BUG at "mm/slab.c":1219
invalid operand: 0000 [1]
CPU 0
Modules linked in:
Pid: 1, comm: swapper Not tainted 2.6.12-rc3-mm3
RIP: 0010:[<ffffffff80179eeb>] <ffffffff80179eeb>{kmem_cache_create+139}
RSP: 0000:ffff810001ca1eb8  EFLAGS: 00010292
RAX: 0000000000000034 RBX: 0000000000000000 RCX: 0000000000000000
RDX: 0000000000000000 RSI: 0000000000000dd3 RDI: ffffffff804167e0
RBP: 0000000000000005 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000010 R11: 0000000000000008 R12: 0000000000042000
R13: 0000000000000000 R14: 0000ffffffff8010 R15: 0000000000000000
FS:  0000000000000000(0000) GS:ffffffff8055a840(0000) knlGS:0000000000000000
CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
CR2: 0000000000004000 CR3: 0000000000101000 CR4: 00000000000006e0
Process swapper (pid: 1, threadinfo ffff810001ca0000, task ffff810001c5a7a0)
Stack: fffffffffffffff8 0000000000000000 0000000000000000 0000000000000000
       0000000000000010 0000000000000000 0000000000000005 0000000000000006
       00000000ffffffff 0000ffffffff8010
Call Trace:<ffffffff8057a11d>{init_bio+93} <ffffffff8010c0f2>{init+178}
       <ffffffff8010fc37>{child_rip+8} <ffffffff8010c040>{init+0}
       <ffffffff8010fc2f>{child_rip+0}

Code: 0f 0b e2 5c 3c 80 ff ff ff ff c3 04 48 8b 7c 24 18 be 20 00
RIP <ffffffff80179eeb>{kmem_cache_create+139} RSP <ffff810001ca1eb8>
 <0>Kernel panic - not syncing: Attempted to kill init!
 <3>BUG: soft lockup detected on CPU#0!

Modules linked in:
Pid: 1, comm: swapper Not tainted 2.6.12-rc3-mm3
RIP: 0010:[<ffffffff80278fd4>] <ffffffff80278fd4>{__delay+4}
RSP: 0000:ffff810001ca1bc0  EFLAGS: 00000287
RAX: 00000000000bd1ed RBX: 00000000000013b5 RCX: 000000002b039efb
RDX: 0000000000000008 RSI: 0000000000000000 RDI: 00000000001b67a0
RBP: 00000000000013b5 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000000
R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
FS:  0000000000000000(0000) GS:ffffffff8055a840(0000) knlGS:0000000000000000
CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
CR2: 0000000000004000 CR3: 0000000000101000 CR4: 00000000000006e0

Call Trace:<ffffffff80137d69>{panic+377} <ffffffff80139e61>{profile_task_exit+49}
       <ffffffff8013c983>{do_exit+147} <ffffffff80110b16>{show_registers+230}
       <ffffffff802c93f5>{do_unblank_screen+21} <ffffffff80110e35>{die+69}
       <ffffffff801117d1>{do_invalid_op+145} <ffffffff80179eeb>{kmem_cache_create+139}
       <ffffffff801767c0>{check_poison_obj+48} <ffffffff8013803d>{printk+141}
       <ffffffff8010fa81>{error_exit+0} <ffffffff80179eeb>{kmem_cache_create+139}
       <ffffffff80179eeb>{kmem_cache_create+139} <ffffffff8057a11d>{init_bio+93}
       <ffffffff8010c0f2>{init+178} <ffffffff8010fc37>{child_rip+8}
       <ffffffff8010c040>{init+0} <ffffffff8010fc2f>{child_rip+0}


Greets,
Rafael


-- 
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
		-- Lewis Carroll "Alice's Adventures in Wonderland"

[patch linux-2.6.12-rc3-mm3 1/7] r8169: de-obfuscate supported PCI ID

[Francois Romieu]

De-obfuscate supported PCI ID

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

diff -puN drivers/net/r8169.c~r8169-440 drivers/net/r8169.c
--- a/drivers/net/r8169.c~r8169-440	2005-05-06 00:37:16.695925125 +0200
+++ b/drivers/net/r8169.c	2005-05-06 00:38:40.051448306 +0200
@@ -174,9 +174,9 @@ const static struct {
 #undef _R
 
 static struct pci_device_id rtl8169_pci_tbl[] = {
-	{0x10ec, 0x8169, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{0x1186, 0x4300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{0x16ec, 0x0116, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	0x8169), },
+	{ PCI_DEVICE(PCI_VENDOR_ID_DLINK,	0x4300), },
+	{ PCI_DEVICE(0x16ec,			0x0116), },
 	{0,},
 };
 

_

[patch linux-2.6.12-rc3-mm3 7/7] r8169: cleanup (function args)

[Francois Romieu]

minor cleanup

- more consistent function arguments;
- rtl8169_rx_interrupt()
  o the error condition should be rare;
  o goto removal.

Signed-off-by: Richard Dawe <rich@phekda.gotadsl.co.uk>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

diff -puN drivers/net/r8169.c~r8169-580 drivers/net/r8169.c
--- a/drivers/net/r8169.c~r8169-580	2005-05-06 00:40:32.031341377 +0200
+++ b/drivers/net/r8169.c	2005-05-06 00:40:32.059336850 +0200
@@ -457,10 +457,10 @@ static void rtl8169_hw_start(struct net_
 static int rtl8169_close(struct net_device *dev);
 static void rtl8169_set_rx_mode(struct net_device *dev);
 static void rtl8169_tx_timeout(struct net_device *dev);
-static struct net_device_stats *rtl8169_get_stats(struct net_device *netdev);
+static struct net_device_stats *rtl8169_get_stats(struct net_device *dev);
 static int rtl8169_rx_interrupt(struct net_device *, struct rtl8169_private *,
 				void __iomem *);
-static int rtl8169_change_mtu(struct net_device *netdev, int new_mtu);
+static int rtl8169_change_mtu(struct net_device *dev, int new_mtu);
 static void rtl8169_down(struct net_device *dev);
 
 #ifdef CONFIG_R8169_NAPI
@@ -2360,7 +2360,7 @@ rtl8169_rx_interrupt(struct net_device *
 	rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx;
 	rx_left = rtl8169_rx_quota(rx_left, (u32) dev->quota);
 
-	while (rx_left > 0) {
+	for (; rx_left > 0; rx_left--, cur_rx++) {
 		unsigned int entry = cur_rx % NUM_RX_DESC;
 		struct RxDesc *desc = tp->RxDescArray + entry;
 		u32 status;
@@ -2370,7 +2370,7 @@ rtl8169_rx_interrupt(struct net_device *
 
 		if (status & DescOwn)
 			break;
-		if (status & RxRES) {
+		if (unlikely(status & RxRES)) {
 			if (netif_msg_rx_err(tp)) {
 				printk(KERN_INFO
 				       "%s: Rx ERROR. status = %08x\n",
@@ -2397,7 +2397,7 @@ rtl8169_rx_interrupt(struct net_device *
 				tp->stats.rx_dropped++;
 				tp->stats.rx_length_errors++;
 				rtl8169_mark_to_asic(desc, tp->rx_buf_sz);
-				goto move_on;
+				continue;
 			}
 
 			rtl8169_rx_csum(skb, desc);
@@ -2426,9 +2426,6 @@ rtl8169_rx_interrupt(struct net_device *
 			tp->stats.rx_bytes += pkt_size;
 			tp->stats.rx_packets++;
 		}
-move_on:		
-		cur_rx++; 
-		rx_left--;
 	}
 
 	count = cur_rx - tp->cur_rx;

_

Re: [patch linux-2.6.12-rc3-mm3 1/7] r8169: de-obfuscate supported PCI ID

[Jon Mason]

I only received patches 1,3, and 7.

Re: [patch linux-2.6.12-rc3-mm3 1/7] r8169: de-obfuscate supported PCI ID

[Francois Romieu]

Jon Mason <jdmason@us.ibm.com> :
> I only received patches 1,3, and 7.

If the DSNs don't lie, the messages should be somewhere in the pipe
behind oss.sgi.com.

Alternate location:
- http://www.fr.zoreil.com/linux/kernel/2.6.x/2.6.12-rc3-mm3

More alternate location:
- rsync://www.fr.zoreil.com/linux-2.6.git/
  commit 778e3479a76e03b319fc18a6416cb9b766029cc3

--
Ueimor

Re: 2.6.12-rc3-mm3: ALSA broken ?

[J.A. Magallon]

On 05.05, Andrew Morton wrote:
> 
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/
> 
> - device mapper updates
> 
> - more UML updates
> 
> - -mm seems unusually stable at present.
> 

Ehem, is ALSA broken ?

I can't spread stereo output to 4 channel. More specific, I can't switch
one of my female jacks between in and out.

Long explanation: I have an

00:1f.5 Multimedia audio controller: Intel Corporation 82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller (rev 02)

It has three outputs. One is always output, for normal stereo or front in 4
channel. One other is LineIn/Back-for-4-channel. And the third is
Mic/Bass-Center.

In 2.6.11 I have two
toggles in ALSA: 'Spread front to center...' and 'surround jack as input'
Adjusting both I could get to duplicate the output in the Back jack.
In 2.6.12-rc3-mm3 there is no way to get this working.

More, after I booted 2.6.11 to retest, just after reboot in 2.6.12-rc3-mm3
it was working. As soon as I touched the 'Surround Jack Mode' in alsamixer
it went silent again, and I could not restore it.
The old options have been renamed/killed.

Is ALSA broken in kernel ? Is just the userspace out of sync ?
Which should be the correct setup to get this working ?

TIA

--
J.A. Magallon <jamagallon()able!es>     \               Software is like sex:
werewolf!able!es                         \         It's better when it's free
Mandriva Linux release 2006.0 (Cooker) for i586
Linux 2.6.11-jam16 (gcc 4.0.0 (4.0.0-3mdk for Mandriva Linux release 2006.0))

Re: 2.6.12-rc3-mm3: ALSA broken ?

[J.A. Magallon]

On 05.08, J.A. Magallon wrote:
> 
> On 05.05, Andrew Morton wrote:
> > 
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/
> > 
> > - device mapper updates
> > 
> > - more UML updates
> > 
> > - -mm seems unusually stable at present.
> > 
> 
> Ehem, is ALSA broken ?
> 
> I can't spread stereo output to 4 channel. More specific, I can't switch
> one of my female jacks between in and out.
> 
> Long explanation: I have an
> 
> 00:1f.5 Multimedia audio controller: Intel Corporation 82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller (rev 02)
> 
> It has three outputs. One is always output, for normal stereo or front in 4
> channel. One other is LineIn/Back-for-4-channel. And the third is
> Mic/Bass-Center.
> 
> In 2.6.11 I have two
> toggles in ALSA: 'Spread front to center...' and 'surround jack as input'
> Adjusting both I could get to duplicate the output in the Back jack.
> In 2.6.12-rc3-mm3 there is no way to get this working.
> 

I have just tested in 2.6.12-rc4 and works fine. I even feed the stereo
signal to the 6 channels, so 4 go to my desktop speaker system and one
other pair to may home stereo.

Something is broken in -mm wrt ALSA. If you need me to test some specific
version, pleas just ask.

Side note: trying to load settings from rc4 in -mm says:

alsactl: set_control:930: warning: name mismatch (Surround Jack as Input/Surround Jack Mode) for control #42
alsactl: set_control:932: warning: index mismatch (0/0) for control #42
alsactl: set_control:1030: bad control.42.value type

Hope this helps.

--
J.A. Magallon <jamagallon()able!es>     \               Software is like sex:
werewolf!able!es                         \         It's better when it's free
Mandriva Linux release 2006.0 (Cooker) for i586
Linux 2.6.11-jam16 (gcc 4.0.0 (4.0.0-3mdk for Mandriva Linux release 2006.0))

Re: 2.6.12-rc3-mm3: ALSA broken ?

[Takashi Iwai]

At Sun, 08 May 2005 23:24:40 +0000,
J.A. Magallon wrote:
> 
> 
> On 05.08, J.A. Magallon wrote:
> > 
> > On 05.05, Andrew Morton wrote:
> > > 
> > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/
> > > 
> > > - device mapper updates
> > > 
> > > - more UML updates
> > > 
> > > - -mm seems unusually stable at present.
> > > 
> > 
> > Ehem, is ALSA broken ?
> > 
> > I can't spread stereo output to 4 channel. More specific, I can't switch
> > one of my female jacks between in and out.
> > 
> > Long explanation: I have an
> > 
> > 00:1f.5 Multimedia audio controller: Intel Corporation 82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller (rev 02)
> > 
> > It has three outputs. One is always output, for normal stereo or front in 4
> > channel. One other is LineIn/Back-for-4-channel. And the third is
> > Mic/Bass-Center.
> > 
> > In 2.6.11 I have two
> > toggles in ALSA: 'Spread front to center...' and 'surround jack as input'
> > Adjusting both I could get to duplicate the output in the Back jack.
> > In 2.6.12-rc3-mm3 there is no way to get this working.
> > 
> 
> I have just tested in 2.6.12-rc4 and works fine. I even feed the stereo
> signal to the 6 channels, so 4 go to my desktop speaker system and one
> other pair to may home stereo.
> 
> Something is broken in -mm wrt ALSA. If you need me to test some specific
> version, pleas just ask.
> 
> Side note: trying to load settings from rc4 in -mm says:
> 
> alsactl: set_control:930: warning: name mismatch (Surround Jack as Input/Surround Jack Mode) for control #42
> alsactl: set_control:932: warning: index mismatch (0/0) for control #42
> alsactl: set_control:1030: bad control.42.value type

The mixer controls for the surround jacks are changed in the recent
version.  Instead of "Line-In As Surround" or "Surround Jack As
Input" switches, now there are two enum controls:

- "Channel Mode"  (2ch/4ch/6ch)
   controls the surround output channels, i.e. toggles the I/O
   direction of the shared line-in/mic jacks.

- "Surround Jack Mode" (Shared/Independent)
   controls the line and mic jacks are shared for surround output and
   inputs.  "Independent" is for the recent mobos which have separate
   input and output jacks.  When Independent is chosen, the setting in
   "Channel Mode" has no influence.


In your case, set "Channel Mode" to 4ch and "Surround Jack Mode" to 
Shared so that the line-in jack is used as surround output.
Then turn on "Duplicate Front" switch.

I'll prepare a better documentation later...


Takashi

Re: 2.6.12-rc3-mm3: ALSA broken ?

[J.A. Magallon]

On 05.11, Takashi Iwai wrote:
> At Sun, 08 May 2005 23:24:40 +0000,
> J.A. Magallon wrote:
> > 
> > 
> > On 05.08, J.A. Magallon wrote:
> > > 
> > > On 05.05, Andrew Morton wrote:
> > > > 
> > > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/
> > > > 
> > > > - device mapper updates
> > > > 
> > > > - more UML updates
> > > > 
> > > > - -mm seems unusually stable at present.
> > > > 
> > > 
> > > Ehem, is ALSA broken ?
> > > 
> > > I can't spread stereo output to 4 channel. More specific, I can't switch
> > > one of my female jacks between in and out.
> > > 
> > > Long explanation: I have an
> > > 
> > > 00:1f.5 Multimedia audio controller: Intel Corporation 82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller (rev 02)
> > > 
> > > It has three outputs. One is always output, for normal stereo or front in 4
> > > channel. One other is LineIn/Back-for-4-channel. And the third is
> > > Mic/Bass-Center.
> > > 
> > > In 2.6.11 I have two
> > > toggles in ALSA: 'Spread front to center...' and 'surround jack as input'
> > > Adjusting both I could get to duplicate the output in the Back jack.
> > > In 2.6.12-rc3-mm3 there is no way to get this working.
> > > 
> > 
> > I have just tested in 2.6.12-rc4 and works fine. I even feed the stereo
> > signal to the 6 channels, so 4 go to my desktop speaker system and one
> > other pair to may home stereo.
> > 
> > Something is broken in -mm wrt ALSA. If you need me to test some specific
> > version, pleas just ask.
> > 
> > Side note: trying to load settings from rc4 in -mm says:
> > 
> > alsactl: set_control:930: warning: name mismatch (Surround Jack as Input/Surround Jack Mode) for control #42
> > alsactl: set_control:932: warning: index mismatch (0/0) for control #42
> > alsactl: set_control:1030: bad control.42.value type
> 
> The mixer controls for the surround jacks are changed in the recent
> version.  Instead of "Line-In As Surround" or "Surround Jack As
> Input" switches, now there are two enum controls:
> 
> - "Channel Mode"  (2ch/4ch/6ch)
>    controls the surround output channels, i.e. toggles the I/O
>    direction of the shared line-in/mic jacks.
> 
> - "Surround Jack Mode" (Shared/Independent)
>    controls the line and mic jacks are shared for surround output and
>    inputs.  "Independent" is for the recent mobos which have separate
>    input and output jacks.  When Independent is chosen, the setting in
>    "Channel Mode" has no influence.
> 
> 
> In your case, set "Channel Mode" to 4ch and "Surround Jack Mode" to 
> Shared so that the line-in jack is used as surround output.
> Then turn on "Duplicate Front" switch.
> 
> I'll prepare a better documentation later...

Thanks, now I got it working. Stereo spread to all 6 channels.
Just a note: I need also to uncheck the 'Center/LFE jack as mic'
switch.

And a question. The output level depends on the
Line _input_ volume. Higher the volume, lower the output level on
all channels.
This happens only if I 'Spread Front to Sourround and Center/LFE'.
Should not the line volume be useless if the jack is set for output ?
Or does its meaning change then...

TIA

--
J.A. Magallon <jamagallon()able!es>     \               Software is like sex:
werewolf!able!es                         \         It's better when it's free
Mandriva Linux release 2006.0 (Cooker) for i586
Linux 2.6.11-jam17 (gcc 4.0.0 (4.0.0-3mdk for Mandriva Linux release 2006.0))

Re: 2.6.12-rc3-mm3: ALSA broken ?

[Takashi Iwai]

At Thu, 12 May 2005 22:27:16 +0000,
J.A. Magallon wrote:
> 
> Just a note: I need also to uncheck the 'Center/LFE jack as mic'
> switch.

Oh, it shouldn't be there :)
Try the patch below.  I'll commit it to ALSA tree.


> And a question. The output level depends on the
> Line _input_ volume. Higher the volume, lower the output level on
> all channels.
> This happens only if I 'Spread Front to Sourround and Center/LFE'.
> Should not the line volume be useless if the jack is set for output ?
> Or does its meaning change then...

Hmm, it's weird.  I don't see the signal routing via line-in control
to outputs in AD1985 datasheet...


Takashi


--- linux/sound/pci/ac97/ac97_patch.c	11 May 2005 11:00:17 -0000	1.82
+++ linux/sound/pci/ac97/ac97_patch.c	13 May 2005 09:35:19 -0000
@@ -1598,7 +1598,6 @@
 }
 
 static const snd_kcontrol_new_t snd_ac97_ad1985_controls[] = {
-	AC97_SINGLE("Center/LFE Jack as Mic", AC97_AD_SERIAL_CFG, 9, 1, 0),
 	AC97_SINGLE("Exchange Center/LFE", AC97_AD_SERIAL_CFG, 3, 1, 0)
 };
 

Re: [patch linux-2.6.12-rc3-mm3 1/7] r8169: de-obfuscate supported PCI ID

[Jeff Garzik]

All seven look OK, but it failed on the first patch:

[jgarzik@pretzel netdev-2.6]$ dotest /g/tmp/mbox

Applying 'r8169: de-obfuscate supported PCI ID'

patching file drivers/net/r8169.c
Hunk #1 FAILED at 174.
1 out of 1 hunk FAILED -- saving rejects to file drivers/net/r8169.c.rej

Re: 2.6.12-rc3-mm3: ALSA broken ?

[J.A. Magallon]

On 05.13, Takashi Iwai wrote:
> At Thu, 12 May 2005 22:27:16 +0000,
> J.A. Magallon wrote:
> > 
> > Just a note: I need also to uncheck the 'Center/LFE jack as mic'
> > switch.
> 
> Oh, it shouldn't be there :)
> Try the patch below.  I'll commit it to ALSA tree.
> 
> 
> > And a question. The output level depends on the
> > Line _input_ volume. Higher the volume, lower the output level on
> > all channels.
> > This happens only if I 'Spread Front to Sourround and Center/LFE'.
> > Should not the line volume be useless if the jack is set for output ?
> > Or does its meaning change then...
> 
> Hmm, it's weird.  I don't see the signal routing via line-in control
> to outputs in AD1985 datasheet...
> 
> 
> Takashi
> 
> 
> --- linux/sound/pci/ac97/ac97_patch.c	11 May 2005 11:00:17 -0000	1.82
> +++ linux/sound/pci/ac97/ac97_patch.c	13 May 2005 09:35:19 -0000
> @@ -1598,7 +1598,6 @@
>  }
>  
>  static const snd_kcontrol_new_t snd_ac97_ad1985_controls[] = {
> -	AC97_SINGLE("Center/LFE Jack as Mic", AC97_AD_SERIAL_CFG, 9, 1, 0),
>  	AC97_SINGLE("Exchange Center/LFE", AC97_AD_SERIAL_CFG, 3, 1, 0)
>  };
>  

If I apply this, the control disappears, but I can't get any sound in that
ouput even if I put ALSA in 6ch mode. It seems it defaults to 'on', and
the mode switch '2ch -> 4ch -> 6ch' does not touch it. So it does not look
like a redundant control.

Example: go into 4ch mode. Check this control. Then switch to 6ch mode.
The Center jack has no sound (it should, shouldn't ?). Check it and voilà.
It looks that the logic in the channel selection needs to set this flag also...

--
J.A. Magallon <jamagallon()able!es>     \               Software is like sex:
werewolf!able!es                         \         It's better when it's free
Mandriva Linux release 2006.0 (Cooker) for i586
Linux 2.6.11-jam19 (gcc 4.0.0 (4.0.0-3mdk for Mandriva Linux release 2006.0))

Re: 2.6.12-rc3-mm3: ALSA broken ?

[Takashi Iwai]

At Tue, 17 May 2005 12:02:39 +0000,
J.A. Magallon wrote:
> 
> 
> On 05.13, Takashi Iwai wrote:
> > At Thu, 12 May 2005 22:27:16 +0000,
> > J.A. Magallon wrote:
> > > 
> > > Just a note: I need also to uncheck the 'Center/LFE jack as mic'
> > > switch.
> > 
> > Oh, it shouldn't be there :)
> > Try the patch below.  I'll commit it to ALSA tree.
> > 
> > 
> > > And a question. The output level depends on the
> > > Line _input_ volume. Higher the volume, lower the output level on
> > > all channels.
> > > This happens only if I 'Spread Front to Sourround and Center/LFE'.
> > > Should not the line volume be useless if the jack is set for output ?
> > > Or does its meaning change then...
> > 
> > Hmm, it's weird.  I don't see the signal routing via line-in control
> > to outputs in AD1985 datasheet...
> > 
> > 
> > Takashi
> > 
> > 
> > --- linux/sound/pci/ac97/ac97_patch.c	11 May 2005 11:00:17 -0000	1.82
> > +++ linux/sound/pci/ac97/ac97_patch.c	13 May 2005 09:35:19 -0000
> > @@ -1598,7 +1598,6 @@
> >  }
> >  
> >  static const snd_kcontrol_new_t snd_ac97_ad1985_controls[] = {
> > -	AC97_SINGLE("Center/LFE Jack as Mic", AC97_AD_SERIAL_CFG, 9, 1, 0),
> >  	AC97_SINGLE("Exchange Center/LFE", AC97_AD_SERIAL_CFG, 3, 1, 0)
> >  };
> >  
> 
> If I apply this, the control disappears, but I can't get any sound in that
> ouput even if I put ALSA in 6ch mode. It seems it defaults to 'on', and
> the mode switch '2ch -> 4ch -> 6ch' does not touch it. So it does not look
> like a redundant control.
> 
> Example: go into 4ch mode. Check this control. Then switch to 6ch mode.
> The Center jack has no sound (it should, shouldn't ?). Check it and voilà.
> It looks that the logic in the channel selection needs to set this flag also...

Yep, you're right.  Try the patch below.


Takashi

--- linux/sound/pci/ac97/ac97_patch.c	13 May 2005 09:58:46 -0000	1.83
+++ linux/sound/pci/ac97/ac97_patch.c	17 May 2005 12:18:24 -0000
@@ -1526,13 +1526,8 @@
 		.get = snd_ac97_ad1888_downmix_get,
 		.put = snd_ac97_ad1888_downmix_put
 	},
-#if 0
-	AC97_SINGLE("Surround Jack as Input", AC97_AD_MISC, 12, 1, 0),
-	AC97_SINGLE("Center/LFE Jack as Input", AC97_AD_MISC, 11, 1, 0),
-#else
 	AC97_SURROUND_JACK_MODE_CTL,
 	AC97_CHANNEL_MODE_CTL,
-#endif
 };
 
 static int patch_ad1888_specific(ac97_t *ac97)
@@ -1601,6 +1596,18 @@
 	AC97_SINGLE("Exchange Center/LFE", AC97_AD_SERIAL_CFG, 3, 1, 0)
 };
 
+static void ad1985_update_jacks(ac97_t *ac97)
+{
+	/* shared Line-In */
+	snd_ac97_update_bits(ac97, AC97_AD_MISC, 1 << 12,
+			     is_shared_linein(ac97) ? 0 : 1 << 12);
+	/* shared Mic */
+	snd_ac97_update_bits(ac97, AC97_AD_MISC, 1 << 11,
+			     is_shared_micin(ac97) ? 0 : 1 << 11);
+	snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 9 << 11,
+			     is_shared_micin(ac97) ? 0 : 9 << 11);
+}
+
 static int patch_ad1985_specific(ac97_t *ac97)
 {
 	int err;
@@ -1616,7 +1623,7 @@
 #ifdef CONFIG_PM
 	.resume = ad18xx_resume,
 #endif
-	.update_jacks = ad1888_update_jacks,
+	.update_jacks = ad1985_update_jacks,
 };
 
 int patch_ad1985(ac97_t * ac97)

Re: [patch linux-2.6.12-rc3-mm3 1/7] r8169: de-obfuscate supported PCI ID

[Francois Romieu]

Jeff Garzik <jgarzik@pobox.com> :
> All seven look OK, but it failed on the first patch:
> 
> [jgarzik@pretzel netdev-2.6]$ dotest /g/tmp/mbox
> 
> Applying 'r8169: de-obfuscate supported PCI ID'
> 
> patching file drivers/net/r8169.c
> Hunk #1 FAILED at 174.
> 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/r8169.c.rej

Yes. In the meantime, -mm was applied:
[patch 2.6.12-rc2-mm3 1/1] r8169: new PCI id

Should I send a serie of patches against
126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c to update it to r8169-mm-latest ?

--
Ueimor

Re: 2.6.12-rc3-mm3: ALSA broken ?

[J.A. Magallon]

On 05.17, Takashi Iwai wrote:
...
> > 
> > Example: go into 4ch mode. Check this control. Then switch to 6ch mode.
> > The Center jack has no sound (it should, shouldn't ?). Check it and voilà.
> > It looks that the logic in the channel selection needs to set this flag also...
> 
> Yep, you're right.  Try the patch below.
> 
> 

Thanks, this patch worked. When in 6ch mode, the boolen flag we talk about
still controls if the line jack is input or output. In 4ch mode, it is always
input. If i chech it, switching to 6ch does not toggle it. They are
independent controls.

Anyways. I can't get rid of the flag. It is initialized to on by default.
Isn't strange to have two ways of controlling this ?

Now we have:

Surround jack mode: [Shared/Independent]
Channel mode [2/4/6]
Center/LFE jack as mic [on/off]
Spread Front... [on/off]


Would not be nice something like:

Surround jacks mode: [Shared/Independent]
Line Jack: [in/surround-out/extra-front-out]
Mic Jack: [in/center-out/extra-front-out]

It looks like internally you can control all ouputs independently.
Just an idea that looks more logical/intuitive to me...
Ah, and could the input level controllers for line and mic be forced
to mute when used as inputs ?

TIA

> Takashi
> 
> --- linux/sound/pci/ac97/ac97_patch.c	13 May 2005 09:58:46 -0000	1.83
> +++ linux/sound/pci/ac97/ac97_patch.c	17 May 2005 12:18:24 -0000
> @@ -1526,13 +1526,8 @@
>  		.get = snd_ac97_ad1888_downmix_get,
>  		.put = snd_ac97_ad1888_downmix_put
>  	},
> -#if 0
> -	AC97_SINGLE("Surround Jack as Input", AC97_AD_MISC, 12, 1, 0),
> -	AC97_SINGLE("Center/LFE Jack as Input", AC97_AD_MISC, 11, 1, 0),
> -#else
>  	AC97_SURROUND_JACK_MODE_CTL,
>  	AC97_CHANNEL_MODE_CTL,
> -#endif
>  };
>  
>  static int patch_ad1888_specific(ac97_t *ac97)
> @@ -1601,6 +1596,18 @@
>  	AC97_SINGLE("Exchange Center/LFE", AC97_AD_SERIAL_CFG, 3, 1, 0)
>  };
>  
> +static void ad1985_update_jacks(ac97_t *ac97)
> +{
> +	/* shared Line-In */
> +	snd_ac97_update_bits(ac97, AC97_AD_MISC, 1 << 12,
> +			     is_shared_linein(ac97) ? 0 : 1 << 12);
> +	/* shared Mic */
> +	snd_ac97_update_bits(ac97, AC97_AD_MISC, 1 << 11,
> +			     is_shared_micin(ac97) ? 0 : 1 << 11);
> +	snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 9 << 11,
> +			     is_shared_micin(ac97) ? 0 : 9 << 11);
> +}
> +
>  static int patch_ad1985_specific(ac97_t *ac97)
>  {
>  	int err;
> @@ -1616,7 +1623,7 @@
>  #ifdef CONFIG_PM
>  	.resume = ad18xx_resume,
>  #endif
> -	.update_jacks = ad1888_update_jacks,
> +	.update_jacks = ad1985_update_jacks,
>  };
>  
>  int patch_ad1985(ac97_t * ac97)
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 
> 

--
J.A. Magallon <jamagallon()able!es>     \               Software is like sex:
werewolf!able!es                         \         It's better when it's free
Mandriva Linux release 2006.0 (Cooker) for i586
Linux 2.6.11-jam19 (gcc 4.0.0 (4.0.0-3mdk for Mandriva Linux release 2006.0))

Re: 2.6.12-rc3-mm3: ALSA broken ?

[Takashi Iwai]

At Tue, 17 May 2005 22:39:45 +0000,
J.A. Magallon wrote:
> 
> 
> On 05.17, Takashi Iwai wrote:
> ...
> > > 
> > > Example: go into 4ch mode. Check this control. Then switch to 6ch mode.
> > > The Center jack has no sound (it should, shouldn't ?). Check it and voilà.
> > > It looks that the logic in the channel selection needs to set this flag also...
> > 
> > Yep, you're right.  Try the patch below.
> > 
> > 
> 
> Thanks, this patch worked. When in 6ch mode, the boolen flag we talk about
> still controls if the line jack is input or output. In 4ch mode, it is always
> input. If i chech it, switching to 6ch does not toggle it. They are
> independent controls.
> 
> Anyways. I can't get rid of the flag. It is initialized to on by default.
> Isn't strange to have two ways of controlling this ?
> 
> Now we have:
> 
> Surround jack mode: [Shared/Independent]
> Channel mode [2/4/6]
> Center/LFE jack as mic [on/off]
> Spread Front... [on/off]

Apply *both* patches I sent.  They don't conflict.

> Would not be nice something like:
> 
> Surround jacks mode: [Shared/Independent]
> Line Jack: [in/surround-out/extra-front-out]
> Mic Jack: [in/center-out/extra-front-out]
> 
> It looks like internally you can control all ouputs independently.
> Just an idea that looks more logical/intuitive to me...

I don't think so.  You'll want to have spreaded front to indepent
surround jacks, too.

> Ah, and could the input level controllers for line and mic be forced
> to mute when used as inputs ?

This is doable but tricky since you have to remember the last values.


Takashi

Re: 2.6.12-rc3-mm3: ALSA broken ?

[Andrew Morton]

"J.A. Magallon" <jamagallon@able.es> wrote:
>
> 
> On 05.08, J.A. Magallon wrote:
> > 
> > On 05.05, Andrew Morton wrote:
> > > 
> > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/
> > > 
> > > - device mapper updates
> > > 
> > > - more UML updates
> > > 
> > > - -mm seems unusually stable at present.
> > > 
> > 
> > Ehem, is ALSA broken ?
> > 
> > I can't spread stereo output to 4 channel. More specific, I can't switch
> > one of my female jacks between in and out.
> > 
> > Long explanation: I have an
> > 
> > 00:1f.5 Multimedia audio controller: Intel Corporation 82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller (rev 02)
> > 
> > It has three outputs. One is always output, for normal stereo or front in 4
> > channel. One other is LineIn/Back-for-4-channel. And the third is
> > Mic/Bass-Center.
> > 
> > In 2.6.11 I have two
> > toggles in ALSA: 'Spread front to center...' and 'surround jack as input'
> > Adjusting both I could get to duplicate the output in the Back jack.
> > In 2.6.12-rc3-mm3 there is no way to get this working.
> > 
> 
> I have just tested in 2.6.12-rc4 and works fine. I even feed the stereo
> signal to the 6 channels, so 4 go to my desktop speaker system and one
> other pair to may home stereo.
> 
> Something is broken in -mm wrt ALSA. If you need me to test some specific
> version, pleas just ask.
> 
> Side note: trying to load settings from rc4 in -mm says:
> 
> alsactl: set_control:930: warning: name mismatch (Surround Jack as Input/Surround Jack Mode) for control #42
> alsactl: set_control:932: warning: index mismatch (0/0) for control #42
> alsactl: set_control:1030: bad control.42.value type
> 

Could we have an update on this please?  Do these problems persist in
2.6.12-rc5 and/or 2.6.12-rc5-mm1?

Thanks.


-------------------------------------------------------
SF.Net email is sponsored by: GoToMeeting - the easiest way to collaborate
online with coworkers and clients while avoiding the high cost of travel and
communications. There is no equipment to buy and you can meet as often as
you want. Try it free.http://ads.osdn.com/?ad_id=7402&alloc_id=16135&op=click

Re: Re: 2.6.12-rc3-mm3: ALSA broken ?

[Lee Revell]

On Thu, 2005-05-26 at 00:18 -0700, Andrew Morton wrote:
> "J.A. Magallon" <jamagallon@able.es> wrote:
>  
> > > Ehem, is ALSA broken ?
> > > 
> > > I can't spread stereo output to 4 channel. More specific, I can't switch
> > > one of my female jacks between in and out.
> > >

You are using alsamixer and not some GUI mixer, right?  There were
recently some changes to the ALSA mixer API and AFAIK none of the GUI
mixers have caught up yet.

> > Side note: trying to load settings from rc4 in -mm says:
> > 
> > alsactl: set_control:930: warning: name mismatch (Surround Jack as Input/Surround Jack Mode) for control #42
> > alsactl: set_control:932: warning: index mismatch (0/0) for control #42
> > alsactl: set_control:1030: bad control.42.value type
> > 

These are harmless, it's just telling you that because control #42 was
renamed from "Surround Jack as Input" to "Surround Jack Mode".  Looks
like it was changed from a boolean to an enumerated control.

Lee



-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005

Re: 2.6.12-rc3-mm3: ALSA broken ?

[J.A. Magallon]

On 05.18, Takashi Iwai wrote:
> At Tue, 17 May 2005 22:39:45 +0000,
> J.A. Magallon wrote:
> > 
> > 
> > On 05.17, Takashi Iwai wrote:
> > ...
> > > > 
> > > > Example: go into 4ch mode. Check this control. Then switch to 6ch mode.
> > > > The Center jack has no sound (it should, shouldn't ?). Check it and voilà.
> > > > It looks that the logic in the channel selection needs to set this flag also...
> > > 
> > > Yep, you're right.  Try the patch below.
> > > 
> > > 
> > 
> > Thanks, this patch worked. When in 6ch mode, the boolen flag we talk about
> > still controls if the line jack is input or output. In 4ch mode, it is always
> > input. If i chech it, switching to 6ch does not toggle it. They are
> > independent controls.
> > 
> > Anyways. I can't get rid of the flag. It is initialized to on by default.
> > Isn't strange to have two ways of controlling this ?
> > 

Yehaaa, I got it...
There was a bug in your last patch.
This:

+	snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 9 << 11,
+			     is_shared_micin(ac97) ? 0 : 9 << 11);

should be

+	snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 1 << 9,
+			     is_shared_micin(ac97) ? 0 : 1 << 9);

Whit this, I can control the output just with the 2/4/6 ch mode, and get rid
of the 'Center as mic' flag...

btw, why the hell don't you use something as stupid as 

#define bit(n) (1<<(n))

???

A side note. In the process of solving all this, I tried to generate a patch
for 1.0.9rc4a against -mm. I noticed some things:
- Your code reverts some in-kernel changes related to
    if (ptr)
        kfree(ptr)
  The if is killed in mainline, as kfree accepts null pointers.

- When linking I got:
if [ -r System.map -a -x /sbin/depmod ]; then /sbin/depmod -ae -F System.map
2.6.11-jam20; fi
WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
symbol class_simple_device_add
WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
symbol class_simple_destroy
WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
symbol class_simple_device_remove
WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
symbol class_simple_create
WARNING: /lib/modules/2.6.11-jam20/kernel/sound/core/snd.ko needs unknown
symbol class_simple_device_add
WARNING: /lib/modules/2.6.11-jam20/kernel/sound/core/snd.ko needs unknown
symbol class_simple_device_remove

I think all this have been unexported/killed...

Hope this helps.

--
J.A. Magallon <jamagallon()able!es>     \               Software is like sex:
werewolf!able!es                         \         It's better when it's free
Mandriva Linux release 2006.0 (Cooker) for i586
Linux 2.6.11-jam20 (gcc 4.0.0 (4.0.0-3mdk for Mandriva Linux release 2006.0))

Re: 2.6.12-rc3-mm3: ALSA broken ?

[J.A. Magallon]

On 05.26, Andrew Morton wrote:
> "J.A. Magallon" <jamagallon@able.es> wrote:
> >
> > 
> > On 05.08, J.A. Magallon wrote:
> > > 
> > > On 05.05, Andrew Morton wrote:
> > > > 
> > > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm3/
> > > > 
> > > > - device mapper updates
> > > > 
> > > > - more UML updates
> > > > 
> > > > - -mm seems unusually stable at present.
> > > > 
> > > 
> > > Ehem, is ALSA broken ?
> > > 
> > > I can't spread stereo output to 4 channel. More specific, I can't switch
> > > one of my female jacks between in and out.
> > > 
> > > Long explanation: I have an
> > > 
> > > 00:1f.5 Multimedia audio controller: Intel Corporation 82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller (rev 02)
> > > 
> > > It has three outputs. One is always output, for normal stereo or front in 4
> > > channel. One other is LineIn/Back-for-4-channel. And the third is
> > > Mic/Bass-Center.
> > > 
> > > In 2.6.11 I have two
> > > toggles in ALSA: 'Spread front to center...' and 'surround jack as input'
> > > Adjusting both I could get to duplicate the output in the Back jack.
> > > In 2.6.12-rc3-mm3 there is no way to get this working.
> > > 
> > 

> 
> Could we have an update on this please?  Do these problems persist in
> 2.6.12-rc5 and/or 2.6.12-rc5-mm1?
> 

Finally I got it. There was a buglet in original patch. Working patch follows.
Verified in... just my box (intel onboard sound). Against rc5-mm1.

--- linux/sound/pci/ac97/ac97_patch.c	11 May 2005 11:00:17 -0000	1.82
+++ linux/sound/pci/ac97/ac97_patch.c	13 May 2005 09:35:19 -0000
@@ -1526,13 +1526,8 @@
 		.get = snd_ac97_ad1888_downmix_get,
 		.put = snd_ac97_ad1888_downmix_put
 	},
-#if 0
-	AC97_SINGLE("Surround Jack as Input", AC97_AD_MISC, 12, 1, 0),
-	AC97_SINGLE("Center/LFE Jack as Input", AC97_AD_MISC, 11, 1, 0),
-#else
 	AC97_SURROUND_JACK_MODE_CTL,
 	AC97_CHANNEL_MODE_CTL,
-#endif
 };
 
 static int patch_ad1888_specific(ac97_t *ac97)
@@ -1598,10 +1598,21 @@
 }
 
 static const snd_kcontrol_new_t snd_ac97_ad1985_controls[] = {
-	AC97_SINGLE("Center/LFE Jack as Mic", AC97_AD_SERIAL_CFG, 9, 1, 0),
 	AC97_SINGLE("Exchange Center/LFE", AC97_AD_SERIAL_CFG, 3, 1, 0)
 };
 
+static void ad1985_update_jacks(ac97_t *ac97)
+{
+	/* shared Line-In */
+	snd_ac97_update_bits(ac97, AC97_AD_MISC, 1 << 12,
+			     is_shared_linein(ac97) ? 0 : 1 << 12);
+	/* shared Mic */
+	snd_ac97_update_bits(ac97, AC97_AD_MISC, 1 << 11,
+			     is_shared_micin(ac97) ? 0 : 1 << 11);
+	snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 1 << 9,
+			     is_shared_micin(ac97) ? 0 : 1 << 9);
+}
+
 static int patch_ad1985_specific(ac97_t *ac97)
 {
 	int err;
@@ -1617,7 +1624,7 @@
 #ifdef CONFIG_PM
 	.resume = ad18xx_resume,
 #endif
-	.update_jacks = ad1888_update_jacks,
+	.update_jacks = ad1985_update_jacks,
 };
 
 int patch_ad1985(ac97_t * ac97)


--
J.A. Magallon <jamagallon()able!es>     \               Software is like sex:
werewolf!able!es                         \         It's better when it's free
Mandriva Linux release 2006.0 (Cooker) for i586
Linux 2.6.11-jam20 (gcc 4.0.0 (4.0.0-3mdk for Mandriva Linux release 2006.0))

Re: 2.6.12-rc3-mm3: ALSA broken ?

[Takashi Iwai]

At Thu, 26 May 2005 23:51:58 +0000,
J.A. Magallon wrote:
> 
> 
> On 05.18, Takashi Iwai wrote:
> > At Tue, 17 May 2005 22:39:45 +0000,
> > J.A. Magallon wrote:
> > > 
> > > 
> > > On 05.17, Takashi Iwai wrote:
> > > ...
> > > > > 
> > > > > Example: go into 4ch mode. Check this control. Then switch to 6ch mode.
> > > > > The Center jack has no sound (it should, shouldn't ?). Check it and voilà.
> > > > > It looks that the logic in the channel selection needs to set this flag also...
> > > > 
> > > > Yep, you're right.  Try the patch below.
> > > > 
> > > > 
> > > 
> > > Thanks, this patch worked. When in 6ch mode, the boolen flag we talk about
> > > still controls if the line jack is input or output. In 4ch mode, it is always
> > > input. If i chech it, switching to 6ch does not toggle it. They are
> > > independent controls.
> > > 
> > > Anyways. I can't get rid of the flag. It is initialized to on by default.
> > > Isn't strange to have two ways of controlling this ?
> > > 
> 
> Yehaaa, I got it...
> There was a bug in your last patch.
> This:
> 
> +	snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 9 << 11,
> +			     is_shared_micin(ac97) ? 0 : 9 << 11);
> 
> should be
> 
> +	snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 1 << 9,
> +			     is_shared_micin(ac97) ? 0 : 1 << 9);
> 
> Whit this, I can control the output just with the 2/4/6 ch mode, and get rid
> of the 'Center as mic' flag...

Oh yeah, thanks.  Fixed on ALSA tree, too.


> btw, why the hell don't you use something as stupid as 
> 
> #define bit(n) (1<<(n))
> 
> ???

I don't think this always improves the readability.


> A side note. In the process of solving all this, I tried to generate a patch
> for 1.0.9rc4a against -mm. I noticed some things:
> - Your code reverts some in-kernel changes related to
>     if (ptr)
>         kfree(ptr)
>   The if is killed in mainline, as kfree accepts null pointers.

Could you point which places?


> - When linking I got:
> if [ -r System.map -a -x /sbin/depmod ]; then /sbin/depmod -ae -F System.map
> 2.6.11-jam20; fi
> WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> symbol class_simple_device_add
> WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> symbol class_simple_destroy
> WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> symbol class_simple_device_remove
> WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> symbol class_simple_create
> WARNING: /lib/modules/2.6.11-jam20/kernel/sound/core/snd.ko needs unknown
> symbol class_simple_device_add
> WARNING: /lib/modules/2.6.11-jam20/kernel/sound/core/snd.ko needs unknown
> symbol class_simple_device_remove

This doesn't come from ALSA 1.0.9rc4.  The alsa-driver tree doesn't
compile this module.


Takashi

Re: 2.6.12-rc3-mm3: ALSA broken ?

[Lee Revell]

On Thu, 2005-05-26 at 23:51 +0000, J.A. Magallon wrote:
> - When linking I got:
> if [ -r System.map -a -x /sbin/depmod ]; then /sbin/depmod -ae -F System.map
> 2.6.11-jam20; fi
> WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> symbol class_simple_device_add
> WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> symbol class_simple_destroy
> WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> symbol class_simple_device_remove
> WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> symbol class_simple_create
> WARNING: /lib/modules/2.6.11-jam20/kernel/sound/core/snd.ko needs unknown
> symbol class_simple_device_add
> WARNING: /lib/modules/2.6.11-jam20/kernel/sound/core/snd.ko needs unknown
> symbol class_simple_device_remove
> 
> I think all this have been unexported/killed...

Really?  I thought only unused EXPORT_SYMBOLS were being killed.

Lee

Re: 2.6.12-rc3-mm3: ALSA broken ?

[J.A. Magallon]

On 05.27, Takashi Iwai wrote:
> At Thu, 26 May 2005 23:51:58 +0000,
> J.A. Magallon wrote:
> 
> > A side note. In the process of solving all this, I tried to generate a patch
> > for 1.0.9rc4a against -mm. I noticed some things:
> > - Your code reverts some in-kernel changes related to
> >     if (ptr)
> >         kfree(ptr)
> >   The if is killed in mainline, as kfree accepts null pointers.
> 
> Could you point which places?
> 

Oops, I think this is not ALSA specific code.
I took the directory alsa-kernel, in the alsa tarball, and diffed against
2.6.12-rc5-mm1:

--- /usr/src/linux-2.6.12-rc5-mm1/sound/core/seq/oss/seq_oss_synth.c    2005-05-27 00:25:37.000000000 +0200
+++ alsa-kernel/core/seq/oss/seq_oss_synth.c    2005-01-20 18:42:37.000000000 +0100
@@ -325,10 +325,14 @@
            }
            snd_use_lock_free(&rec->use_lock);
        }
-       kfree(info->sysex);
-       info->sysex = NULL;
-       kfree(info->ch);
-       info->ch = NULL;
+       if (info->sysex) {
+           kfree(info->sysex);
+           info->sysex = NULL;
+       }
+       if (info->ch) {
+           kfree(info->ch);
+           info->ch = NULL;
+       }
    }
    dp->synth_opened = 0;
    dp->max_synthdev = 0;
@@ -414,10 +418,14 @@
                      dp->file_mode) < 0) {
            midi_synth_dev.opened--;
            info->opened = 0;
-           kfree(info->sysex);
-           info->sysex = NULL;
-           kfree(info->ch);
-           info->ch = NULL;
+           if (info->sysex) {
+               kfree(info->sysex);
+               info->sysex = NULL;
+           }
+           if (info->ch) {
+               kfree(info->ch);
+               info->ch = NULL;
+           }
        }
        return;
    }

This looks like OSS code. Why does the tarball include OSS code ?
Which is the correct way to generate a patch against a kernel tree ?

--
J.A. Magallon <jamagallon()able!es>     \               Software is like sex:
werewolf!able!es                         \         It's better when it's free
Mandriva Linux release 2006.0 (Cooker) for i586
Linux 2.6.11-jam20 (gcc 4.0.0 (4.0.0-3mdk for Mandriva Linux release 2006.0))

Re: 2.6.12-rc3-mm3: ALSA broken ?

[J.A. Magallon]

On 05.27, Lee Revell wrote:
> On Thu, 2005-05-26 at 23:51 +0000, J.A. Magallon wrote:
> > - When linking I got:
> > if [ -r System.map -a -x /sbin/depmod ]; then /sbin/depmod -ae -F System.map
> > 2.6.11-jam20; fi
> > WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> > symbol class_simple_device_add
> > WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> > symbol class_simple_destroy
> > WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> > symbol class_simple_device_remove
> > WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> > symbol class_simple_create
> > WARNING: /lib/modules/2.6.11-jam20/kernel/sound/core/snd.ko needs unknown
> > symbol class_simple_device_add
> > WARNING: /lib/modules/2.6.11-jam20/kernel/sound/core/snd.ko needs unknown
> > symbol class_simple_device_remove
> > 
> > I think all this have been unexported/killed...
> 
> Really?  I thought only unused EXPORT_SYMBOLS were being killed.
> 
> Lee
> 

werewolf:/usr/src/linux-2.6.12-rc5-mm1# grep -r class_simple_create *
werewolf:/usr/src/linux-2.6.12-rc5-mm1# 

nothin, nada, rien.
They are present in mainline, but dissapeared in -mm.

As I see in -mm patch, it is as simple as s/class_simple/class/.
When will this reach mainline, who knows...

--
J.A. Magallon <jamagallon()able!es>     \               Software is like sex:
werewolf!able!es                         \         It's better when it's free
Mandriva Linux release 2006.0 (Cooker) for i586
Linux 2.6.11-jam20 (gcc 4.0.0 (4.0.0-3mdk for Mandriva Linux release 2006.0))

Re: 2.6.12-rc3-mm3: ALSA broken ?

[Takashi Iwai]

At Sat, 28 May 2005 00:11:42 +0000,
J.A. Magallon wrote:
> 
> 
> On 05.27, Lee Revell wrote:
> > On Thu, 2005-05-26 at 23:51 +0000, J.A. Magallon wrote:
> > > - When linking I got:
> > > if [ -r System.map -a -x /sbin/depmod ]; then /sbin/depmod -ae -F System.map
> > > 2.6.11-jam20; fi
> > > WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> > > symbol class_simple_device_add
> > > WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> > > symbol class_simple_destroy
> > > WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> > > symbol class_simple_device_remove
> > > WARNING: /lib/modules/2.6.11-jam20/kernel/sound/soundcore.ko needs unknown
> > > symbol class_simple_create
> > > WARNING: /lib/modules/2.6.11-jam20/kernel/sound/core/snd.ko needs unknown
> > > symbol class_simple_device_add
> > > WARNING: /lib/modules/2.6.11-jam20/kernel/sound/core/snd.ko needs unknown
> > > symbol class_simple_device_remove
> > > 
> > > I think all this have been unexported/killed...
> > 
> > Really?  I thought only unused EXPORT_SYMBOLS were being killed.
> > 
> > Lee
> > 
> 
> werewolf:/usr/src/linux-2.6.12-rc5-mm1# grep -r class_simple_create *
> werewolf:/usr/src/linux-2.6.12-rc5-mm1# 
> 
> nothin, nada, rien.
> They are present in mainline, but dissapeared in -mm.

I guess that you copied sound_core.c from alsa-kernel tree.  It
doesn't work.  It's just sync'ed with the mainline kernel, but not
with mm.
Keep sound_core.c in mm tree.


Takashi

Re: 2.6.12-rc3-mm3: ALSA broken ?

[Takashi Iwai]

At Fri, 27 May 2005 21:18:00 +0000,
J.A. Magallon wrote:
> 
> 
> On 05.27, Takashi Iwai wrote:
> > At Thu, 26 May 2005 23:51:58 +0000,
> > J.A. Magallon wrote:
> > 
> > > A side note. In the process of solving all this, I tried to generate a patch
> > > for 1.0.9rc4a against -mm. I noticed some things:
> > > - Your code reverts some in-kernel changes related to
> > >     if (ptr)
> > >         kfree(ptr)
> > >   The if is killed in mainline, as kfree accepts null pointers.
> > 
> > Could you point which places?
> > 
> 
> Oops, I think this is not ALSA specific code.
> I took the directory alsa-kernel, in the alsa tarball, and diffed against
> 2.6.12-rc5-mm1:
> 
> --- /usr/src/linux-2.6.12-rc5-mm1/sound/core/seq/oss/seq_oss_synth.c    2005-05-27 00:25:37.000000000 +0200
> +++ alsa-kernel/core/seq/oss/seq_oss_synth.c    2005-01-20 18:42:37.000000000 +0100
> @@ -325,10 +325,14 @@
>             }
>             snd_use_lock_free(&rec->use_lock);
>         }
> -       kfree(info->sysex);
> -       info->sysex = NULL;
> -       kfree(info->ch);
> -       info->ch = NULL;
> +       if (info->sysex) {
> +           kfree(info->sysex);
> +           info->sysex = NULL;
> +       }
> +       if (info->ch) {
> +           kfree(info->ch);
> +           info->ch = NULL;
> +       }
>     }
>     dp->synth_opened = 0;
>     dp->max_synthdev = 0;
> @@ -414,10 +418,14 @@
>                       dp->file_mode) < 0) {
>             midi_synth_dev.opened--;
>             info->opened = 0;
> -           kfree(info->sysex);
> -           info->sysex = NULL;
> -           kfree(info->ch);
> -           info->ch = NULL;
> +           if (info->sysex) {
> +               kfree(info->sysex);
> +               info->sysex = NULL;
> +           }
> +           if (info->ch) {
> +               kfree(info->ch);
> +               info->ch = NULL;
> +           }
>         }
>         return;
>     }
> 
> This looks like OSS code. Why does the tarball include OSS code ?

No, it's OSS _emulation_ code :)
I'll fix it on ALSA tree.  Thanks.

> Which is the correct way to generate a patch against a kernel tree ?

Sorry, I don't understand "which" in the above question - do you mean
alsa-kernel tree or what?  We have a git repository, so that the
latest ALSA patches can be taken...


Takashi

Re: 2.6.12-rc3-mm3: ALSA broken ?

[J.A. Magallon]

On 05.30, Takashi Iwai wrote:
> At Fri, 27 May 2005 21:18:00 +0000,
> J.A. Magallon wrote:
> 
> > Which is the correct way to generate a patch against a kernel tree ?
> 
> Sorry, I don't understand "which" in the above question - do you mean
> alsa-kernel tree or what?  We have a git repository, so that the
> latest ALSA patches can be taken...
> 

Sorry for my bad english...

The correct question is: how do I generate a patch against a given kernel,
from the alsa-driver-x.y.z.tar.gz I can download from alsa.org ?
I thought it was enough to diff -ruN the alsa-kernel dir (minus the Documentation
folder) vs the /usr/src/linux-xxxxx/sound folder.
I have seen that there are some scripts in the tarball that install the new
drivers on a given kernel tree via symlinks, but I would like to get just
a patch. I think I will have to diff selected directories, or create
an exclude list... Are there files that are just copied from mainline and do
not change in ALSA tree, or anything can change under alsa-kernel ?

Now that I think of it, if you work against Linus tree,
would it be more correct to diff against 2.6.12-rc5, and then try to apply
to -rc5-mm1 ? 
Whe you do a release, which is your reference, latest stable (2.6.11),
latest rc or latest git ? 

About git, I don't really like the idea of storing a full kernel tree just
to do 'git update' or the like, and use the 'sound' part.

Thanks.

--
J.A. Magallon <jamagallon()able!es>     \               Software is like sex:
werewolf!able!es                         \         It's better when it's free
Mandriva Linux release 2006.0 (Cooker) for i586
Linux 2.6.11-jam20 (gcc 4.0.0 (4.0.0-3mdk for Mandriva Linux release 2006.0))

Re: 2.6.12-rc3-mm3: ALSA broken ?

[Takashi Iwai]

At Mon, 30 May 2005 14:30:46 +0000,
J.A. Magallon wrote:
> 
> The correct question is: how do I generate a patch against a given kernel,
> from the alsa-driver-x.y.z.tar.gz I can download from alsa.org ?
> I thought it was enough to diff -ruN the alsa-kernel dir (minus the Documentation
> folder) vs the /usr/src/linux-xxxxx/sound folder.
> 
> I have seen that there are some scripts in the tarball that install the new
> drivers on a given kernel tree via symlinks, but I would like to get just
> a patch. I think I will have to diff selected directories, or create
> an exclude list... Are there files that are just copied from mainline and do
> not change in ALSA tree, or anything can change under alsa-kernel ?

Basically diff should work for some of subdirectories in alsa-kernel.
Although we've tried to sync the files in sound/ directory with
mainline, better not to diff them.

As an example, I've checked the kernel sync between ALSA and mainline
trees with the script.  Note that sound_core.c etc in sound/ are not
checked.  ~/alsa-kernel-excludes contains the files to ignore like .*,
*.o, CVS, etc.

> Now that I think of it, if you work against Linus tree,
> would it be more correct to diff against 2.6.12-rc5, and then try to apply
> to -rc5-mm1 ? 

Yes.  The alsa-kernel tree is for Linus tree, in principle.

> Whe you do a release, which is your reference, latest stable (2.6.11),
> latest rc or latest git ? 

The released alsa-drivers are for the latest Linus tree.
The patches to stable tree are taken occasionally, so they are not
collected...

> About git, I don't really like the idea of storing a full kernel tree just
> to do 'git update' or the like, and use the 'sound' part.

I understand it - Although git works great, I won't use it with the
analog modem connection at home :)


Takashi


#!/bin/sh
#
# diff-alsa-26 [-R] linux-kernel alsa-kernel
#

reverse=
if [ "$1" = "-R" ]; then
  reverse=1
  shift
fi
if [ -z "$1" -o -z "$2" ]; then
    echo "usage: diff-alsa-26 linux-kernel alsa-kernel"
    exit 1
fi

LINUX=$1
ALSA=$2

diffopts=--exclude-from=$HOME/alsa-kernel-excludes

if [ -n "$reverse" ]; then
  for i in arm core drivers i2c isa parisc pci pcmcia ppc sparc synth usb; do
      diff -rupN $diffopts $ALSA/$i $LINUX/sound/$i | grep -v '^[A-Z]' | sed -es@$ALSA/@linux/sound/@g
  done
  diff -ruN $diffopts $ALSA/include $LINUX/include/sound | grep -v '^[A-Z]' | sed -es@$ALSA/include/@linux/include/sound/@g
  diff -ruN $diffopts $ALSA/Documentation $LINUX/Documentation/sound/alsa | grep -v '^[A-Z]' | sed -es@$ALSA/Documentation/@linux/Documentation/sound/alsa/@g
else
  for i in arm core drivers i2c isa parisc pci pcmcia ppc sparc synth usb; do
      diff -rupN $diffopts $LINUX/sound/$i $ALSA/$i | grep -v '^[A-Z]' | sed -es@$ALSA/@linux/sound/@g
  done
  diff -ruN $diffopts $LINUX/include/sound $ALSA/include | grep -v '^[A-Z]' | sed -es@$ALSA/include/@linux/include/sound/@g
  diff -ruN $diffopts $LINUX/Documentation/sound/alsa $ALSA/Documentation | grep -v '^[A-Z]' | sed -es@$ALSA/Documentation/@linux/Documentation/sound/alsa/@g
fi

exit 0

Re: 2.6.12-rc3-mm3: ALSA broken ?

[Takashi Iwai]

At Mon, 30 May 2005 15:37:03 +0200,
I wrote:
> 
> At Fri, 27 May 2005 21:18:00 +0000,
> J.A. Magallon wrote:
> > 
> > This looks like OSS code. Why does the tarball include OSS code ?
> 
> No, it's OSS _emulation_ code :)
> I'll fix it on ALSA tree.  Thanks.

The whole patch remove-redundant-null-checks-before-kfree-in-sound-and.patch
seems lacking.  I applied to ALSA tree.

Also, you'll need gregkh-driver-class-05-sound.patch to fix the recent
change of class_* stuff in mm tree.


Takashi