05 Apr, 2012

7 commits

  • Based on original driver from chip manufacturer, but nearly full rewite.
    Tested and used in production with Blackfin BF531 embedded processor.

    Signed-off-by: Mike Sinkovsky
    Signed-off-by: David S. Miller

    Mike Sinkovsky
     
  • For transfering generic binary data (e.g. BPF code), introduce new
    binary option type.

    Signed-off-by: Jiri Pirko
    Signed-off-by: David S. Miller

    Jiri Pirko
     
  • The CSR Clock Range has been reworked and new macros has
    been added in the platform header to allow the CSR Clock
    Range selection in the GMII Address Register.
    The previous work didn't add the other fields
    that can be used to achieve MDC clock of frequency
    higher than the IEEE 802.3 specified frequency limit
    of 2.5 MHz and program a clock divider of lower value.
    On such platforms, these are used indeed so this patch
    adds them.

    Signed-off-by: Giuseppe Cavallaro
    Signed-off-by: David S. Miller

    Giuseppe CAVALLARO
     
  • This patch re-works the internal GMAC DMA parameters
    passed from the platform.
    In the past, we only passed the pbl but, with new core,
    other parameters can be passed and are mandatory on some
    platforms.

    New parameters are documented in stmmac.txt because this
    patch has an impact for many platforms.

    Signed-off-by: Shiraz Hashim
    Signed-off-by: Vikas Manocha
    Signed-off-by: Deepak Sikri
    Hacked-by: Giuseppe Cavallaro
    Signed-off-by: David S. Miller

    Deepak SIKRI
     
  • The patch adds the macros to be used for MDC clock selection. The MDC clock
    frequency is based on scaled system clock, and has to be confined to a range
    of 1-2.5 MHz. Based on the input CSR clock, the scaling factor has to be
    selected.
    The platform specific code will provide the default value of this scaling
    factor, based on the input CSR clock.
    There is an option to set MDC clock higher than the IEEE 802.3 specified
    frequency limit of 2.5 MHz. This applies for the interfacing chips that
    support higher MDC clocks. The resultant higher clock of 12.5 MHz requires
    additional Macros to be defined for the clock divider corresponding to the
    to the following selection.
    -----------------------------------------
    Selection MDC Clock
    -----------------------------------------
    1000 clk_csr_i/4
    1001 clk_csr_i/6
    1010 clk_csr_i/8
    1011 clk_csr_i/10
    1100 clk_csr_i/12
    1101 clk_csr_i/14
    1110 clk_csr_i/16
    1111 clk_csr_i/18

    This support has to be added both in the include file, as well as driver. The
    driver need to program the registers based on the interfacing chips. This would
    be more board specific information and needs to be passed through the platform
    code to the driver. This work would be carried out in the future patch set
    release.

    Signed-off-by: Deepak Sikri
    Acked-by: Giuseppe Cavallaro
    Signed-off-by: David S. Miller

    Deepak SIKRI
     
  • This patch explicitly defines the CSUM offload engine type which need
    (not mandatory) to be passed from the platform code.
    STMMAC core supports two check sum offload engine types- Type-1 & Type-2.
    Also, there are STMMAC cores that do not have the check sum offload
    capabilities.

    The behaviour of Type-1 & Type-2 cores related to provision of checksum
    increases the packet length for Type-1 cores by 2, as the checksum is appended
    at the end of data packet and the same is made accountable in the DMA status.
    The STMMAC cores beyond Version-3.5 provide HW interface registers which allows
    the user to read the HW capabilities, while to support the previous cores the
    information related to HW capabilities has to be provided from the platform
    code.

    The Type-1 cores which do not have the HW register interface need this
    information.

    This patch also updates the driver's doc.

    Signed-off-by: Deepak Sikri
    Hacked-by: Giuseppe Cavallaro
    Signed-off-by: David S. Miller

    Deepak SIKRI
     
  • As stmmac mdio bus name prefix is hardcoded in the driver, this allows
    only phys on stmmac mdio buses to connect, however stmmac should allow
    phys on other mdio buses too.

    This patch adds new variable phy_bus_name to plat_stmmacenet_data
    struct to let the BSP decide which phy bus to be used by stmmac driver.
    A typical use-case is to have generic MDIO buses like mdio-gpio on top
    of stmmac.

    Signed-off-by: Srinivas Kandagatla
    Acked-by: Florian Fainelli
    Signed-off-by: Giuseppe Cavallaro
    Signed-off-by: David S. Miller

    Srinivas Kandagatla
     

