From 89583bf5f8136b9b9aacbd28ba88d574a838da74 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 31 Jan 2011 12:56:27 +1000 Subject: [PATCH] --- yaml --- r: 232571 b: refs/heads/master c: 9fbf0c08d441888b977f7c459c8aa57f2c0cb6ad h: refs/heads/master i: 232569: c4282418da81ead74c8da3b001efa580568b7a85 232567: 21d622eb23f5c9959df7aafbcf92ed474cd6f95a v: v3 --- [refs] | 2 +- trunk/.mailmap | 1 + .../ABI/testing/sysfs-platform-at91 | 25 + trunk/Documentation/kernel-parameters.txt | 4 +- trunk/Documentation/networking/bonding.txt | 83 +- trunk/MAINTAINERS | 1 - trunk/arch/arm/include/asm/hardware/sp810.h | 6 + trunk/arch/arm/include/asm/memory.h | 2 +- trunk/arch/arm/kernel/smp_twd.c | 7 +- trunk/arch/arm/mach-ep93xx/gpio.c | 7 + trunk/arch/arm/mach-omap2/pm24xx.c | 4 +- trunk/arch/arm/mach-omap2/pm34xx.c | 4 +- trunk/arch/arm/mach-omap2/serial.c | 4 +- trunk/arch/arm/mach-realview/Kconfig | 49 +- trunk/arch/arm/mach-realview/platsmp.c | 2 +- trunk/arch/arm/mach-shmobile/Kconfig | 2 + trunk/arch/arm/mach-shmobile/board-ag5evm.c | 180 +++- trunk/arch/arm/mach-shmobile/board-g3evm.c | 1 - trunk/arch/arm/mach-shmobile/board-mackerel.c | 5 +- trunk/arch/arm/mach-shmobile/clock-sh7372.c | 4 +- trunk/arch/arm/mach-shmobile/clock-sh73a0.c | 29 +- trunk/arch/arm/mach-shmobile/intc-sh7372.c | 11 +- trunk/arch/arm/mach-shmobile/intc-sh73a0.c | 5 +- trunk/arch/arm/mach-tegra/gpio.c | 4 +- trunk/arch/arm/mach-tegra/include/mach/clk.h | 2 + .../arch/arm/mach-tegra/include/mach/clkdev.h | 2 + trunk/arch/arm/mach-tegra/include/mach/kbc.h | 61 ++ trunk/arch/arm/mach-tegra/irq.c | 18 +- trunk/arch/arm/mach-versatile/Kconfig | 10 +- trunk/arch/arm/mach-vexpress/platsmp.c | 2 +- trunk/arch/arm/mach-vexpress/v2m.c | 9 + trunk/arch/avr32/include/asm/pgalloc.h | 1 + trunk/arch/m68k/amiga/config.c | 16 +- trunk/arch/m68k/atari/ataints.c | 4 +- trunk/arch/m68k/atari/config.c | 2 +- trunk/arch/m68k/atari/debug.c | 14 +- trunk/arch/m68k/include/asm/atarihw.h | 2 +- trunk/arch/m68k/include/asm/string.h | 12 - trunk/arch/parisc/kernel/pdc_cons.c | 4 +- trunk/arch/sh/Kconfig | 1 + trunk/arch/sh/Makefile | 3 +- trunk/arch/sh/boards/mach-ecovec24/setup.c | 2 + trunk/arch/sh/boot/Makefile | 11 +- trunk/arch/sh/boot/compressed/Makefile | 4 +- trunk/arch/sh/boot/compressed/misc.c | 4 + trunk/arch/sh/include/asm/pgtable.h | 1 + trunk/arch/sh/kernel/cpu/sh4/setup-sh7750.c | 6 +- trunk/arch/sh/kernel/topology.c | 1 + trunk/arch/x86/include/asm/paravirt.h | 5 +- trunk/arch/x86/include/asm/percpu.h | 24 +- trunk/arch/x86/include/asm/system_64.h | 22 - trunk/arch/x86/kernel/dumpstack_64.c | 2 +- trunk/arch/x86/xen/p2m.c | 18 +- trunk/arch/x86/xen/setup.c | 8 +- trunk/drivers/ata/ahci.c | 3 + trunk/drivers/ata/libata-core.c | 1 + trunk/drivers/ata/libata-scsi.c | 24 +- trunk/drivers/ata/pata_hpt366.c | 6 +- trunk/drivers/ata/pata_hpt37x.c | 112 ++- trunk/drivers/ata/pata_hpt3x2n.c | 12 +- trunk/drivers/ata/pata_mpc52xx.c | 2 +- trunk/drivers/atm/idt77105.c | 2 +- trunk/drivers/base/power/runtime.c | 9 +- trunk/drivers/bluetooth/ath3k.c | 75 +- trunk/drivers/char/bfin_jtag_comm.c | 8 +- trunk/drivers/clocksource/tcb_clksrc.c | 4 +- trunk/drivers/gpio/langwell_gpio.c | 9 +- trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 15 + trunk/drivers/gpu/drm/nouveau/nouveau_drv.c | 8 +- trunk/drivers/gpu/drm/nouveau/nouveau_drv.h | 3 - trunk/drivers/gpu/drm/nouveau/nouveau_temp.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_graph.c | 3 + trunk/drivers/gpu/drm/nouveau/nv50_vm.c | 5 - trunk/drivers/gpu/drm/nouveau/nvc0_graph.c | 23 +- trunk/drivers/gpu/drm/nouveau/nvc0_grctx.c | 2 +- trunk/drivers/gpu/drm/radeon/atombios_crtc.c | 17 + trunk/drivers/gpu/drm/radeon/atombios_dp.c | 4 +- .../gpu/drm/radeon/evergreen_blit_kms.c | 39 +- trunk/drivers/gpu/drm/radeon/r100.c | 10 +- trunk/drivers/gpu/drm/radeon/r300.c | 7 +- trunk/drivers/gpu/drm/radeon/r420.c | 2 +- trunk/drivers/gpu/drm/radeon/r520.c | 4 +- trunk/drivers/gpu/drm/radeon/r600_reg.h | 6 +- trunk/drivers/gpu/drm/radeon/radeon_device.c | 10 +- .../drivers/gpu/drm/radeon/radeon_encoders.c | 6 +- trunk/drivers/gpu/drm/radeon/radeon_kms.c | 2 + trunk/drivers/gpu/drm/radeon/radeon_reg.h | 2 + trunk/drivers/gpu/drm/radeon/rs400.c | 15 +- trunk/drivers/gpu/drm/radeon/rv515.c | 10 +- trunk/drivers/hwmon/applesmc.c | 1 + trunk/drivers/hwmon/asus_atk0110.c | 23 +- trunk/drivers/hwmon/lis3lv02d.c | 2 +- trunk/drivers/input/keyboard/Kconfig | 10 + trunk/drivers/input/keyboard/Makefile | 1 + trunk/drivers/input/keyboard/gpio_keys.c | 6 +- trunk/drivers/input/keyboard/tegra-kbc.c | 727 ++++++++++++++ .../drivers/input/keyboard/tnetv107x-keypad.c | 5 +- trunk/drivers/input/serio/ct82c710.c | 8 +- trunk/drivers/input/serio/serport.c | 24 +- trunk/drivers/input/sparse-keymap.c | 1 + trunk/drivers/input/tablet/wacom_wac.c | 27 +- trunk/drivers/input/touchscreen/bu21013_ts.c | 39 +- .../drivers/input/touchscreen/tnetv107x-ts.c | 5 +- trunk/drivers/leds/leds-pwm.c | 1 + trunk/drivers/mmc/host/bfin_sdh.c | 2 +- trunk/drivers/mmc/host/jz4740_mmc.c | 5 +- trunk/drivers/mmc/host/mmci.c | 108 +-- trunk/drivers/mmc/host/mmci.h | 5 +- trunk/drivers/mmc/host/sdhci-s3c.c | 36 + trunk/drivers/mmc/host/ushc.c | 1 - trunk/drivers/net/bnx2.c | 21 +- trunk/drivers/net/bnx2.h | 1 + trunk/drivers/net/bonding/bond_3ad.c | 4 + trunk/drivers/net/bonding/bond_alb.c | 4 + trunk/drivers/net/bonding/bond_main.c | 4 + trunk/drivers/net/can/Kconfig | 2 + trunk/drivers/net/can/Makefile | 1 + trunk/drivers/net/can/at91_can.c | 138 ++- trunk/drivers/net/can/softing/Kconfig | 30 + trunk/drivers/net/can/softing/Makefile | 6 + trunk/drivers/net/can/softing/softing.h | 167 ++++ trunk/drivers/net/can/softing/softing_cs.c | 359 +++++++ trunk/drivers/net/can/softing/softing_fw.c | 691 ++++++++++++++ trunk/drivers/net/can/softing/softing_main.c | 893 ++++++++++++++++++ .../net/can/softing/softing_platform.h | 40 + trunk/drivers/net/cnic.c | 12 +- trunk/drivers/net/cxgb4/cxgb4_main.c | 3 +- trunk/drivers/net/pch_gbe/pch_gbe_main.c | 2 +- trunk/drivers/net/tg3.c | 95 +- trunk/drivers/net/tg3.h | 3 - trunk/drivers/net/usb/kaweth.c | 1 + trunk/drivers/net/wireless/ath/ath9k/hw.c | 6 +- trunk/drivers/net/wireless/ath/ath9k/hw.h | 1 + trunk/drivers/net/wireless/ath/ath9k/main.c | 8 +- trunk/drivers/net/wireless/ath/ath9k/xmit.c | 2 - trunk/drivers/net/wireless/iwlwifi/iwl-4965.c | 1 + .../net/wireless/iwlwifi/iwl-agn-eeprom.c | 11 +- trunk/drivers/net/wireless/rt2x00/rt73usb.c | 1 + trunk/drivers/net/wireless/rtlwifi/pci.c | 11 +- trunk/drivers/parport/share.c | 4 +- trunk/drivers/platform/x86/intel_scu_ipc.c | 7 +- .../drivers/platform/x86/intel_scu_ipcutil.c | 2 +- trunk/drivers/pps/clients/pps-ktimer.c | 2 - trunk/drivers/pps/clients/pps_parport.c | 2 +- .../drivers/pps/generators/pps_gen_parport.c | 2 +- trunk/drivers/sh/intc/chip.c | 6 +- trunk/drivers/staging/msm/msm_fb.c | 8 +- trunk/drivers/staging/olpc_dcon/olpc_dcon.c | 10 +- trunk/drivers/staging/sm7xx/smtcfb.c | 8 +- .../staging/vme/bridges/Module.symvers | 0 trunk/drivers/tty/serial/sb1250-duart.c | 2 +- trunk/drivers/tty/sysrq.c | 2 +- trunk/drivers/tty/tty_io.c | 4 +- trunk/drivers/tty/vt/selection.c | 4 +- trunk/drivers/tty/vt/vc_screen.c | 16 +- trunk/drivers/tty/vt/vt.c | 124 +-- trunk/drivers/tty/vt/vt_ioctl.c | 60 +- trunk/drivers/video/arkfb.c | 12 +- trunk/drivers/video/aty/aty128fb.c | 12 +- trunk/drivers/video/aty/atyfb_base.c | 10 +- trunk/drivers/video/aty/radeon_pm.c | 10 +- trunk/drivers/video/bf537-lq035.c | 58 +- trunk/drivers/video/chipsfb.c | 8 +- trunk/drivers/video/console/fbcon.c | 42 +- trunk/drivers/video/console/vgacon.c | 6 +- trunk/drivers/video/da8xx-fb.c | 11 +- trunk/drivers/video/fbmem.c | 12 +- trunk/drivers/video/fbsysfs.c | 20 +- trunk/drivers/video/geode/gxfb_core.c | 8 +- trunk/drivers/video/geode/lxfb_core.c | 8 +- trunk/drivers/video/i810/i810_main.c | 8 +- trunk/drivers/video/jz4740_fb.c | 8 +- trunk/drivers/video/mx3fb.c | 8 +- trunk/drivers/video/nuc900fb.c | 6 +- trunk/drivers/video/nvidia/nvidia.c | 8 +- trunk/drivers/video/ps3fb.c | 16 +- trunk/drivers/video/pxa168fb.c | 6 +- trunk/drivers/video/pxa3xx-gcu.c | 4 +- trunk/drivers/video/s3fb.c | 16 +- trunk/drivers/video/savage/savagefb_driver.c | 8 +- trunk/drivers/video/sh_mobile_hdmi.c | 8 +- trunk/drivers/video/sh_mobile_lcdcfb.c | 4 +- trunk/drivers/video/sm501fb.c | 8 +- trunk/drivers/video/tmiofb.c | 10 +- trunk/drivers/video/via/viafbdev.c | 8 +- trunk/drivers/video/vt8623fb.c | 12 +- trunk/drivers/video/xen-fbfront.c | 4 +- trunk/fs/ceph/caps.c | 43 +- trunk/fs/ceph/inode.c | 10 +- trunk/fs/ceph/mds_client.c | 10 +- trunk/fs/ceph/super.c | 2 + trunk/fs/ceph/xattr.c | 3 + trunk/fs/nilfs2/super.c | 3 +- trunk/fs/proc/consoles.c | 4 +- trunk/fs/squashfs/block.c | 8 + trunk/fs/squashfs/xz_wrapper.c | 6 - trunk/fs/squashfs/zlib_wrapper.c | 6 - trunk/include/linux/console.h | 6 +- trunk/include/linux/input/bu21013.h | 4 - trunk/include/linux/mmc/sh_mmcif.h | 4 +- trunk/include/linux/sysrq.h | 3 + trunk/include/net/bluetooth/hci_core.h | 1 + trunk/include/net/sch_generic.h | 8 +- trunk/kernel/printk.c | 100 +- trunk/kernel/sched_fair.c | 13 +- trunk/kernel/sysctl.c | 3 +- trunk/lib/radix-tree.c | 7 +- trunk/lib/rbtree.c | 3 + trunk/lib/textsearch.c | 10 +- trunk/mm/Kconfig | 2 +- trunk/mm/kmemleak-test.c | 6 +- trunk/mm/kmemleak.c | 13 +- trunk/mm/memcontrol.c | 31 +- trunk/mm/migrate.c | 2 +- trunk/mm/page_alloc.c | 18 +- trunk/mm/pgtable-generic.c | 1 + trunk/mm/vmscan.c | 3 +- trunk/net/bluetooth/hci_conn.c | 16 +- trunk/net/bluetooth/hci_core.c | 4 + trunk/net/bluetooth/hci_event.c | 9 +- trunk/net/bluetooth/l2cap.c | 84 +- trunk/net/bluetooth/rfcomm/core.c | 3 +- trunk/net/core/dev.c | 3 +- trunk/net/core/ethtool.c | 2 +- trunk/net/core/skbuff.c | 8 +- trunk/net/dcb/dcbnl.c | 13 +- trunk/net/ipv4/arp.c | 11 +- trunk/net/ipv4/inetpeer.c | 2 +- trunk/net/ipv4/tcp_input.c | 2 +- trunk/net/ipv4/tcp_ipv4.c | 1 - trunk/net/ipv6/addrconf.c | 81 +- trunk/net/ipv6/route.c | 9 +- trunk/net/ipv6/xfrm6_policy.c | 6 + trunk/net/mac80211/tx.c | 3 + trunk/net/sched/sch_cbq.c | 3 +- trunk/net/sched/sch_drr.c | 2 +- trunk/net/sched/sch_dsmark.c | 2 +- trunk/net/sched/sch_fifo.c | 5 +- trunk/net/sched/sch_hfsc.c | 2 +- trunk/net/sched/sch_htb.c | 12 +- trunk/net/sched/sch_multiq.c | 2 +- trunk/net/sched/sch_netem.c | 3 +- trunk/net/sched/sch_prio.c | 2 +- trunk/net/sched/sch_red.c | 11 +- trunk/net/sched/sch_sfq.c | 5 +- trunk/net/sched/sch_tbf.c | 2 +- trunk/net/sched/sch_teql.c | 3 +- trunk/security/keys/internal.h | 6 +- trunk/security/keys/key.c | 8 +- trunk/security/keys/keyring.c | 31 +- trunk/security/keys/request_key.c | 2 +- trunk/sound/arm/aaci.c | 48 +- trunk/sound/atmel/ac97c.c | 5 +- trunk/sound/pci/azt3328.c | 38 +- trunk/sound/pci/hda/hda_eld.c | 2 +- trunk/sound/pci/hda/patch_realtek.c | 6 +- trunk/sound/pci/oxygen/xonar_cs43xx.c | 2 +- trunk/sound/soc/atmel/snd-soc-afeb9260.c | 2 +- trunk/sound/soc/blackfin/bf5xx-ssm2602.c | 2 +- trunk/sound/soc/codecs/wm8994.c | 2 +- trunk/sound/soc/codecs/wm8995.c | 2 +- trunk/sound/soc/codecs/wm_hubs.c | 15 +- trunk/sound/soc/davinci/davinci-evm.c | 2 +- trunk/sound/soc/pxa/corgi.c | 4 +- trunk/sound/soc/pxa/poodle.c | 2 +- trunk/sound/soc/pxa/spitz.c | 4 +- .../sound/soc/samsung/neo1973_gta02_wm8753.c | 6 +- trunk/sound/soc/samsung/neo1973_wm8753.c | 6 +- .../sound/soc/samsung/s3c24xx_simtec_hermes.c | 4 +- .../soc/samsung/s3c24xx_simtec_tlv320aic23.c | 4 +- trunk/sound/soc/samsung/s3c24xx_uda134x.c | 2 +- 271 files changed, 4873 insertions(+), 1328 deletions(-) create mode 100644 trunk/Documentation/ABI/testing/sysfs-platform-at91 create mode 100644 trunk/arch/arm/mach-tegra/include/mach/kbc.h delete mode 100644 trunk/arch/x86/include/asm/system_64.h create mode 100644 trunk/drivers/input/keyboard/tegra-kbc.c create mode 100644 trunk/drivers/net/can/softing/Kconfig create mode 100644 trunk/drivers/net/can/softing/Makefile create mode 100644 trunk/drivers/net/can/softing/softing.h create mode 100644 trunk/drivers/net/can/softing/softing_cs.c create mode 100644 trunk/drivers/net/can/softing/softing_fw.c create mode 100644 trunk/drivers/net/can/softing/softing_main.c create mode 100644 trunk/drivers/net/can/softing/softing_platform.h delete mode 100644 trunk/drivers/staging/vme/bridges/Module.symvers diff --git a/[refs] b/[refs] index 3ca0d28a61c4..695cfead6d5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee2c9258501f83d3ed0fd09ce5df1cec53312cf0 +refs/heads/master: 9fbf0c08d441888b977f7c459c8aa57f2c0cb6ad diff --git a/trunk/.mailmap b/trunk/.mailmap index 581fd39193a2..1eba28acab64 100644 --- a/trunk/.mailmap +++ b/trunk/.mailmap @@ -23,6 +23,7 @@ Andy Adamson Arnaud Patard Arnd Bergmann Axel Dyks +Axel Lin Ben Gardner Ben M Cahill Björn Steinbrink diff --git a/trunk/Documentation/ABI/testing/sysfs-platform-at91 b/trunk/Documentation/ABI/testing/sysfs-platform-at91 new file mode 100644 index 000000000000..4cc6a865ae66 --- /dev/null +++ b/trunk/Documentation/ABI/testing/sysfs-platform-at91 @@ -0,0 +1,25 @@ +What: /sys/devices/platform/at91_can/net//mb0_id +Date: January 2011 +KernelVersion: 2.6.38 +Contact: Marc Kleine-Budde +Description: + Value representing the can_id of mailbox 0. + + Default: 0x7ff (standard frame) + + Due to a chip bug (errata 50.2.6.3 & 50.3.5.3 in + "AT91SAM9263 Preliminary 6249H-ATARM-27-Jul-09") the + contents of mailbox 0 may be send under certain + conditions (even if disabled or in rx mode). + + The workaround in the errata suggests not to use the + mailbox and load it with an unused identifier. + + In order to use an extended can_id add the + CAN_EFF_FLAG (0x80000000U) to the can_id. Example: + + - standard id 0x7ff: + echo 0x7ff > /sys/class/net/can0/mb0_id + + - extended id 0x1fffffff: + echo 0x9fffffff > /sys/class/net/can0/mb0_id diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index b72e071a3e5b..89835a4766a6 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -43,11 +43,11 @@ parameter is applicable: AVR32 AVR32 architecture is enabled. AX25 Appropriate AX.25 support is enabled. BLACKFIN Blackfin architecture is enabled. + DRM Direct Rendering Management support is enabled. + DYNAMIC_DEBUG Build in debug messages and enable them at runtime EDD BIOS Enhanced Disk Drive Services (EDD) is enabled EFI EFI Partitioning (GPT) is enabled EIDE EIDE/ATAPI support is enabled. - DRM Direct Rendering Management support is enabled. - DYNAMIC_DEBUG Build in debug messages and enable them at runtime FB The frame buffer device is enabled. GCOV GCOV profiling is enabled. HW Appropriate hardware is enabled. diff --git a/trunk/Documentation/networking/bonding.txt b/trunk/Documentation/networking/bonding.txt index 5dc638791d97..25d2f4141d27 100644 --- a/trunk/Documentation/networking/bonding.txt +++ b/trunk/Documentation/networking/bonding.txt @@ -49,7 +49,8 @@ Table of Contents 3.3 Configuring Bonding Manually with Ifenslave 3.3.1 Configuring Multiple Bonds Manually 3.4 Configuring Bonding Manually via Sysfs -3.5 Overriding Configuration for Special Cases +3.5 Configuration with Interfaces Support +3.6 Overriding Configuration for Special Cases 4. Querying Bonding Configuration 4.1 Bonding Configuration @@ -161,8 +162,8 @@ onwards) do not have /usr/include/linux symbolically linked to the default kernel source include directory. SECOND IMPORTANT NOTE: - If you plan to configure bonding using sysfs, you do not need -to use ifenslave. + If you plan to configure bonding using sysfs or using the +/etc/network/interfaces file, you do not need to use ifenslave. 2. Bonding Driver Options ========================= @@ -779,22 +780,26 @@ resend_igmp You can configure bonding using either your distro's network initialization scripts, or manually using either ifenslave or the -sysfs interface. Distros generally use one of two packages for the -network initialization scripts: initscripts or sysconfig. Recent -versions of these packages have support for bonding, while older +sysfs interface. Distros generally use one of three packages for the +network initialization scripts: initscripts, sysconfig or interfaces. +Recent versions of these packages have support for bonding, while older versions do not. We will first describe the options for configuring bonding for -distros using versions of initscripts and sysconfig with full or -partial support for bonding, then provide information on enabling +distros using versions of initscripts, sysconfig and interfaces with full +or partial support for bonding, then provide information on enabling bonding without support from the network initialization scripts (i.e., older versions of initscripts or sysconfig). - If you're unsure whether your distro uses sysconfig or -initscripts, or don't know if it's new enough, have no fear. + If you're unsure whether your distro uses sysconfig, +initscripts or interfaces, or don't know if it's new enough, have no fear. Determining this is fairly straightforward. - First, issue the command: + First, look for a file called interfaces in /etc/network directory. +If this file is present in your system, then your system use interfaces. See +Configuration with Interfaces Support. + + Else, issue the command: $ rpm -qf /sbin/ifup @@ -1327,8 +1332,62 @@ echo 2000 > /sys/class/net/bond1/bonding/arp_interval echo +eth2 > /sys/class/net/bond1/bonding/slaves echo +eth3 > /sys/class/net/bond1/bonding/slaves -3.5 Overriding Configuration for Special Cases +3.5 Configuration with Interfaces Support +----------------------------------------- + + This section applies to distros which use /etc/network/interfaces file +to describe network interface configuration, most notably Debian and it's +derivatives. + + The ifup and ifdown commands on Debian don't support bonding out of +the box. The ifenslave-2.6 package should be installed to provide bonding +support. Once installed, this package will provide bond-* options to be used +into /etc/network/interfaces. + + Note that ifenslave-2.6 package will load the bonding module and use +the ifenslave command when appropriate. + +Example Configurations +---------------------- + +In /etc/network/interfaces, the following stanza will configure bond0, in +active-backup mode, with eth0 and eth1 as slaves. + +auto bond0 +iface bond0 inet dhcp + bond-slaves eth0 eth1 + bond-mode active-backup + bond-miimon 100 + bond-primary eth0 eth1 + +If the above configuration doesn't work, you might have a system using +upstart for system startup. This is most notably true for recent +Ubuntu versions. The following stanza in /etc/network/interfaces will +produce the same result on those systems. + +auto bond0 +iface bond0 inet dhcp + bond-slaves none + bond-mode active-backup + bond-miimon 100 + +auto eth0 +iface eth0 inet manual + bond-master bond0 + bond-primary eth0 eth1 + +auto eth1 +iface eth1 inet manual + bond-master bond0 + bond-primary eth0 eth1 + +For a full list of bond-* supported options in /etc/network/interfaces and some +more advanced examples tailored to you particular distros, see the files in +/usr/share/doc/ifenslave-2.6. + +3.6 Overriding Configuration for Special Cases ---------------------------------------------- + When using the bonding driver, the physical port which transmits a frame is typically selected by the bonding driver, and is not relevant to the user or system administrator. The output port is simply selected using the policies of diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index cf0f3a5c09cc..9d12977b6baf 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3327,7 +3327,6 @@ F: drivers/net/wimax/i2400m/ F: include/linux/wimax/i2400m.h INTEL WIRELESS WIFI LINK (iwlwifi) -M: Reinette Chatre M: Wey-Yi Guy M: Intel Linux Wireless L: linux-wireless@vger.kernel.org diff --git a/trunk/arch/arm/include/asm/hardware/sp810.h b/trunk/arch/arm/include/asm/hardware/sp810.h index a101f10bb5b1..721847dc68ab 100644 --- a/trunk/arch/arm/include/asm/hardware/sp810.h +++ b/trunk/arch/arm/include/asm/hardware/sp810.h @@ -50,6 +50,12 @@ #define SCPCELLID2 0xFF8 #define SCPCELLID3 0xFFC +#define SCCTRL_TIMEREN0SEL_REFCLK (0 << 15) +#define SCCTRL_TIMEREN0SEL_TIMCLK (1 << 15) + +#define SCCTRL_TIMEREN1SEL_REFCLK (0 << 17) +#define SCCTRL_TIMEREN1SEL_TIMCLK (1 << 17) + static inline void sysctl_soft_reset(void __iomem *base) { /* writing any value to SCSYSSTAT reg will reset system */ diff --git a/trunk/arch/arm/include/asm/memory.h b/trunk/arch/arm/include/asm/memory.h index 23c2e8e5c0fa..d0ee74b7cf86 100644 --- a/trunk/arch/arm/include/asm/memory.h +++ b/trunk/arch/arm/include/asm/memory.h @@ -188,7 +188,7 @@ * translation for translating DMA addresses. Use the driver * DMA support - see dma-mapping.h. */ -static inline unsigned long virt_to_phys(void *x) +static inline unsigned long virt_to_phys(const volatile void *x) { return __virt_to_phys((unsigned long)(x)); } diff --git a/trunk/arch/arm/kernel/smp_twd.c b/trunk/arch/arm/kernel/smp_twd.c index fd9156698ab9..60636f499cb3 100644 --- a/trunk/arch/arm/kernel/smp_twd.c +++ b/trunk/arch/arm/kernel/smp_twd.c @@ -36,6 +36,7 @@ static void twd_set_mode(enum clock_event_mode mode, /* timer load already set up */ ctrl = TWD_TIMER_CONTROL_ENABLE | TWD_TIMER_CONTROL_IT_ENABLE | TWD_TIMER_CONTROL_PERIODIC; + __raw_writel(twd_timer_rate / HZ, twd_base + TWD_TIMER_LOAD); break; case CLOCK_EVT_MODE_ONESHOT: /* period set, and timer enabled in 'next_event' hook */ @@ -81,7 +82,7 @@ int twd_timer_ack(void) static void __cpuinit twd_calibrate_rate(void) { - unsigned long load, count; + unsigned long count; u64 waitjiffies; /* @@ -116,10 +117,6 @@ static void __cpuinit twd_calibrate_rate(void) printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000, (twd_timer_rate / 1000000) % 100); } - - load = twd_timer_rate / HZ; - - __raw_writel(load, twd_base + TWD_TIMER_LOAD); } /* diff --git a/trunk/arch/arm/mach-ep93xx/gpio.c b/trunk/arch/arm/mach-ep93xx/gpio.c index f3dc76fdcea8..bec34b834958 100644 --- a/trunk/arch/arm/mach-ep93xx/gpio.c +++ b/trunk/arch/arm/mach-ep93xx/gpio.c @@ -427,6 +427,13 @@ void __init ep93xx_gpio_init(void) { int i; + /* Set Ports C, D, E, G, and H for GPIO use */ + ep93xx_devcfg_set_bits(EP93XX_SYSCON_DEVCFG_KEYS | + EP93XX_SYSCON_DEVCFG_GONK | + EP93XX_SYSCON_DEVCFG_EONIDE | + EP93XX_SYSCON_DEVCFG_GONIDE | + EP93XX_SYSCON_DEVCFG_HONIDE); + for (i = 0; i < ARRAY_SIZE(ep93xx_gpio_banks); i++) gpiochip_add(&ep93xx_gpio_banks[i].chip); } diff --git a/trunk/arch/arm/mach-omap2/pm24xx.c b/trunk/arch/arm/mach-omap2/pm24xx.c index 9e5dc8ed51e9..97feb3ab6a69 100644 --- a/trunk/arch/arm/mach-omap2/pm24xx.c +++ b/trunk/arch/arm/mach-omap2/pm24xx.c @@ -134,7 +134,7 @@ static void omap2_enter_full_retention(void) /* Block console output in case it is on one of the OMAP UARTs */ if (!is_suspending()) - if (try_acquire_console_sem()) + if (!console_trylock()) goto no_sleep; omap_uart_prepare_idle(0); @@ -151,7 +151,7 @@ static void omap2_enter_full_retention(void) omap_uart_resume_idle(0); if (!is_suspending()) - release_console_sem(); + console_unlock(); no_sleep: if (omap2_pm_debug) { diff --git a/trunk/arch/arm/mach-omap2/pm34xx.c b/trunk/arch/arm/mach-omap2/pm34xx.c index 8cbbeade4b8a..a4aa1920a75c 100644 --- a/trunk/arch/arm/mach-omap2/pm34xx.c +++ b/trunk/arch/arm/mach-omap2/pm34xx.c @@ -398,7 +398,7 @@ void omap_sram_idle(void) if (!is_suspending()) if (per_next_state < PWRDM_POWER_ON || core_next_state < PWRDM_POWER_ON) - if (try_acquire_console_sem()) + if (!console_trylock()) goto console_still_active; /* PER */ @@ -481,7 +481,7 @@ void omap_sram_idle(void) } if (!is_suspending()) - release_console_sem(); + console_unlock(); console_still_active: /* Disable IO-PAD and IO-CHAIN wakeup */ diff --git a/trunk/arch/arm/mach-omap2/serial.c b/trunk/arch/arm/mach-omap2/serial.c index 302da7403a10..32e91a9c8b6b 100644 --- a/trunk/arch/arm/mach-omap2/serial.c +++ b/trunk/arch/arm/mach-omap2/serial.c @@ -812,7 +812,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata) oh->dev_attr = uart; - acquire_console_sem(); /* in case the earlycon is on the UART */ + console_lock(); /* in case the earlycon is on the UART */ /* * Because of early UART probing, UART did not get idled @@ -838,7 +838,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata) omap_uart_block_sleep(uart); uart->timeout = DEFAULT_TIMEOUT; - release_console_sem(); + console_unlock(); if ((cpu_is_omap34xx() && uart->padconf) || (uart->wk_en && uart->wk_mask)) { diff --git a/trunk/arch/arm/mach-realview/Kconfig b/trunk/arch/arm/mach-realview/Kconfig index b4575ae9648e..7ca138a943a9 100644 --- a/trunk/arch/arm/mach-realview/Kconfig +++ b/trunk/arch/arm/mach-realview/Kconfig @@ -2,52 +2,56 @@ menu "RealView platform type" depends on ARCH_REALVIEW config MACH_REALVIEW_EB - bool "Support RealView/EB platform" + bool "Support RealView(R) Emulation Baseboard" select ARM_GIC help - Include support for the ARM(R) RealView Emulation Baseboard platform. + Include support for the ARM(R) RealView(R) Emulation Baseboard + platform. config REALVIEW_EB_A9MP - bool "Support Multicore Cortex-A9" + bool "Support Multicore Cortex-A9 Tile" depends on MACH_REALVIEW_EB select CPU_V7 help - Enable support for the Cortex-A9MPCore tile on the Realview platform. + Enable support for the Cortex-A9MPCore tile fitted to the + Realview(R) Emulation Baseboard platform. config REALVIEW_EB_ARM11MP - bool "Support ARM11MPCore tile" + bool "Support ARM11MPCore Tile" depends on MACH_REALVIEW_EB select CPU_V6 select ARCH_HAS_BARRIERS if SMP help - Enable support for the ARM11MPCore tile on the Realview platform. + Enable support for the ARM11MPCore tile fitted to the Realview(R) + Emulation Baseboard platform. config REALVIEW_EB_ARM11MP_REVB - bool "Support ARM11MPCore RevB tile" + bool "Support ARM11MPCore RevB Tile" depends on REALVIEW_EB_ARM11MP help - Enable support for the ARM11MPCore RevB tile on the Realview - platform. Since there are device address differences, a - kernel built with this option enabled is not compatible with - other revisions of the ARM11MPCore tile. + Enable support for the ARM11MPCore Revision B tile on the + Realview(R) Emulation Baseboard platform. Since there are device + address differences, a kernel built with this option enabled is + not compatible with other revisions of the ARM11MPCore tile. config MACH_REALVIEW_PB11MP - bool "Support RealView/PB11MPCore platform" + bool "Support RealView(R) Platform Baseboard for ARM11MPCore" select CPU_V6 select ARM_GIC select HAVE_PATA_PLATFORM select ARCH_HAS_BARRIERS if SMP help - Include support for the ARM(R) RealView MPCore Platform Baseboard. - PB11MPCore is a platform with an on-board ARM11MPCore and has + Include support for the ARM(R) RealView(R) Platform Baseboard for + the ARM11MPCore. This platform has an on-board ARM11MPCore and has support for PCI-E and Compact Flash. config MACH_REALVIEW_PB1176 - bool "Support RealView/PB1176 platform" + bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S" select CPU_V6 select ARM_GIC help - Include support for the ARM(R) RealView ARM1176 Platform Baseboard. + Include support for the ARM(R) RealView(R) Platform Baseboard for + ARM1176JZF-S. config REALVIEW_PB1176_SECURE_FLASH bool "Allow access to the secure flash memory block" @@ -59,23 +63,24 @@ config REALVIEW_PB1176_SECURE_FLASH block (64MB @ 0x3c000000) is required. config MACH_REALVIEW_PBA8 - bool "Support RealView/PB-A8 platform" + bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform" select CPU_V7 select ARM_GIC select HAVE_PATA_PLATFORM help - Include support for the ARM(R) RealView Cortex-A8 Platform Baseboard. - PB-A8 is a platform with an on-board Cortex-A8 and has support for - PCI-E and Compact Flash. + Include support for the ARM(R) RealView Platform Baseboard for + Cortex(tm)-A8. This platform has an on-board Cortex-A8 and has + support for PCI-E and Compact Flash. config MACH_REALVIEW_PBX - bool "Support RealView/PBX platform" + bool "Support RealView(R) Platform Baseboard Explore" select ARM_GIC select HAVE_PATA_PLATFORM select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET select ZONE_DMA if SPARSEMEM help - Include support for the ARM(R) RealView PBX platform. + Include support for the ARM(R) RealView(R) Platform Baseboard + Explore. config REALVIEW_HIGH_PHYS_OFFSET bool "High physical base address for the RealView platform" diff --git a/trunk/arch/arm/mach-realview/platsmp.c b/trunk/arch/arm/mach-realview/platsmp.c index a22bf67f2f78..6959d13d908a 100644 --- a/trunk/arch/arm/mach-realview/platsmp.c +++ b/trunk/arch/arm/mach-realview/platsmp.c @@ -41,7 +41,7 @@ volatile int __cpuinitdata pen_release = -1; * observers, irrespective of whether they're taking part in coherency * or not. This is necessary for the hotplug code to work reliably. */ -static void write_pen_release(int val) +static void __cpuinit write_pen_release(int val) { pen_release = val; smp_wmb(); diff --git a/trunk/arch/arm/mach-shmobile/Kconfig b/trunk/arch/arm/mach-shmobile/Kconfig index 4d1b4c5c9389..0c8f6cf3e948 100644 --- a/trunk/arch/arm/mach-shmobile/Kconfig +++ b/trunk/arch/arm/mach-shmobile/Kconfig @@ -60,6 +60,8 @@ endchoice config MACH_AG5EVM bool "AG5EVM board" + select ARCH_REQUIRE_GPIOLIB + select SH_LCD_MIPI_DSI depends on ARCH_SH73A0 config MACH_MACKEREL diff --git a/trunk/arch/arm/mach-shmobile/board-ag5evm.c b/trunk/arch/arm/mach-shmobile/board-ag5evm.c index c18a740a4159..2123b96b5638 100644 --- a/trunk/arch/arm/mach-shmobile/board-ag5evm.c +++ b/trunk/arch/arm/mach-shmobile/board-ag5evm.c @@ -34,9 +34,10 @@ #include #include #include - +#include +#include