UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/arch/arm
History
David S. Miller 6e0895c2ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/emulex/benet/be_main.c
	drivers/net/ethernet/intel/igb/igb_main.c
	drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
	include/net/scm.h
	net/batman-adv/routing.c
	net/ipv4/tcp_input.c

The e{uid,gid} --> {uid,gid} credentials fix conflicted with the
cleanup in net-next to now pass cred structs around.

The be2net driver had a bug fix in 'net' that overlapped with the VLAN
interface changes by Patrick McHardy in net-next.

An IGB conflict existed because in 'net' the build_skb() support was
reverted, and in 'net-next' there was a comment style fix within that
code.

Several batman-adv conflicts were resolved by making sure that all
calls to batadv_is_my_mac() are changed to have a new bat_priv first
argument.

Eric Dumazet's TS ECR fix in TCP in 'net' conflicted with the F-RTO
rewrite in 'net-next', mostly overlapping changes.

Thanks to Stephen Rothwell and Antonio Quartulli for help with several
of these merge resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2013-04-22 20:32:51 -04:00
..
boot Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-22 20:32:51 -04:00
common ARM: GIC: fix GIC cpumask initialization 2013-02-08 10:17:22 +00:00
configs Fix few regressions, omap3 pm init with device tree, and some 2013-03-05 23:22:00 +01:00
crypto ARM: 7626/1: arm/crypto: Make asm SHA-1 and AES code Thumb-2 compatible 2013-01-13 12:41:22 +00:00
include Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 2013-04-20 18:38:06 -07:00
kernel ARM: 7699/1: sched_clock: Add more notrace to prevent recursion 2013-04-19 22:23:55 +01:00
kvm ARM: KVM: fix unbalanced get_cpu() in access_dcsw 2013-04-17 12:51:32 -07:00
lib ARM: 7685/1: delay: use private ticks_per_jiffy field for timer-based delay ops 2013-04-03 16:45:50 +01:00
mach-at91 arm-soc: bug fixes for 3.9-rc3 2013-03-18 08:17:14 -07:00
mach-bcm Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-bcm2835 arm-soc: soc-specific updates 2013-02-21 15:27:22 -08:00
mach-clps711x The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-cns3xxx ARM: cns3xxx: fix mapping of private memory region 2013-03-30 12:05:26 -07:00
mach-davinci ARM: davinci: edma: fix dmaengine induced null pointer dereference on da830 2013-03-12 17:10:46 +05:30
mach-dove arm-soc: mvebu platform changes 2013-02-28 20:09:24 -08:00
mach-ebsa110 The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-ep93xx ARM: ep93xx: Fix wait for UART FIFO to be empty 2013-03-18 09:40:38 +11:00
mach-exynos Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-footbridge ARM: fix CONFIG_VIRT_TO_BUS handling 2013-03-18 13:49:57 +00:00
mach-gemini The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-h720x The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-highbank ARM: highbank: fix cache flush ordering for cpu hotplug 2013-04-18 09:37:46 -07:00
mach-imx ARM i.MX6: Fix ldb_di clock selection 2013-04-09 19:48:09 +08:00
mach-integrator Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-iop13xx Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-iop32x The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-iop33x The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-ixp4xx ARM: w1-gpio: fix erroneous gpio requests 2013-03-12 16:20:45 -07:00
mach-kirkwood Fix GE0/GE1 init on ix2-200 as GE0 has no PHY 2013-04-10 16:50:58 +00:00
mach-ks8695 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-l7200/include/mach
…
mach-lpc32xx The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-mmp ARM: mmp: add platform_device head file in gplugd 2013-03-15 16:27:53 +08:00
mach-msm ARM: msm: Stop counting before reprogramming clockevent 2013-03-22 10:45:39 -07:00
mach-mv78xx0 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-mvebu arm: mvebu: Fix the irq map function in SMP mode 2013-04-10 16:59:14 +00:00
mach-mxs ARM: video: mxs: Fix mxsfb misconfiguring VDCTRL0 2013-03-19 11:07:58 +08:00
mach-netx ARM: 7642/1: netx: bump IRQ offset to 64 2013-03-03 22:54:11 +00:00
mach-nomadik Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-omap1 Miscellaneous OMAP fixes for v3.9-rc. These primarily deal with OMAP2+ power 2013-03-19 11:20:16 -07:00
mach-omap2 ARM: OMAP: clocks: Delay clk inits atleast until slab is initialized 2013-03-26 22:06:20 -07:00
mach-orion5x Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-picoxcell Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-prima2 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-pxa ARM: w1-gpio: fix erroneous gpio requests 2013-03-12 16:20:45 -07:00
mach-realview arm-soc: cleanups 2013-02-21 14:58:40 -08:00
mach-rpc The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-s3c24xx ARM: S3C24XX: Fix interrupt pending register offset of the EINT controller 2013-04-10 00:09:30 +09:00
mach-s3c64xx Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-s5p64x0 arm-soc: cleanups 2013-02-21 14:58:40 -08:00
mach-s5pc100 Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer/cleanup' into soc 2013-01-24 17:57:20 +09:00
mach-s5pv210 Merge branch 'v3.9-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes 2013-03-14 23:57:57 +01:00
mach-sa1100 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-shark The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which 2013-02-05 10:26:20 -08:00
mach-shmobile ARM: shmobile: marzen: Include mmc/host.h 2013-03-08 16:29:23 +01:00
mach-socfpga Merge branch 'socfpga/hw' into next/soc 2013-02-11 19:37:51 -08:00
mach-spear3xx ARM: spear3xx: Use correct pl080 header file 2013-03-12 10:56:32 +01:00
mach-spear6xx Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2013-02-26 09:24:48 -08:00
mach-spear13xx Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT" 2013-02-20 15:48:02 +05:30
mach-sunxi Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-tegra Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-u300 Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-ux500 ARM: ux500: Enable the clock controlling Ethernet on Snowball 2013-03-27 20:20:40 +01:00
mach-versatile Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-vexpress Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
mach-virt ARM: mach-virt: fixup machine descriptor after removal of sys_timer 2013-02-11 10:39:30 -08:00
mach-vt8500 arm-soc: soc-specific updates 2013-02-21 15:27:22 -08:00
mach-w90x900 arm-soc: cleanups 2013-02-21 14:58:40 -08:00
mach-zynq arm: zynq: Add missing irqchip.h to common.c 2013-01-29 10:55:28 -08:00
mm ARM: 7696/1: Fix kexec by setting outer_cache.inv_all for Feroceon 2013-04-17 16:53:27 +01:00
net filter: bpf_jit_comp: refactor and unify BPF JIT image dump output 2013-03-21 17:25:56 -04:00
nwfpe
…
oprofile
…
plat-iop ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
plat-omap arm-soc: late OMAP changes 2013-02-28 20:00:40 -08:00
plat-orion mv643xx_eth: convert to use the Marvell Orion MDIO driver 2013-03-22 10:25:15 -04:00
plat-pxa ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
plat-samsung Merge branch 'timer/cleanup' into late/mvebu2 2013-02-28 18:54:15 +01:00
plat-spear ARM: SPEAr13xx: Fix typo "ARCH_HAVE_CPUFREQ" 2013-03-05 23:30:24 +01:00
plat-versatile Merge branch 'for-arm-soc/arch-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into kvm-arm/timer 2013-02-11 19:03:52 +00:00
tools
…
vfp ARM: Fix broken commit 0cc41e4a21 corrupting kernel messages 2013-03-01 21:09:59 +00:00
xen xen: implement updated XENMEM_add_to_physmap_range ABI 2013-02-19 22:01:55 -05:00
Kconfig ARM: 7684/1: errata: Workaround for Cortex-A15 erratum 798181 (TLBI/DSB operations) 2013-04-03 16:45:49 +01:00
Kconfig-nommu
…
Kconfig.debug ARM: imx: add dependency check for DEBUG_IMX_UART_PORT 2013-03-19 13:56:05 +08:00
Makefile arm-soc: virtualization changes 2013-02-21 15:40:16 -08:00