04 Apr, 2012

6 commits

  • Currently, most drivers do not support transmit SO_TIMESTAMPING. For those
    that do support it, there is one appropriate response to the get_ts_info
    query. This patch adds a common function providing this response.

    Signed-off-by: Richard Cochran
    Reviewed-by: Ben Hutchings
    Signed-off-by: David S. Miller

    Richard Cochran
     
  • This commit adds a new ethtool ioctl that exposes the SO_TIMESTAMPING
    capabilities of a network interface. In addition, user space programs
    can use this ioctl to discover the PTP Hardware Clock (PHC) device
    associated with the interface.

    Since software receive time stamps are handled by the stack, the generic
    ethtool code can answer the query correctly in case the MAC or PHY
    drivers lack special time stamping features.

    Signed-off-by: Richard Cochran
    Reviewed-by: Ben Hutchings
    Signed-off-by: David S. Miller

    Richard Cochran
     
  • This commit adds a method that MAC drivers may call in order to find out
    the device number of their associated PTP Hardware Clock.

    Signed-off-by: Richard Cochran
    Signed-off-by: David S. Miller

    Richard Cochran
     
  • Add XOR instruction fo BPF machine. Needed for computing packet hashes.

    Signed-off-by: Jiri Pirko
    Signed-off-by: David S. Miller

    Jiri Pirko
     
  • Today, BPF filters are bind to sockets. Since BPF machine becomes handy
    for other purposes, this patch allows to create unattached filter.

    Signed-off-by: Jiri Pirko
    Signed-off-by: David S. Miller

    Jiri Pirko
     
  • In the existing code, we only stop queue when the ringbuffer is full,
    so the current packet has to be dropped or retried from upper layer.

    This patch stops the tx queue when available ringbuffer is below
    the low watermark. So the ringbuffer still has small amount of space
    available for the current packet. This will reduce the overhead of
    retries on sending.

    Signed-off-by: Haiyang Zhang
    Reviewed-by: K. Y. Srinivasan
    Signed-off-by: David S. Miller

    Haiyang Zhang
     

02 Apr, 2012

8 commits


28 Mar, 2012

