3.2-rc1 rebase review

Tim Gardner tim.gardner at canonical.com
Tue Nov 8 21:08:56 UTC 2011


I rebased some of the commit/revert commit pairs out of existence, 
though there are still more to do.

Andy - please run the config checker to look for inconsistencies.

Kees and Andy - Please check that I resolved these patch conflicts 
correctly:

UBUNTU: ubuntu: Yama - unconditionally chain to Yama LSM
UBUNTU: SAUCE: add option to hand off all kernel parameters to init

These patches were dropped because of excessive conflict:

UBUNTU: ARM: Adding regulator supply for vdds_sdi.
UBUNTU: SAUCE: ARM: OMAP: Add macros for comparing silicon revision
Revert "UBUNTU: SAUCE: ARM: OMAP: Add macros for comparing silicon revision"
UBUNTU: SAUCE: (no-up) Input: elantech - Add v3 hardware support
UBUNTU: SAUCE: HID: add support for MacBookAir4,2 keyboard.
UBUNTU: SAUCE: HID: add MacBookAir4, 2 to hid_have_special_driver[]
UBUNTU: SAUCE: (drop during 3.2 merge) xHCI: AMD isoc link TRB chain bit 
quirk

I dropped this seccomp_filter patch set for now. Kees has promised a 
pull request.

http://bugs.launchpad.net/bugs/887780
UBUNTU: SAUCE: seccomp_filter: add HAVE_SECCOMP_FILTER and seccomp_execve
UBUNTU: SAUCE: seccomp_filter: Document what seccomp_filter is and how 
it works.
UBUNTU: SAUCE: seccomp_filter: add process state reporting
UBUNTU: SAUCE: seccomp_filter: new mode with configurable syscall filters

Andy - can you rework this as I dropped it for excessive conflict ?

UBUNTU: SAUCE: ensure root is ready before running usermodehelpers in it

These drivers failed to build:

UBUNTU: [Config] Disable vt6656
UBUNTU: [Config] Disabled ndiswrapper
UBUNTU: [Config] Disabled dm-raid4-5

New config options enabled:

CFS_BANDWIDTH=y
ARCH_RANDOM=y
PCI_PRI=y
PCI_PASID=y
RAPIDIO=y
RAPIDIO_TSI721=y
CAN_GW=m
CAN_EMS_PCMCIA=m
CAN_PEAK_PCI=m
MAC80211_VERBOSE_MPATH_DEBUG=n
MAC80211_VERBOSE_TDLS_DEBUG=n
CEPH_LIB_USE_DNS_RESOLVER=y
MTD_DOCG3=m
SCSI_MVUMI=m
ARCNET=y
NET_VENDOR_ADAPTEC=y
NET_VENDOR_ALTEON=y
NET_VENDOR_AMD=y
NET_VENDOR_ATHEROS=y
NET_VENDOR_BROCADE=y
NET_VENDOR_CISCO=y
NET_VENDOR_DEC=y
NET_VENDOR_DLINK=y
NET_VENDOR_EMULEX=y
NET_VENDOR_EXAR=y
NET_VENDOR_FUJITSU=y
NET_VENDOR_HP=y
NET_VENDOR_INTEL=y
NET_VENDOR_I825XX=y
NET_VENDOR_MARVELL=y
NET_VENDOR_MICREL=y
NET_VENDOR_MICROCHIP=y
NET_VENDOR_MYRI=y
NET_VENDOR_NATSEMI=y
NET_VENDOR_8390=y
NET_VENDOR_NVIDIA=y
NET_VENDOR_OKI=y
NET_PACKET_ENGINE=y
NET_VENDOR_QLOGIC=y
NET_VENDOR_REALTEK=y
NET_VENDOR_RDC=y
NET_VENDOR_SEEQ=y
NET_VENDOR_SILAN=y
NET_VENDOR_SIS=y
NET_VENDOR_SMSC=y
NET_VENDOR_STMICRO=y
STMMAC_DEBUG_FS=n
STMMAC_RING=1
NET_VENDOR_SUN=y
NET_VENDOR_TEHUTI=y
NET_VENDOR_TI=y
NET_VENDOR_VIA=y
NET_VENDOR_XIRCOM=y
CARL9170_HWRNG=y
ATH6KL=m
ATH6KL_DEBUG=n
IWLWIFI=m
MWIFIEX_PCIE=m
TOUCHSCREEN_TSC_SERIO=m
INPUT_BMA150=m
INPUT_MC13783_PWRBUTTON=m
I2C_DESIGNWARE_PCI=m
PPS_CLIENT_GPIO=m
PINCTRL=y
PINMUX=y
DEBUG_PINCTRL=n
SENSORS_AD7314=m
REGULATOR_GPIO=m
RC_ATI_REMOTE=m
USB_GSPCA_TOPRO=m
DVB_USB_PCTV452E=m
DVB_USB_IT913X=m
DVB_USB_MXL111SF=m
FB_SMSCUFX=m
HID_ACRUX_FF=y
HID_LOGITECH_DJ=m
LOGIWHEELS_FF=y
HID_PRIMAX=m
USB_DWC3=m
USB_DWC3_DEBUG=n
USB_RENESAS_USBHS=m
REALTEK_AUTOPM=y
USB_GADGET_STORAGE_NUM_BUFFERS=2
USB_GADGET_DWC3=m
USB_G_ACM_MS=m
USB_RENESAS_USBHS_HCD=m
EDAC_SBRIDGE=m
COMEDI_USBDUXSIGMA=m
AD7192=m
AD7280=m
AD7746=m
AD5064=m
AD5360=m
AD5933=m
AD2S1200=m
IIO_SIMPLE_DUMMY=n
STAGING_MEDIA=y
DVB_AS102=m
INTEL_IOMMU=y
INTEL_IOMMU_DEFAULT_ON=y
SQUASHFS_4K_DEVBLK_SIZE=n
EVM=y
CRYPTO_USER=m
CRYPTO_SHA1_SSSE3=m
CRYPTO_BLOWFISH_X86_64=m
CRYPTO_TWOFISH_X86_64_3WAY=m

EXPERIMENTAL:

IEEE802154_6LOWPAN=m
DM_THIN_PROVISIONING=m
DM_DEBUG_BLOCK_STACK_TRACING=n
DM_DEBUG_SPACE_MAPS=n
B43_PHY_HT=y
VIRTIO_MMIO=m
IRQ_REMAP=y
-- 
Tim Gardner tim.gardner at canonical.com




More information about the kernel-team mailing list