1. 11 1月, 2011 16 次提交
    • L
      Merge branch 'for-linus' of... · e0e736fc
      Linus Torvalds 提交于
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (30 commits)
        MAINTAINERS: Add tomoyo-dev-en ML.
        SELinux: define permissions for DCB netlink messages
        encrypted-keys: style and other cleanup
        encrypted-keys: verify datablob size before converting to binary
        trusted-keys: kzalloc and other cleanup
        trusted-keys: additional TSS return code and other error handling
        syslog: check cap_syslog when dmesg_restrict
        Smack: Transmute labels on specified directories
        selinux: cache sidtab_context_to_sid results
        SELinux: do not compute transition labels on mountpoint labeled filesystems
        This patch adds a new security attribute to Smack called SMACK64EXEC. It defines label that is used while task is running.
        SELinux: merge policydb_index_classes and policydb_index_others
        selinux: convert part of the sym_val_to_name array to use flex_array
        selinux: convert type_val_to_struct to flex_array
        flex_array: fix flex_array_put_ptr macro to be valid C
        SELinux: do not set automatic i_ino in selinuxfs
        selinux: rework security_netlbl_secattr_to_sid
        SELinux: standardize return code handling in selinuxfs.c
        SELinux: standardize return code handling in selinuxfs.c
        SELinux: standardize return code handling in policydb.c
        ...
      e0e736fc
    • L
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging · a0894881
      Linus Torvalds 提交于
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (44 commits)
        hwmon: Support for Dallas Semiconductor DS620
        hwmon: driver for Sensirion SHT21 humidity and temperature sensor
        hwmon: Add humidity attribute to sysfs ABI
        hwmon: sysfs ABI updates
        hwmon: (via-cputemp) sync hotplug handling with coretemp/pkgtemp
        hwmon: (lm95241) Rewrite to avoid using macros
        hwmon: (applesmc) Fix checkpatch errors and fix value range checks
        hwmon: (applesmc) Update copyright information
        hwmon: (applesmc) Silence driver
        hwmon: (applesmc) Simplify feature sysfs handling
        hwmon: (applesmc) Dynamic creation of fan files
        hwmon: (applesmc) Extract all features generically
        hwmon: (applesmc) Handle new temperature format
        hwmon: (applesmc) Dynamic creation of temperature files
        hwmon: (applesmc) Introduce a register lookup table
        hwmon: (applesmc) Use pr_fmt and pr_<level>
        hwmon: (applesmc) Relax the severity of device init failure
        hwmon: (applesmc) Add MacBookAir3,1(3,2) support
        hwmon: (w83627hf) Use pr_fmt and pr_<level>
        hwmon: (w83627ehf) Use pr_fmt and pr_<level>
        ...
      a0894881
    • L
      Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 · 0bd2cbcd
      Linus Torvalds 提交于
      * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (29 commits)
        of/flattree: forward declare struct device_node in of_fdt.h
        ipmi: explicitly include of_address.h and of_irq.h
        sparc: explicitly cast negative phandle checks to s32
        powerpc/405: Fix missing #{address,size}-cells in i2c node
        powerpc/5200: dts: refactor dts files
        powerpc/5200: dts: Change combatible strings on localbus
        powerpc/5200: dts: remove unused properties
        powerpc/5200: dts: rename nodes to prepare for refactoring dts files
        of/flattree: Update dtc to current mainline.
        of/device: Don't register disabled devices
        powerpc/dts: fix syntax bugs in bluestone.dts
        of: Fixes for OF probing on little endian systems
        of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF
        of/flattree: Add of_flat_dt_match() helper function
        of_serial: explicitly include of_irq.h
        of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree
        of/flattree: Reorder unflatten_dt_node
        of/flattree: Refactor unflatten_dt_node
        of/flattree: Add non-boottime device tree functions
        of/flattree: Add Kconfig for EARLY_FLATTREE
        ...
      
      Fix up trivial conflict in arch/sparc/prom/tree_32.c as per Grant.
      0bd2cbcd
    • A
      headers: kobject.h redux · 57cc7215
      Alexey Dobriyan 提交于
      Remove kobject.h from files which don't need it, notably,
      sched.h and fs.h.
      Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      57cc7215
    • A
      headers: path.h redux · 37721e1b
      Alexey Dobriyan 提交于
      Remove path.h from sched.h and other files.
      Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      37721e1b
    • L
      Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · 9f99a2f0
      Linus Torvalds 提交于
      * 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/event: validate irq before get evtchn by irq
        xen/fb: fix potential memory leak
        xen/fb: fix xenfb suspend/resume race.
        xen: disable ACPI NUMA for PV guests
        xen/irq: Cleanup the find_unbound_irq
      9f99a2f0
    • L
      Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · 8c8ae4e8
      Linus Torvalds 提交于
      * 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: HVM X2APIC support
        apic: Move hypervisor detection of x2apic to hypervisor.h
      8c8ae4e8
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · a1e8fad5
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        slub: Fix a crash during slabinfo -v
        tracing/slab: Move kmalloc tracepoint out of inline code
        slub: Fix slub_lock down/up imbalance
        slub: Fix build breakage in Documentation/vm
        slub tracing: move trace calls out of always inlined functions to reduce kernel code size
        slub: move slabinfo.c to tools/slub/slabinfo.c
      a1e8fad5
    • L
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · e3166331
      Linus Torvalds 提交于
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        Documentation/kbuild: add info that 'choice' can have a symbol name
        kbuild: add numeric --set-val option to scripts/config
        headers_check: Fix warning text
        headers_check: better search for functions in headers
        scripts/coccinelle: update for compatability with Coccinelle 0.2.4
        tags: put function prototypes back!
        Kconfig: fix single letter command in scripts/config
        gitignore: add scripts/recordmcount
      e3166331
    • L
      Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · 1693ed28
      Linus Torvalds 提交于
      * 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        deb-pkg: s/hdr/kernel_headers_/ && s/header/libc_headers_/
        deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb
        kbuild: create linux-headers package in deb-pkg
        kbuild, deb-pkg: support overriding userland architecture
        kbuild, deb-pkg: select userland architecture based on UTS_MACHINE
        kbuild, deb-pkg: Fix build with paranoid umask
      1693ed28
    • L
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · f28b1c8a
      Linus Torvalds 提交于
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        nconf: handle comment entries within choice/endchoice
        kconfig: fix warning
        kconfig: Make expr_copy() take a const argument
        kconfig: simplify select-with-unmet-direct-dependency warning
        kconfig: add more S_INT and S_HEX consistency checks
        kconfig: fix `zconfdebug' extern declaration
        kconfig/conf: merge duplicate switch's case
        kconfig: fix typos
        kbuild/gconf: add dummy inline for bind_textdomain_codeset()
        kbuild/nconf: fix spaces damage
        kconfig: nuke second argument of conf_write_symbol()
        kconfig: do not define AUTOCONF_INCLUDED
        kconfig: the day kconfig warns about "select"-abuse has come
      f28b1c8a
    • L
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · 0c05384a
      Linus Torvalds 提交于
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        mkuboot.sh: Fail if mkimage is missing
        gen_init_cpio: checkpatch fixes
        gen_init_cpio: Avoid race between call to stat() and call to open()
        modpost: Fix address calculation in reloc_location()
        Make fixdep error handling more explicit
        checksyscalls: Fix stand-alone usage
        modpost: Put .zdebug* section on white list
        kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG
        kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all
        kbuild: introduce HDR_ARCH_LIST for headers_install_all
        headers_install: check exit status of unifdef
        gen_init_cpio: remove leading `/' from file names
        scripts/genksyms: fix header usage
        fixdep: use hash table instead of a single array
      0c05384a
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 1542dec1
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        pata_platform: Remove CONFIG_HAVE_PATA_PLATFORM's dependencies.
        pata_hpt37x: actually limit HPT370 to UltraDMA/66
        pata_hpt3x2n: coding style cleanup
        pata_hpt37x: coding style cleanup
        pata_hpt366: coding style cleanup
        pata_hpt3x2n: calculate average f_CNT
        pata_hpt3x2n: clarify about HPT371N support
        pata_hpt{37x|3x2n}: SATA mode filtering
        [libata] avoid needlessly passing around ptr to SCSI completion func
        [libata] new driver acard_ahci, for ATP8620 host controller
      1542dec1
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · facc7a96
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (34 commits)
        HID: roccat: Update sysfs attribute doc
        HID: roccat: don't use #pragma pack
        HID: roccat: Add support for Roccat Kone[+] v2
        HID: roccat: reduce number of functions in kone and pyra drivers
        HID: roccat: declare meaning of pack pragma usage in driver headers
        HID: roccat: use class for char device for sysfs attribute creation
        sysfs: Introducing binary attributes for struct class
        HID: hidraw: add compatibility ioctl() for 32-bit applications.
        HID: hid-picolcd: Fix memory leak in picolcd_debug_out_report()
        HID: picolcd: fix misuse of logical operation in place of bitop
        HID: usbhid: base runtime PM on modern API
        HID: replace offsets values with their corresponding BTN_* defines
        HID: hid-mosart: support suspend/resume
        HID: hid-mosart: ignore buttons report
        HID: hid-picolcd: don't use flush_scheduled_work()
        HID: simplify an index check in hid_lookup_collection
        HID: Hoist assigns from ifs
        HID: Remove superfluous __inline__
        HID: Use vzalloc for vmalloc/memset(,0...)
        HID: Add and use hid_<level>: dev_<level> equivalents
        ...
      facc7a96
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · c8940eca
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
        spi / PM: Support dev_pm_ops
        PM: Prototype the pm_generic_ operations
        PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally
        PM: Use dev_name() in core device suspend and resume routines
        PM: Permit registration of parentless devices during system suspend
        PM: Replace the device power.status field with a bit field
        PM: Remove redundant checks from core device resume routines
        PM: Use a different list of devices for each stage of device suspend
        PM: Avoid compiler warning in pm_noirq_op()
        PM: Use pm_wakeup_pending() in __device_suspend()
        PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending()
        PM: Prevent dpm_prepare() from returning errors unnecessarily
        PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt
        PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3)
        PM / Hibernate: When failed, in_suspend should be reset
        PM / Hibernate: hibernation_ops->leave should be checked too
        Freezer: Fix a race during freezing of TASK_STOPPED tasks
        PM: Use proper ccflag flag in kernel/power/Makefile
        PM / Runtime: Fix comments to match runtime callback code
      c8940eca
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 78c92a9f
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        firewire: use split transaction timeout only for split transactions
        firewire: ohci: consolidate context status flags
        firewire: ohci: cache the context run bit
        firewire: ohci: flush AT contexts after bus reset - addendum
        firewire: ohci: flush AT contexts after bus reset for OHCI 1.2
        firewire: net: set carrier state at ifup
        firewire: net: add carrier detection
        firewire: net: ratelimit error messages
        firewire: ohci: restart iso DMA contexts on resume from low power mode
        firewire: ohci: restore GUID on resume.
        firewire: ohci: use common buffer for self IDs and AR descriptors
        firewire: ohci: optimize iso context checks in the interrupt handler
        firewire: make PHY packet header format consistent
        firewire: ohci: properly clear posted write errors
        firewire: ohci: flush MMIO writes in the interrupt handler
        firewire: ohci: fix AT context initialization error handling
        firewire: ohci: Asynchronous Reception rewrite
        firewire: core: Update WARN uses
        firewire: nosy: char device is not seekable
      78c92a9f
  2. 10 1月, 2011 24 次提交