8 commits

  • HZ is more likely to be 1000 these days.

    timer handlers are run from softirq, no need to disable bh

    skb priority 1 is TC_PRIO_FILLER

    Signed-off-by: Eric Dumazet
    Signed-off-by: David S. Miller

    Eric Dumazet
     
  • David S. Miller
     
  • Pull networking fixes from David Miller:
    1) Name string overrun fix in gianfar driver from Joe Perches.

    2) VHOST bug fixes from Michael S. Tsirkin and Nadav Har'El

    3) Fix dependencies on xt_LOG netfilter module, from Pablo Neira Ayuso.

    4) Fix RCU locking in xt_CT, also from Pablo Neira Ayuso.

    5) Add a parameter to skb_add_rx_frag() so we can fix the truesize
    adjustments in the drivers that use it. The individual drivers
    aren't fixed by this commit, but will be dealt with using follow-on
    commits. From Eric Dumazet.

    6) Add some device IDs to qmi_wwan driver, from Andrew Bird.

    7) Fix a potential rcu_read_lock() imbalancein rt6_fill_node(). From
    Eric Dumazet.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
    net: fix a potential rcu_read_lock() imbalance in rt6_fill_node()
    net: add a truesize parameter to skb_add_rx_frag()
    gianfar: Fix possible overrun and simplify interrupt name field creation
    USB: qmi_wwan: Add ZTE (Vodafone) K3570-Z and K3571-Z net interfaces
    USB: option: Ignore ZTE (Vodafone) K3570/71 net interfaces
    USB: qmi_wwan: Add ZTE (Vodafone) K3565-Z and K4505-Z net interfaces
    qlcnic: Bug fix for LRO
    netfilter: nf_conntrack: permanently attach timeout policy to conntrack
    netfilter: xt_CT: fix assignation of the generic protocol tracker
    netfilter: xt_CT: missing rcu_read_lock section in timeout assignment
    netfilter: cttimeout: fix dependency with l4protocol conntrack module
    netfilter: xt_LOG: use CONFIG_IP6_NF_IPTABLES instead of CONFIG_IPV6
    vhost: fix release path lockdep checks
    vhost: don't forget to schedule()
    tools/virtio: stub out strong barriers
    tools/virtio: add linux/hrtimer.h stub
    tools/virtio: add linux/module.h stub

    Linus Torvalds
     
  • Pull "ARM: device tree work" from Arnd Bergmann:
    "Most of these patches convert code from using static platform data to
    describing the hardware in the device tree. This is only the first
    half of the changes for v3.4 because a lot of patches for this topic
    came in the last week before the merge window.

    Signed-off-by: Arnd Bergmann "

    Fix up trivial conflicts in arch/arm/mach-vexpress/{Kconfig,core.h}

    * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (86 commits)
    Document: devicetree: add OF documents for arch-mmp
    ARM: dts: append DTS file of pxa168
    ARM: mmp: append OF support on pxa168
    ARM: mmp: enable rtc clk in pxa168
    i2c: pxa: add OF support
    serial: pxa: add OF support
    arm/dts: mt_ventoux: very basic support for TeeJet Mt.Ventoux board
    ARM: OMAP2+: Remove extra ifdefs for board-generic
    ARM: OMAP2+: Fix build error when only ARCH_OMAP2/3 or 4 is selected
    ASoC: DT: Add digital microphone binding to PAZ00 board.
    ARM: dt: Add ARM PMU to tegra*.dtsi
    ARM: at91: at91sam9x5cm/dt: add leds support
    ARM: at91: usb_a9g20/dt: add gpio-keys support
    ARM: at91: at91sam9m10g45ek/dt: add gpio-keys support
    ARM: at91: at91sam9m10g45ek/dt: add leds support
    ARM: at91: usb_a9g20/dt: add leds support
    ARM: at91/pio: add new PIO3 features
    ARM: at91: add sam9_smc.o to at91sam9x5 build
    ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter
    ARM: at91/tc: add device tree support to atmel_tclib
    ...

    Linus Torvalds
     
  • Pull "ARM: driver specific updates" from Arnd Bergmann:
    "These are all specific to some driver. They are typically the
    platform side of a change in the drivers directory, such as adding a
    new driver or extending the interface to the platform. In cases where
    there is no maintainer for the driver, or the maintainer prefers to
    have the platform changes in the same branch as the driver changes,
    the patches to the drivers are included as well.

    A much smaller set of driver updates that depend on other branches
    getting merged first will be sent later.

    The new export of tegra_chip_uid conflicts with other changes in
    fuse.c. In rtc-sa1100.c, the global removal of IRQF_DISABLED
    conflicts with the cleanup of the interrupt handling of that driver.

    Signed-off-by: Arnd Bergmann "

    Fixed up aforementioned trivial conflicts.

    * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
    ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci
    mmc: sdhci-s3c: add platform data for the second capability
    ARM: SAMSUNG: support the second capability for samsung-soc
    ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC
    ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1
    ARM: EXYNOS: Enable MDMA driver
    regulator: Remove bq24022 regulator driver
    rtc: sa1100: add OF support
    pxa: magician/hx4700: Convert to gpio-regulator from bq24022
    ARM: OMAP3+: SmartReflex: fix error handling
    ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API
    ARM: OMAP3+: SmartReflex: micro-optimization for sanity check
    ARM: OMAP3+: SmartReflex: misc cleanups
    ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument
    ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata()
    ARM: OMAP3+: hwmod: add SmartReflex IRQs
    ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need
    ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register
    ARM: OMAP3+: SmartReflex: Add a shutdown hook
    ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP
    ...

    Conflicts:
    arch/arm/mach-tegra/Makefile
    arch/arm/mach-tegra/fuse.c
    drivers/rtc/rtc-sa1100.c

    Linus Torvalds
     
  • Pull "remoteproc/rpmsg: new subsystem" from Arnd Bergmann:
    "This new subsystem provides a common way to talk to secondary
    processors on an SoC, e.g. a DSP, GPU or service processor, using
    virtio as the transport. In the long run, it should replace a few
    dozen vendor specific ways to do the same thing, which all never made
    it into the upstream kernel. There is a broad agreement that rpmsg is
    the way to go here and several vendors have started working on
    replacing their own subsystems.

    Two branches each add one virtio protocol number. Fortunately the
    numbers were agreed upon in advance, so there are only context
    changes.

    Signed-off-by: Arnd Bergmann "

    Fixed up trivial protocol number conflict due to the mentioned additions
    next to each other.

    * tag 'rpmsg' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
    remoteproc: cleanup resource table parsing paths
    remoteproc: remove the hardcoded vring alignment
    remoteproc/omap: remove the mbox_callback limitation
    remoteproc: remove the single rpmsg vdev limitation
    remoteproc: safer boot/shutdown order
    remoteproc: remoteproc_rpmsg -> remoteproc_virtio
    remoteproc: resource table overhaul
    rpmsg: fix build warning when dma_addr_t is 64-bit
    rpmsg: fix published buffer length in rpmsg_recv_done
    rpmsg: validate incoming message length before propagating
    rpmsg: fix name service endpoint leak
    remoteproc/omap: two Kconfig fixes
    remoteproc: make sure we're parsing a 32bit firmware
    remoteproc: s/big switch/lookup table/
    remoteproc: bail out if firmware has different endianess
    remoteproc: don't use virtio's weak barriers
    rpmsg: rename virtqueue_add_buf_gfp to virtqueue_add_buf
    rpmsg: depend on EXPERIMENTAL
    remoteproc: depend on EXPERIMENTAL
    rpmsg: add Kconfig menu
    ...

    Conflicts:
    include/linux/virtio_ids.h

    Linus Torvalds
     
  • Pull "ARM: timer cleanup work" from Arnd Bergmann:
    "These are split out from the generic soc and driver updates because
    there was a lot of conflicting work by multiple people. Marc Zyngier
    worked on simplifying the "localtimer" interfaces, and some of the
    platforms are touching the same code as they move to device tree based
    booting.

    Signed-off-by: Arnd Bergmann "

    * tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)
    ARM: tegra: select USB_ULPI if USB is selected
    arm/tegra: pcie: fix return value of function
    ARM: ux500: fix compilation after local timer rework
    ARM: shmobile: remove additional __io() macro use
    ARM: local timers: make the runtime registration interface mandatory
    ARM: local timers: convert MSM to runtime registration interface
    ARM: local timers: convert exynos to runtime registration interface
    ARM: smp_twd: remove old local timer interface
    ARM: imx6q: convert to twd_local_timer_register() interface
    ARM: highbank: convert to twd_local_timer_register() interface
    ARM: ux500: convert to twd_local_timer_register() interface
    ARM: shmobile: convert to twd_local_timer_register() interface
    ARM: tegra: convert to twd_local_timer_register() interface
    ARM: plat-versatile: convert to twd_local_timer_register() interface
    ARM: OMAP4: convert to twd_local_timer_register() interface
    ARM: smp_twd: add device tree support
    ARM: smp_twd: add runtime registration support
    ARM: local timers: introduce a new registration interface
    ARM: smp_twd: make local_timer_stop a symbol instead of a #define
    ARM: mach-shmobile: default to no earlytimer
    ...

    Linus Torvalds
     
  • Pull "ARM: global cleanups" from Arnd Bergmann:
    "Quite a bit of code gets removed, and some stuff moved around, mostly
    the old samsung s3c24xx stuff. There should be no functional changes
    in this series otherwise. Some cleanups have dependencies on other
    arm-soc branches and will be sent in the second round.

    Signed-off-by: Arnd Bergmann "

    Fixed up trivial conflicts mainly due to #include's being changes on
    both sides.

    * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (121 commits)
    ep93xx: Remove unnecessary includes of ep93xx-regs.h
    ep93xx: Move EP93XX_SYSCON defines to SoC private header
    ep93xx: Move crunch code to mach-ep93xx directory
    ep93xx: Make syscon access functions private to SoC
    ep93xx: Configure GPIO ports in core code
    ep93xx: Move peripheral defines to local SoC header
    ep93xx: Convert the watchdog driver into a platform device.
    ep93xx: Use ioremap for backlight driver
    ep93xx: Move GPIO defines to gpio-ep93xx.h
    ep93xx: Don't use system controller defines in audio drivers
    ep93xx: Move PHYS_BASE defines to local SoC header file
    ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver
    ARM: EXYNOS: add clock registers for exynos4x12-cpufreq
    PM / devfreq: update the name of EXYNOS clock registers that were omitted
    PM / devfreq: update the name of EXYNOS clock register
    ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock
    ARM: EXYNOS: use static declaration on regarding clock
    ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs
    ARM: OMAP2+: Fix build error after merge
    ARM: S3C24XX: remove call to s3c24xx_setup_clocks
    ...

    Linus Torvalds
     

27 Mar, 2012

1 commit

  • The station_info struct had demanded dBm signal values, but the
    cfg80211 wireless extensions implementation was also accepting
    "unspecified" (i.e. RSSI) unit values while the nl80211 code was
    completely unaware of them. Resolve this by formally allowing the
    "unspecified" units while making nl80211 ignore them.

    Signed-off-by: John W. Linville
    Reviewed-by: Johannes Berg

    John W. Linville
     

26 Mar, 2012

1 commit

  • skb_add_rx_frag() API is misleading.

    Network skbs built with this helper can use uncharged kernel memory and
    eventually stress/crash machine in OOM.

    Add a 'truesize' parameter and then fix drivers in followup patches.

    Signed-off-by: Eric Dumazet
    Cc: Wey-Yi Guy
    Signed-off-by: David S. Miller

    Eric Dumazet
     

25 Mar, 2012

3 commits

  • Pull more xen updates from Konrad Rzeszutek Wilk:
    "One tiny feature that accidentally got lost in the initial git pull:
    * Add fast-EOI acking of interrupts (clear a bit instead of
    hypercall)
    And bug-fixes:
    * Fix CPU bring-up code missing a call to notify other subsystems.
    * Fix reading /sys/hypervisor even if PVonHVM drivers are not loaded.
    * In Xen ACPI processor driver: remove too verbose WARN messages, fix
    up the Kconfig dependency to be a module by default, and add
    dependency on CPU_FREQ.
    * Disable CPU frequency drivers from loading when booting under Xen
    (as we want the Xen ACPI processor to be used instead).
    * Cleanups in tmem code."

    * tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/acpi: Fix Kconfig dependency on CPU_FREQ
    xen: initialize platform-pci even if xen_emul_unplug=never
    xen/smp: Fix bringup bug in AP code.
    xen/acpi: Remove the WARN's as they just create noise.
    xen/tmem: cleanup
    xen: support pirq_eoi_map
    xen/acpi-processor: Do not depend on CPU frequency scaling drivers.
    xen/cpufreq: Disable the cpu frequency scaling drivers from loading.
    provide disable_cpufreq() function to disable the API.

    Linus Torvalds
     
  • Pull avoidance patches from Paul Gortmaker:
    "Nearly every subsystem has some kind of header with a proto like:

    void foo(struct device *dev);

    and yet there is no reason for most of these guys to care about the
    sub fields within the device struct. This allows us to significantly
    reduce the scope of headers including headers. For this instance, a
    reduction of about 40% is achieved by replacing the include with the
    simple fact that the device is some kind of a struct.

    Unlike the much larger module.h cleanup, this one is simply two
    commits. One to fix the implicit users, and then one
    to delete the device.h includes from the linux/include/ dir wherever
    possible."

    * tag 'device-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
    device.h: audit and cleanup users in main include dir
    device.h: cleanup users outside of linux/include (C files)

    Linus Torvalds
     
  • Pull cleanup from Paul Gortmaker:
    "The changes shown here are to unify linux's BUG support under the one
    file. Due to historical reasons, we have some BUG code
    in bug.h and some in kernel.h -- i.e. the support for BUILD_BUG in
    linux/kernel.h predates the addition of linux/bug.h, but old code in
    kernel.h wasn't moved to bug.h at that time. As a band-aid, kernel.h
    was including to pseudo link them.

    This has caused confusion[1] and general yuck/WTF[2] reactions. Here
    is an example that violates the principle of least surprise:

    CC lib/string.o
    lib/string.c: In function 'strlcat':
    lib/string.c:225:2: error: implicit declaration of function 'BUILD_BUG_ON'
    make[2]: *** [lib/string.o] Error 1
    $
    $ grep linux/bug.h lib/string.c
    #include
    $

    We've included for the BUG infrastructure and yet we
    still get a compile fail! [We've not kernel.h for BUILD_BUG_ON.] Ugh -
    very confusing for someone who is new to kernel development.

    With the above in mind, the goals of this changeset are:

    1) find and fix any include/*.h files that were relying on the
    implicit presence of BUG code.
    2) find and fix any C files that were consuming kernel.h and hence
    relying on implicitly getting some/all BUG code.
    3) Move the BUG related code living in kernel.h to
    4) remove the asm/bug.h from kernel.h to finally break the chain.

    During development, the order was more like 3-4, build-test, 1-2. But
    to ensure that git history for bisect doesn't get needless build
    failures introduced, the commits have been reorderd to fix the problem
    areas in advance.

    [1] https://lkml.org/lkml/2012/1/3/90
    [2] https://lkml.org/lkml/2012/1/17/414"

    Fix up conflicts (new radeon file, reiserfs header cleanups) as per Paul
    and linux-next.

    * tag 'bug-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
    kernel.h: doesn't explicitly use bug.h, so don't include it.
    bug: consolidate BUILD_BUG_ON with other bug code
    BUG: headers with BUG/BUG_ON etc. need linux/bug.h
    bug.h: add include of it to various implicit C users
    lib: fix implicit users of kernel.h for TAINT_WARN
    spinlock: macroize assert_spin_locked to avoid bug.h dependency
    x86: relocate get/set debugreg fcns to include/asm/debugreg.

    Linus Torvalds
     

24 Mar, 2012

6 commits

  • …ie/regulator into next/drivers

    The pxa regulator branch removes the bq24022 driver, while a lot of
    other regulator drivers got added in the regulator tree. This
    resolves the trivial conflicts by merging in the regulator patches
    that are already merged into v3.4.

    Conflicts:
    drivers/regulator/Kconfig
    drivers/regulator/Makefile

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>

    Arnd Bergmann
     
  • Pull sysctl updates from Eric Biederman:

    - Rewrite of sysctl for speed and clarity.

    Insert/remove/Lookup in sysctl are all now O(NlogN) operations, and
    are no longer bottlenecks in the process of adding and removing
    network devices.

    sysctl is now focused on being a filesystem instead of system call
    and the code can all be found in fs/proc/proc_sysctl.c. Hopefully
    this means the code is now approachable.

    Much thanks is owed to Lucian Grinjincu for keeping at this until
    something was found that was usable.

    - The recent proc_sys_poll oops found by the fuzzer during hibernation
    is fixed.

    * git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl: (36 commits)
    sysctl: protect poll() in entries that may go away
    sysctl: Don't call sysctl_follow_link unless we are a link.
    sysctl: Comments to make the code clearer.
    sysctl: Correct error return from get_subdir
    sysctl: An easier to read version of find_subdir
    sysctl: fix memset parameters in setup_sysctl_set()
    sysctl: remove an unused variable
    sysctl: Add register_sysctl for normal sysctl users
    sysctl: Index sysctl directories with rbtrees.
    sysctl: Make the header lists per directory.
    sysctl: Move sysctl_check_dups into insert_header
    sysctl: Modify __register_sysctl_paths to take a set instead of a root and an nsproxy
    sysctl: Replace root_list with links between sysctl_table_sets.
    sysctl: Add sysctl_print_dir and use it in get_subdir
    sysctl: Stop requiring explicit management of sysctl directories
    sysctl: Add a root pointer to ctl_table_set
    sysctl: Rewrite proc_sys_readdir in terms of first_entry and next_entry
    sysctl: Rewrite proc_sys_lookup introducing find_entry and lookup_entry.
    sysctl: Normalize the root_table data structure.
    sysctl: Factor out insert_header and erase_header
    ...

    Linus Torvalds
     
  • Pull cpufreq updates for 3.4 from Dave Jones: new drivers and some fixes.

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
    provide disable_cpufreq() function to disable the API.
    EXYNOS5250: Add support cpufreq for EXYNOS5250
    EXYNOS4X12: Add support cpufreq for EXYNOS4X12
    [CPUFREQ] CPUfreq ondemand: update sampling rate without waiting for next sampling
    [CPUFREQ] Add S3C2416/S3C2450 cpufreq driver
    [CPUFREQ] Fix exposure of ARM_EXYNOS4210_CPUFREQ
    [CPUFREQ] EXYNOS4210: update the name of EXYNOS clock register
    [CPUFREQ] EXYNOS: Initialize locking_frequency with initial frequency
    [CPUFREQ] s3c64xx: Fix mis-cherry pick of VDDINT

    Fix up trivial conflicts in Kconfig and Makefile due to just changes
    next to each other (OMAP2PLUS changes vs some new EXYNOS cpufreq
    drivers).

    Linus Torvalds
     
  • Pull #2 ARM updates from Russell King:
    "Further ARM AMBA primecell updates which aren't included directly in
    the previous commit. I wanted to keep these separate as they're
    touching stuff outside arch/arm/."

    * 'amba' of git://git.linaro.org/people/rmk/linux-arm:
    ARM: 7362/1: AMBA: Add module_amba_driver() helper macro for amba_driver
    ARM: 7335/1: mach-u300: do away with MMC config files
    ARM: 7280/1: mmc: mmci: Cache MMCICLOCK and MMCIPOWER register
    ARM: 7309/1: realview: fix unconnected interrupts on EB11MP
    ARM: 7230/1: mmc: mmci: Fix PIO read for small SDIO packets
    ARM: 7227/1: mmc: mmci: Prepare for SDIO before setting up DMA job
    ARM: 7223/1: mmc: mmci: Fixup use of runtime PM and use autosuspend
    ARM: 7221/1: mmc: mmci: Change from using legacy suspend
    ARM: 7219/1: mmc: mmci: Change vdd_handler to a generic ios_handler
    ARM: 7218/1: mmc: mmci: Provide option to configure bus signal direction
    ARM: 7217/1: mmc: mmci: Put power register deviations in variant data
    ARM: 7216/1: mmc: mmci: Do not release spinlock in request_end
    ARM: 7215/1: mmc: mmci: Increase max_segs from 16 to 128

    Linus Torvalds
     
  • Pull #1 ARM updates from Russell King:
    "This one covers stuff which Arnd is waiting for me to push, as this is
    shared between both our trees and probably other trees elsewhere.

    Essentially, this contains:
    - AMBA primecell device initializer updates - mostly shrinking the
    size of the device declarations in platform code to something more
    reasonable.
    - Getting rid of the NO_IRQ crap from AMBA primecell stuff.
    - Nicolas' idle cleanups. This in combination with the restart
    cleanups from the last merge window results in a great many
    mach/system.h files being deleted."

    Yay: ~80 files, ~2000 lines deleted.

    * 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm: (60 commits)
    ARM: remove disable_fiq and arch_ret_to_user macros
    ARM: make entry-macro.S depend on !MULTI_IRQ_HANDLER
    ARM: rpc: make default fiq handler run-time installed
    ARM: make arch_ret_to_user macro optional
    ARM: amba: samsung: use common amba device initializers
    ARM: amba: spear: use common amba device initializers
    ARM: amba: nomadik: use common amba device initializers
    ARM: amba: u300: use common amba device initializers
    ARM: amba: lpc32xx: use common amba device initializers
    ARM: amba: netx: use common amba device initializers
    ARM: amba: bcmring: use common amba device initializers
    ARM: amba: ep93xx: use common amba device initializers
    ARM: amba: omap2: use common amba device initializers
    ARM: amba: integrator: use common amba device initializers
    ARM: amba: realview: get rid of private platform amba_device initializer
    ARM: amba: versatile: get rid of private platform amba_device initializer
    ARM: amba: vexpress: get rid of private platform amba_device initializer
    ARM: amba: provide common initializers for static amba devices
    ARM: amba: make use of -1 IRQs warn
    ARM: amba: u300: get rid of NO_IRQ initializers
    ...

    Linus Torvalds
     
  • Russell King